fix(SQLite): handle SQLite errors.

Author: Enuviel

AndroidSDK/src/com/leanplum/internal/LeanplumEventDataManager.java

@@ -58,6 +58,8 @@ public class LeanplumEventDataManager {
   private static LeanplumDataBaseManager databaseManager;
   private static ContentValues contentValues = new ContentValues();
 
+  static boolean willSendErrorLog = false;
+
   /**
    * Creates connection to database, if database is not present, it will automatically create it.
    *
@@ -76,8 +78,7 @@ public static void init(Context context) {
       }
       database = databaseManager.getWritableDatabase();
     } catch (Throwable t) {
-      Log.e("Cannot create database.", t);
-      Util.handleException(t);
+      handleSQLiteError("Cannot create database.", t);
     }
   }
 
@@ -93,9 +94,9 @@ static void insertEvent(String event) {
     contentValues.put(COLUMN_DATA, event);
     try {
       database.insert(EVENT_TABLE_NAME, null, contentValues);
+      willSendErrorLog = false;
     } catch (Throwable t) {
-      Log.e("Unable to insert event to database.", t);
-      Util.handleException(t);
+      handleSQLiteError("Unable to insert event to database.", t);
     }
     contentValues.clear();
   }
@@ -115,14 +116,14 @@ static List<Map<String, Object>> getEvents(int count) {
     try {
       cursor = database.query(EVENT_TABLE_NAME, new String[] {COLUMN_DATA}, null, null, null,
           null, KEY_ROWID + " ASC", "" + count);
+      willSendErrorLog = false;
       while (cursor.moveToNext()) {
         Map<String, Object> requestArgs = JsonConverter.mapFromJson(new JSONObject(
             cursor.getString(cursor.getColumnIndex(COLUMN_DATA))));
         events.add(requestArgs);
       }
     } catch (Throwable t) {
-      Log.e("Unable to get events from the table.", t);
-      Util.handleException(t);
+      handleSQLiteError("Unable to get events from the table.", t);
     } finally {
       if (cursor != null) {
         cursor.close();
@@ -143,9 +144,9 @@ static void deleteEvents(int count) {
     try {
       database.delete(EVENT_TABLE_NAME, KEY_ROWID + " in (select " + KEY_ROWID + " from " +
           EVENT_TABLE_NAME + " ORDER BY " + KEY_ROWID + " ASC LIMIT " + count + ")", null);
+      willSendErrorLog = false;
     } catch (Throwable t) {
-      Log.e("Unable to delete events from the table.", t);
-      Util.handleException(t);
+      handleSQLiteError("Unable to delete events from the table.", t);
     }
   }
 
@@ -161,13 +162,25 @@ static long getEventsCount() {
     }
     try {
       count = DatabaseUtils.queryNumEntries(database, EVENT_TABLE_NAME);
+      willSendErrorLog = false;
     } catch (Throwable t) {
-      Log.e("Unable to get a number of rows in the table.", t);
-      Util.handleException(t);
+      handleSQLiteError("Unable to get a number of rows in the table.", t);
     }
     return count;
   }
 
+  /**
+   * Helper function that logs and sends errors to the server.
+   */
+  private static void handleSQLiteError(String log, Throwable t) {
+    Log.e(log, t);
+    // Send error log. Using willSendErrorLog to prevent infinte loop.
+    if (!willSendErrorLog) {
+      willSendErrorLog = true;
+      Util.handleException(t);
+    }
+  }
+
   private static class LeanplumDataBaseManager extends SQLiteOpenHelper {
     LeanplumDataBaseManager(Context context) {
       super(context, DATABASE_NAME, null, DATABASE_VERSION);

AndroidSDK/src/com/leanplum/internal/Request.java

@@ -87,6 +87,8 @@ public class Request {
 
   private static ApiResponseCallback apiResponse;
 
+  private static List<Map<String, Object>> localErrors = new ArrayList<>();
+
   public static void setAppId(String appId, String accessKey) {
     Request.appId = appId;
     Request.accessKey = accessKey;
@@ -144,7 +146,10 @@ public Request(String httpMethod, String apiMethod, Map<String, Object> params)
     this.httpMethod = httpMethod;
     this.apiMethod = apiMethod;
     this.params = params != null ? params : new HashMap<String, Object>();
-
+    // Check if it is error and here was SQLite exception.
+    if (Constants.Methods.LOG.equals(apiMethod) && LeanplumEventDataManager.willSendErrorLog) {
+      localErrors.add(createArgsDictionary());
+    }
     // Make sure the Handler is initialized on the main thread.
     OsHandler.getInstance();
   }
@@ -387,9 +392,21 @@ protected Void doInBackground(Void... params) {
   }
 
   private void sendRequests() {
-    List<Map<String, Object>> unsentRequests = getUnsentRequests();
-    List<Map<String, Object>> requestsToSend =
-        removeIrrelevantBackgroundStartRequests(unsentRequests);
+    List<Map<String, Object>> unsentRequests = new ArrayList<>();
+    List<Map<String, Object>> requestsToSend;
+    // Check if we have localErrors, if yes then we will send only errors to the server.
+    if (localErrors.size() != 0) {
+      String uuid = UUID.randomUUID().toString();
+      for (Map<String, Object> error : localErrors) {
+        error.put(UUID_KEY, uuid);
+        unsentRequests.add(error);
+      }
+      requestsToSend = unsentRequests;
+    } else {
+      unsentRequests = getUnsentRequests();
+      requestsToSend = removeIrrelevantBackgroundStartRequests(unsentRequests);
+    }
+
     if (requestsToSend.isEmpty()) {
       return;
     }
@@ -420,6 +437,8 @@ private void sendRequests() {
 
         Exception errorException = null;
         if (statusCode >= 200 && statusCode <= 299) {
+          // Clear localErrrors list.
+          localErrors.clear();
           deleteSentRequests(unsentRequests.size());
           if (unsentRequests.size() == MAX_EVENTS_PER_API_CALL) {
             sendRequests();