aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/services/ImportBackupService.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2019-08-31 14:52:57 +0200
committerChristian Schneppe <christian@pix-art.de>2019-08-31 14:52:57 +0200
commit8b63dbb26d5f5d81ad631c6cb8629cb5637df0ea (patch)
tree12616e01c88ed7ebce05839c97cc9362058e1f20 /src/main/java/de/pixart/messenger/services/ImportBackupService.java
parent94143682ffd20c41ebc607228716fc184d558a16 (diff)
do password empty check in dialog not in restore backup service
Diffstat (limited to 'src/main/java/de/pixart/messenger/services/ImportBackupService.java')
-rw-r--r--src/main/java/de/pixart/messenger/services/ImportBackupService.java10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/main/java/de/pixart/messenger/services/ImportBackupService.java b/src/main/java/de/pixart/messenger/services/ImportBackupService.java
index 8bb912b8b..fe1fd414b 100644
--- a/src/main/java/de/pixart/messenger/services/ImportBackupService.java
+++ b/src/main/java/de/pixart/messenger/services/ImportBackupService.java
@@ -93,7 +93,7 @@ public class ImportBackupService extends Service {
uri = data;
}
- if (password == null || uri == null) {
+ if (password == null || password.isEmpty() || uri == null) {
return START_NOT_STICKY;
}
if (running.compareAndSet(false, true)) {
@@ -158,14 +158,6 @@ public class ImportBackupService extends Service {
private boolean importBackup(Uri uri, String password) {
Log.d(Config.LOGTAG, "importing backup from " + uri);
- if (password == null || password.isEmpty()) {
- synchronized (mOnBackupProcessedListeners) {
- for (OnBackupProcessed l : mOnBackupProcessedListeners) {
- l.onBackupDecryptionFailed();
- }
- }
- return false;
- }
try {
SQLiteDatabase db = mDatabaseBackend.getWritableDatabase();
final InputStream inputStream;