Browse Source

Fix crash with getting db

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 7 years ago
parent
commit
8dbd381adb
1 changed files with 9 additions and 2 deletions
  1. 9 2
      app/src/main/java/com/nextcloud/talk/activities/MainActivity.java

+ 9 - 2
app/src/main/java/com/nextcloud/talk/activities/MainActivity.java

@@ -96,8 +96,15 @@ public final class MainActivity extends AppCompatActivity implements ActionBarPr
 
         router = Conductor.attachRouter(this, container, savedInstanceState);
 
-        if (!router.hasRootController() && sqlCipherDatabaseSource.getWritableDatabase() != null &&
-                userUtils.anyUserExists()) {
+        boolean hasDb = true;
+
+        try {
+            sqlCipherDatabaseSource.getWritableDatabase();
+        } catch (Exception exception) {
+            hasDb = false;
+        }
+
+        if (!router.hasRootController() && hasDb && userUtils.anyUserExists()) {
             router.setRoot(RouterTransaction.with(new MagicBottomNavigationController())
                     .pushChangeHandler(new HorizontalChangeHandler())
                     .popChangeHandler(new HorizontalChangeHandler()));