aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-09-11 20:52:09 +0200
committerChristian Schneppe <christian@pix-art.de>2018-09-11 20:52:09 +0200
commitc884ea1f90dc3f566ab5eac83927fdc4367faa6a (patch)
treebe06b5dc8d5cd24693382ec00c681ea92721db7c /src/main/java/de/pixart/messenger/ui
parent7cd95c23ef336074ab15c2426241526a4ef2c67c (diff)
catch some more Exceptions during database import
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
-rw-r--r--src/main/java/de/pixart/messenger/ui/WelcomeActivity.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
index 3c03542ee..9d5b76c1c 100644
--- a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
@@ -152,6 +152,8 @@ public class WelcomeActivity extends XmppActivity {
checkDatabase(password);
} catch (IOException e) {
e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
}
pd.dismiss();
}
@@ -225,6 +227,9 @@ public class WelcomeActivity extends XmppActivity {
} catch (IOException e) {
Log.d(Config.LOGTAG, "Database importer: decryption failed (IO) with " + e);
e.printStackTrace();
+ } catch (Exception e) {
+ Log.d(Config.LOGTAG, "Database importer: Error " + e);
+ e.printStackTrace();
}
SQLiteDatabase checkDB = null;
@@ -236,10 +241,11 @@ public class WelcomeActivity extends XmppActivity {
checkDB = SQLiteDatabase.openDatabase(dbPath, null, SQLiteDatabase.OPEN_READONLY);
Backup_DB_Version = checkDB.getVersion();
Log.d(Config.LOGTAG, "Backup found: " + checkDB + " Version: " + checkDB.getVersion());
-
} catch (SQLiteException e) {
//database does't exist yet.
Log.d(Config.LOGTAG, "No backup found: " + checkDB);
+ } catch (Exception e) {
+ Log.d(Config.LOGTAG, "Error importing backup: " + e);
}
if (checkDB != null) {