sqlite: check database creation, use try-with-ressources

Change-Id: I91173e90c5981af3d1ada070b7fd051a3dd4a2ed

ring-android/app/src/main/java/cx/ring/history/DatabaseHelper.java

@@ -200,8 +200,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 db.execSQL("CREATE INDEX IF NOT EXISTS `historytext_TIMESTAMP_idx` ON `historytext` ( `TIMESTAMP` );");
                 db.execSQL("CREATE INDEX IF NOT EXISTS `historytext_id_idx` ON `historytext` ( `id` );");
 
-                Cursor hasATable = db.rawQuery("SELECT name FROM sqlite_master WHERE type=? AND name=?;",
-                        new String[]{"table", "a"});
+                try (Cursor hasATable = db.rawQuery("SELECT name FROM sqlite_master WHERE type=? AND name=?;",
+                        new String[]{"table", "a"})) {
                     if (hasATable.getCount() > 0) {
                         //~ Copying data from the old table "a"
                         db.execSQL("INSERT INTO `historycall` (TIMESTAMP_START, call_end, number, missed," +
@@ -210,10 +210,10 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                         db.execSQL("DROP TABLE IF EXISTS a_TIMESTAMP_START_idx;");
                         db.execSQL("DROP TABLE a;");
                     }
-                hasATable.close();
+                }
 
-                Cursor hasETable = db.rawQuery("SELECT name FROM sqlite_master WHERE type=? AND name=?;",
-                        new String[]{"table", "e"});
+                try (Cursor hasETable = db.rawQuery("SELECT name FROM sqlite_master WHERE type=? AND name=?;",
+                        new String[]{"table", "e"})) {
                     if (hasETable.getCount() > 0) {
                         //~ Copying data from the old table "e"
                         db.execSQL("INSERT INTO historytext (id, TIMESTAMP, number, direction, accountID," +
@@ -224,7 +224,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                         db.execSQL("DROP TABLE IF EXISTS e_id_idx;");
                         db.execSQL("DROP TABLE e;");
                     }
-                hasETable.close();
+                }
 
                 db.setTransactionSuccessful();
                 db.endTransaction();
@@ -414,14 +414,12 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         if (db != null && db.isOpen()) {
             Log.d(TAG, "clearDatabase: Will clear database.");
             ArrayList<String> tableNames = new ArrayList<>();
-            Cursor c = db.rawQuery("SELECT name FROM sqlite_master WHERE type='table'", null);
-            if (c.moveToFirst()) {
-                while (!c.isAfterLast()) {
+
+            try (Cursor c = db.rawQuery("SELECT name FROM sqlite_master WHERE type='table'", null)) {
+                tableNames.ensureCapacity(c.getCount());
+                while (c.moveToNext())
                     tableNames.add(c.getString(0));
-                    c.moveToNext();
-                }
             }
-            c.close();
 
             try {
                 db.beginTransaction();

ring-android/app/src/main/java/cx/ring/services/HistoryServiceImpl.java

@@ -49,15 +49,15 @@ import io.reactivex.subjects.Subject;
  */
 public class HistoryServiceImpl extends HistoryService {
     private static final String TAG = HistoryServiceImpl.class.getSimpleName();
-
-    @Inject
-    protected Context mContext;
-
-    private ConcurrentHashMap<String, DatabaseHelper> databaseHelpers = new ConcurrentHashMap<>();
     private final static String DATABASE_NAME = "history.db";
     private final static String LEGACY_DATABASE_KEY = "legacy";
     private static boolean migrationInitialized = false;
-    private Subject<MigrationStatus> migrationStatusSubject = BehaviorSubject.create();
+
+    private final ConcurrentHashMap<String, DatabaseHelper> databaseHelpers = new ConcurrentHashMap<>();
+    private final Subject<MigrationStatus> migrationStatusSubject = BehaviorSubject.create();
+
+    @Inject
+    protected Context mContext;
 
     public HistoryServiceImpl() {
     }
@@ -76,7 +76,7 @@ public class HistoryServiceImpl extends HistoryService {
         try {
             return getHelper(dbName).getInteractionDataDao();
         } catch (SQLException e) {
-            cx.ring.utils.Log.e(TAG, "Unable to get a interactionDataDao");
+            Log.e(TAG, "Unable to get a interactionDataDao");
             return null;
         }
     }
@@ -86,7 +86,7 @@ public class HistoryServiceImpl extends HistoryService {
         try {
             return getHelper(dbName).getConversationDataDao();
         } catch (SQLException e) {
-            cx.ring.utils.Log.e(TAG, "Unable to get a conversationDataDao");
+            Log.e(TAG, "Unable to get a conversationDataDao");
             return null;
         }
     }
@@ -99,8 +99,7 @@ public class HistoryServiceImpl extends HistoryService {
      * @return the database helper
      */
     private DatabaseHelper initHelper(String accountId) {
-        File dbPath = new File(mContext.getFilesDir(), accountId);
-        File db = new File(dbPath, DATABASE_NAME);
+        File db = new File(new File(mContext.getFilesDir(), accountId), DATABASE_NAME);
         DatabaseHelper helper = new DatabaseHelper(mContext, db.getAbsolutePath());
         databaseHelpers.put(accountId, helper);
         return helper;
@@ -120,7 +119,6 @@ public class HistoryServiceImpl extends HistoryService {
             return initLegacyDb();
         }
 
-
         if (databaseHelpers.containsKey(accountId))
             return databaseHelpers.get(accountId);
         else
@@ -135,7 +133,11 @@ public class HistoryServiceImpl extends HistoryService {
      * @return true if history.db exists in the database folder
      */
     private Boolean checkForLegacyDb() {
+        try {
             return mContext.getDatabasePath(DATABASE_NAME).exists();
+        } catch (Exception e) {
+            return false;
+        }
     }
 
     /**
@@ -204,7 +206,6 @@ public class HistoryServiceImpl extends HistoryService {
      */
     @Override
     protected void migrateDatabase(List<String> accounts) {
-
         if (!checkForLegacyDb()) {
             migrationStatusSubject.onNext(MigrationStatus.LEGACY_DELETED);
             return;
@@ -217,9 +218,7 @@ public class HistoryServiceImpl extends HistoryService {
 
         Log.i(TAG, "Initializing database migration...");
 
-        SQLiteDatabase db = mContext.openOrCreateDatabase(mContext.getDatabasePath(DATABASE_NAME).getAbsolutePath(), Context.MODE_PRIVATE, null);
-
-        try {
+        try (SQLiteDatabase db = mContext.openOrCreateDatabase(mContext.getDatabasePath(DATABASE_NAME).getAbsolutePath(), Context.MODE_PRIVATE, null)) {
 
             if (accounts == null || accounts.isEmpty()) {
                 Log.i(TAG, "No existing accounts found in directory, aborting migration...");
@@ -227,7 +226,6 @@ public class HistoryServiceImpl extends HistoryService {
                 return;
             }
 
-
             // create new database for each account
             for (String newDb : accounts) {
 
@@ -275,12 +273,10 @@ public class HistoryServiceImpl extends HistoryService {
             Log.i(TAG, "Migration complete. Each account now has its own database");
 
         } catch (SQLiteException e) {
-            db.close();
             migrationStatusSubject.onNext(MigrationStatus.FAILED);
             migrationInitialized = false;
             Log.e(TAG, "Error migrating database.", e);
         } catch (NullPointerException e) {
-            db.close();
             migrationStatusSubject.onNext(MigrationStatus.FAILED);
             migrationInitialized = false;
             Log.e(TAG, "An unexpected error occurred. The migration will run again when the helper is called again", e);