Catch IllegalStateException when ending the transaction (#1178)

* If endTransaction is called without an transaction IllegalStateException will be fired

Author: Jeasmine

OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalDbHelper.java

@@ -206,11 +206,19 @@ public void insert(@NonNull String table, @Nullable String nullColumnHack, @Null
             writableDb.beginTransaction();
             writableDb.insert(table, nullColumnHack, values);
             writableDb.setTransactionSuccessful();
+         } catch (SQLiteException e) {
+            logger.error("Error inserting on table: " + table + " with nullColumnHack: " + nullColumnHack + " and values: " + values, e);
+         } catch (IllegalStateException e) {
+            logger.error("Error under inserting transaction under table: " + table + " with nullColumnHack: " + nullColumnHack + " and values: " + values, e);
          } finally {
-            try {
-               writableDb.endTransaction(); // May throw if transaction was never opened or DB is full.
-            } catch (SQLException e) {
-               logger.error("Error closing transaction! ", e);
+            if (writableDb != null) {
+               try {
+                  writableDb.endTransaction(); // May throw if transaction was never opened or DB is full.
+               } catch (IllegalStateException e) {
+                  logger.error("Error closing transaction! ", e);
+               } catch (SQLiteException e) {
+                  logger.error("Error closing transaction! ", e);
+               }
             }
          }
       }
@@ -225,14 +233,18 @@ public void insertOrThrow(@NonNull String table, @Nullable String nullColumnHack
             writableDb.beginTransaction();
             writableDb.insertOrThrow(table, nullColumnHack, values);
             writableDb.setTransactionSuccessful();
-         } catch (Throwable t) {
-            OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error inserting under table: " + table, t);
+         } catch (SQLiteException e) {
+            logger.error("Error inserting or throw on table: " + table + " with nullColumnHack: " + nullColumnHack + " and values: " + values, e);
+         } catch (IllegalStateException e) {
+            logger.error("Error under inserting or throw transaction under table: " + table + " with nullColumnHack: " + nullColumnHack + " and values: " + values, e);
          } finally {
             if (writableDb != null) {
                try {
                   writableDb.endTransaction(); // May throw if transaction was never opened or DB is full.
-               } catch (Throwable t) {
-                  OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error closing transaction! ", t);
+               } catch (IllegalStateException e) {
+                  logger.error("Error closing transaction! ", e);
+               } catch (SQLiteException e) {
+                  logger.error("Error closing transaction! ", e);
                }
             }
          }
@@ -242,20 +254,27 @@ public void insertOrThrow(@NonNull String table, @Nullable String nullColumnHack
    @Override
    public int update(@NonNull String table, @NonNull ContentValues values, @Nullable String whereClause, @Nullable String[] whereArgs) {
       int result = 0;
+      if (values == null || values.toString().isEmpty())
+         return result;
+
       synchronized (LOCK) {
          SQLiteDatabase writableDb = getSQLiteDatabaseWithRetries();
          try {
             writableDb.beginTransaction();
             result = writableDb.update(table, values, whereClause, whereArgs);
             writableDb.setTransactionSuccessful();
-         } catch (Throwable t) {
-            OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error updating table: " + table, t);
+         } catch (SQLiteException e) {
+            logger.error("Error updating on table: " + table + " with whereClause: " + whereClause + " and whereArgs: " + whereArgs, e);
+         } catch (IllegalStateException e) {
+            logger.error("Error under update transaction under table: " + table + " with whereClause: " + whereClause + " and whereArgs: " + whereArgs, e);
          } finally {
             if (writableDb != null) {
                try {
                   writableDb.endTransaction(); // May throw if transaction was never opened or DB is full.
-               } catch (Throwable t) {
-                  OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error closing transaction! ", t);
+               } catch (IllegalStateException e) {
+                  logger.error("Error closing transaction! ", e);
+               } catch (SQLiteException e) {
+                  logger.error("Error closing transaction! ", e);
                }
             }
          }
@@ -272,11 +291,15 @@ public void delete(@NonNull String table, @Nullable String whereClause, @Nullabl
             writableDb.delete(table, whereClause, whereArgs);
             writableDb.setTransactionSuccessful();
          } catch (SQLiteException e) {
-            logger.error("Error deleting on table: " + table, e);
+            logger.error("Error deleting on table: " + table + " with whereClause: " + whereClause + " and whereArgs: " + whereArgs, e);
+         } catch (IllegalStateException e) {
+            logger.error("Error under delete transaction under table: " + table + " with whereClause: " + whereClause + " and whereArgs: " + whereArgs, e);
          } finally {
             if (writableDb != null) {
                try {
                   writableDb.endTransaction(); // May throw if transaction was never opened or DB is full.
+               } catch (IllegalStateException e) {
+                  logger.error("Error closing transaction! ", e);
                } catch (SQLiteException e) {
                   logger.error("Error closing transaction! ", e);
                }