Fixed handling of SQLiteFullException

* Also lowered locally stored notifications from 28 days to 7 days.

Author: jkasten2

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

@@ -623,8 +623,13 @@ private static void createSummaryIdDatabaseEntry(OneSignalDbHelper dbHelper, Str
       } catch (Throwable t) {
          OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error adding summary notification record! ", t);
       } finally {
-         if (writableDb != null)
-            writableDb.endTransaction();
+         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);
+            }
+         }
       }
    }
 

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

@@ -173,18 +173,23 @@ static void saveNotification(NotificationGenerationJob notifiJob, boolean opened
          } catch (Exception e) {
             OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error saving notification record! ", e);
          } finally {
-            if (writableDb != null)
-               writableDb.endTransaction();
+            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 (JSONException e) {
          e.printStackTrace();
       }
    }
 
-   // Clean up old records after 4 weeks.
+   // Clean up old records after 1 week.
    static void deleteOldNotifications(SQLiteDatabase writableDb) {
       writableDb.delete(NotificationTable.TABLE_NAME,
-          NotificationTable.COLUMN_NAME_CREATED_TIME + " < " + ((System.currentTimeMillis() / 1000L) - 2419200L),
+          NotificationTable.COLUMN_NAME_CREATED_TIME + " < " + ((System.currentTimeMillis() / 1000L) - 604800L),
           null);
    }
 

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

@@ -103,8 +103,13 @@ static void processIntent(Context context, Intent intent) {
       } catch (Exception e) {
          OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error processing notification open or dismiss record! ", e);
       } finally {
-         if (writableDb != null)
-            writableDb.endTransaction();
+         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);
+            }
+         }
       }
 
       if (!dismissed)

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

@@ -72,8 +72,13 @@ public static void restore(Context context) {
       } catch (Throwable t) {
          OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error deleting old notification records! ", t);
       } finally {
-         if (writableDb != null)
-            writableDb.endTransaction();
+         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);
+            }
+         }
       }
 
       Cursor cursor = null;

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

@@ -1448,8 +1448,13 @@ public static void clearOneSignalNotifications() {
          } catch (Throwable t) {
             OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error marking all notifications as dismissed! ", t);
          } finally {
-            if (writableDb != null)
-               writableDb.endTransaction();
+            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);
+               }
+            }
          }
 
          BadgeCountUpdater.updateCount(0, appContext);
@@ -1490,8 +1495,13 @@ public static void cancelNotification(int id) {
       } catch (Throwable t) {
          OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error marking a notification id " + id + " as dismissed! ", t);
       } finally {
-         if (writableDb != null)
-            writableDb.endTransaction();
+         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);
+            }
+         }
       }
 
       NotificationManager notificationManager = (NotificationManager)appContext.getSystemService(Context.NOTIFICATION_SERVICE);
@@ -1561,8 +1571,13 @@ public static void cancelGroupedNotifications(String group) {
       } catch (Throwable t) {
          OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error marking a notifications with group " + group + " as dismissed! ", t);
       } finally {
-         if (writableDb != null)
-            writableDb.endTransaction();
+         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);
+            }
+         }
       }
    }