Fixing DB not initialized when PN arrives (#368)

* Fixing DB not initialized when PN arrives

* Fixing failing test

* Fixing failing tests

* Fixing failing test case

* Setting context in service onCreate

* Fixing PR comments

Author: milos1290

AndroidSDKCore/src/main/java/com/leanplum/Leanplum.java

@@ -625,7 +625,7 @@ private static void checkAndStartNotificationsModules() {
 
   private static void startHelper(
       String userId, final Map<String, ?> attributes, final boolean isBackground) {
-    LeanplumEventDataManager.init(context);
+    LeanplumEventDataManager.sharedInstance();
     checkAndStartNotificationsModules();
     Boolean limitAdTracking = null;
     String deviceId = RequestOld.deviceId();

AndroidSDKCore/src/main/java/com/leanplum/internal/LeanplumEventDataManager.java

@@ -48,53 +48,58 @@
  * @author Anna Orlova
  */
 public class LeanplumEventDataManager {
+
+  private static LeanplumEventDataManager instance;
+
   private static final String DATABASE_NAME = "__leanplum.db";
   private static final int DATABASE_VERSION = 1;
   private static final String EVENT_TABLE_NAME = "event";
   private static final String COLUMN_DATA = "data";
   private static final String KEY_ROWID = "rowid";
 
-  private static SQLiteDatabase database;
-  private static LeanplumDataBaseManager databaseManager;
-  private static ContentValues contentValues = new ContentValues();
+  private SQLiteDatabase database;
+  private LeanplumDataBaseManager databaseManager;
+  private ContentValues contentValues = new ContentValues();
+  private boolean sendErrorLogs = false;
 
-  static boolean willSendErrorLog = false;
+  private LeanplumEventDataManager() {
+    try {
+      Context context = Leanplum.getContext();
 
-  /**
-   * Creates connection to database, if database is not present, it will automatically create it.
-   *
-   * @param context Current context.
-   */
-  public static void init(Context context) {
-    if (database != null) {
-      Log.e("Database is already initialized.");
-      return;
-    }
+      if (context == null) {
+        return;
+      }
 
-    // Create database if needed.
-    try {
       if (databaseManager == null) {
-        databaseManager = new LeanplumDataBaseManager(context);
+        databaseManager = new LeanplumDataBaseManager(Leanplum.getContext());
       }
       database = databaseManager.getWritableDatabase();
+
     } catch (Throwable t) {
       handleSQLiteError("Cannot create database.", t);
     }
   }
 
+  public static LeanplumEventDataManager sharedInstance() {
+    if (instance == null) {
+      instance = new LeanplumEventDataManager();
+    }
+    return instance;
+  }
+
   /**
    * Inserts event to event table.
    *
    * @param event String with json of event.
    */
-  static void insertEvent(String event) {
+  void insertEvent(String event) {
     if (database == null) {
       return;
     }
     contentValues.put(COLUMN_DATA, event);
     try {
       database.insert(EVENT_TABLE_NAME, null, contentValues);
-      willSendErrorLog = false;
+      sendErrorLogs = false;
     } catch (Throwable t) {
       handleSQLiteError("Unable to insert event to database.", t);
     }
@@ -108,7 +113,7 @@ static void insertEvent(String event) {
    * @param count Number of events.
    * @return List of events.
    */
-  static List<Map<String, Object>> getEvents(int count) {
+  List<Map<String, Object>> getEvents(int count) {
     List<Map<String, Object>> events = new ArrayList<>();
     if (database == null) {
       return events;
@@ -117,7 +122,7 @@ 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;
+      sendErrorLogs = false;
       while (cursor.moveToNext()) {
         Map<String, Object> requestArgs = JsonConverter.mapFromJson(new JSONObject(
             cursor.getString(cursor.getColumnIndex(COLUMN_DATA))));
@@ -139,14 +144,14 @@ static List<Map<String, Object>> getEvents(int count) {
    *
    * @param count Number of event that need to be deleted.
    */
-  static void deleteEvents(int count) {
+  void deleteEvents(int count) {
     if (database == null) {
       return;
     }
     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;
+      sendErrorLogs = false;
     } catch (Throwable t) {
       handleSQLiteError("Unable to delete events from the table.", t);
     }
@@ -158,33 +163,41 @@ static void deleteEvents(int count) {
    *
    * @return Number of rows in the event table.
    */
-  static long getEventsCount() {
+  long getEventsCount() {
     long count = 0;
     if (database == null) {
       return count;
     }
     try {
       count = DatabaseUtils.queryNumEntries(database, EVENT_TABLE_NAME);
-      willSendErrorLog = false;
+      sendErrorLogs = false;
     } catch (Throwable t) {
       handleSQLiteError("Unable to get a number of rows in the table.", t);
     }
     return count;
   }
 
+  /**
+   * Whether we are going to send error log or not.
+   */
+  boolean willSendErrorLogs() {
+    return sendErrorLogs;
+  }
+
   /**
    * Helper function that logs and sends errors to the server.
    */
-  private static void handleSQLiteError(String log, Throwable t) {
+  private void handleSQLiteError(String log, Throwable t) {
     Log.e(log, t);
     // Send error log. Using willSendErrorLog to prevent infinte loop.
-    if (!willSendErrorLog) {
-      willSendErrorLog = true;
+    if (!sendErrorLogs) {
+      sendErrorLogs = true;
       Util.handleException(t);
     }
   }
 
   private static class LeanplumDataBaseManager extends SQLiteOpenHelper {
+
     LeanplumDataBaseManager(Context context) {
       super(context, DATABASE_NAME, null, DATABASE_VERSION);
     }
@@ -239,6 +252,8 @@ private static void migrateFromSharedPreferences(SQLiteDatabase db) {
 
         editor.remove(Constants.Defaults.COUNT_KEY);
 
+        ContentValues contentValues = new ContentValues();
+
         try {
           String uuid = preferences.getString(Constants.Defaults.UUID_KEY, null);
           if (uuid == null || count % RequestOld.MAX_EVENTS_PER_API_CALL == 0) {

AndroidSDKCore/src/main/java/com/leanplum/internal/RequestOld.java

@@ -25,8 +25,12 @@
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Build;
+
+import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
+
+import android.os.Looper;
 import android.text.TextUtils;
 
 import com.leanplum.Leanplum;
@@ -215,7 +219,7 @@ public RequestOld(String httpMethod, String apiMethod, Map<String, Object> param
     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) {
+    if (Constants.Methods.LOG.equals(apiMethod) && LeanplumEventDataManager.sharedInstance().willSendErrorLogs()) {
       localErrors.add(createArgsDictionary());
     }
     // Make sure the Handler is initialized on the main thread.
@@ -286,15 +290,15 @@ private void saveRequestForLater(Map<String, Object> args) {
         SharedPreferences preferences = context.getSharedPreferences(
             LEANPLUM, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = preferences.edit();
-        long count = LeanplumEventDataManager.getEventsCount();
+        long count = LeanplumEventDataManager.sharedInstance().getEventsCount();
         String uuid = preferences.getString(Constants.Defaults.UUID_KEY, null);
         if (uuid == null || count % MAX_EVENTS_PER_API_CALL == 0) {
           uuid = UUID.randomUUID().toString();
           editor.putString(Constants.Defaults.UUID_KEY, uuid);
           SharedPreferencesUtil.commitChanges(editor);
         }
         args.put(UUID_KEY, uuid);
-        LeanplumEventDataManager.insertEvent(JsonConverter.toJson(args));
+        LeanplumEventDataManager.sharedInstance().insertEvent(JsonConverter.toJson(args));
 
         dataBaseIndex = count;
         // Checks if here response and/or error callback for this request. We need to add callbacks to
@@ -370,9 +374,9 @@ private void sendIfDelayedHelper() {
 
   public void sendIfConnected() {
     if (Util.isConnected()) {
-      this.sendNow();
+      sendNow();
     } else {
-      this.sendEventually();
+      sendEventually();
       Log.i("Device is offline, will send later");
       triggerErrorCallback(new Exception("Not connected to the Internet"));
     }
@@ -529,7 +533,6 @@ protected Void doInBackground(Void... params) {
     });
   }
 
-
   /**
    * This class wraps the unsent requests, requests that we need to send
    * and the JSON encoded string. Wrapping it in the class allows us to
@@ -697,7 +700,7 @@ public void sendEventually() {
       return;
     }
 
-    if (LeanplumEventDataManager.willSendErrorLog) {
+    if (LeanplumEventDataManager.sharedInstance().willSendErrorLogs()) {
       return;
     }
 
@@ -714,7 +717,7 @@ static void deleteSentRequests(int requestsCount) {
       return;
     }
     synchronized (RequestOld.class) {
-      LeanplumEventDataManager.deleteEvents(requestsCount);
+      LeanplumEventDataManager.sharedInstance().deleteEvents(requestsCount);
     }
   }
 
@@ -728,7 +731,7 @@ public List<Map<String, Object>> getUnsentRequests(double fraction) {
               LEANPLUM, Context.MODE_PRIVATE);
       SharedPreferences.Editor editor = preferences.edit();
       int count = (int) (fraction * MAX_EVENTS_PER_API_CALL);
-      requestData = LeanplumEventDataManager.getEvents(count);
+      requestData = LeanplumEventDataManager.sharedInstance().getEvents(count);
       editor.remove(Constants.Defaults.UUID_KEY);
       SharedPreferencesUtil.commitChanges(editor);
       // if we send less than 100% of requests, we need to reset the batch

AndroidSDKFcm/src/main/java/com/leanplum/LeanplumPushFirebaseMessagingService.java

@@ -41,15 +41,21 @@
 @SuppressLint("Registered")
 public class LeanplumPushFirebaseMessagingService extends FirebaseMessagingService {
 
+  @Override
+  public void onCreate() {
+    super.onCreate();
+    Leanplum.setApplicationContext(getApplicationContext());
+  }
+
   @Override
   public void onNewToken(String token) {
     super.onNewToken(token);
 
     LeanplumPushService.setCloudMessagingProvider(new LeanplumFcmProvider());
-    LeanplumPushService.getCloudMessagingProvider().storePreferences(this.getApplicationContext(), token);
+    LeanplumPushService.getCloudMessagingProvider().storePreferences(getApplicationContext(), token);
 
     //send the new token to backend
-    LeanplumPushService.getCloudMessagingProvider().onRegistrationIdReceived(this.getApplicationContext(), token);
+    LeanplumPushService.getCloudMessagingProvider().onRegistrationIdReceived(getApplicationContext(), token);
   }
 
   /**
@@ -61,12 +67,9 @@ public void onNewToken(String token) {
   @Override
   public void onMessageReceived(RemoteMessage remoteMessage) {
     try {
-      if (Leanplum.getContext() == null) {
-        Leanplum.setApplicationContext(this);
-      }
       Map<String, String> messageMap = remoteMessage.getData();
       if (messageMap.containsKey(Constants.Keys.PUSH_MESSAGE_TEXT)) {
-        LeanplumPushService.handleNotification(this, getBundle(messageMap));
+        LeanplumPushService.handleNotification(getApplicationContext(), getBundle(messageMap));
       }
       Log.i("Received: " + messageMap.toString());
     } catch (Throwable t) {

AndroidSDKPush/src/main/java/com/leanplum/LeanplumPushService.java

@@ -57,6 +57,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.concurrent.CountDownLatch;
 
 /**
  * Leanplum push notification service class, handling initialization, opening, showing, integration
@@ -367,6 +368,9 @@ private static void showNotification(Context context, final Bundle message) {
       // Check if we have a chained message, and if it exists in var cache.
       if (ActionContext.shouldForceContentUpdateForChainedMessage(
           JsonConverter.fromJson(message.getString(Keys.PUSH_MESSAGE_ACTION)))) {
+
+        final CountDownLatch countDownLatch = new CountDownLatch(1);
+
         final int currentNotificationId = notificationId;
         final Notification.Builder currentNotificationBuilder = notificationBuilder;
         final NotificationCompat.Builder currentNotificationCompatBuilder = notificationCompatBuilder;
@@ -378,8 +382,10 @@ public void variablesChanged() {
             } else {
               notificationManager.notify(currentNotificationId, currentNotificationCompatBuilder.build());
             }
+            countDownLatch.countDown();
           }
         });
+        countDownLatch.await();
       } else {
         if (notificationBuilder != null) {
           notificationManager.notify(notificationId, notificationBuilder.build());

AndroidSDKTests/src/test/java/com/leanplum/LeanplumTest.java

@@ -437,7 +437,7 @@ public void testCrashes() throws Exception {
 
     Context currentCotext = Leanplum.getContext();
     assertNotNull(currentCotext);
-    LeanplumEventDataManager.init(Leanplum.getContext());
+    LeanplumEventDataManager.sharedInstance();
 
     // Add two events to database.
     RequestOld request1 = new RequestOld("POST", Constants.Methods.GET_INBOX_MESSAGES, null);

AndroidSDKTests/src/test/java/com/leanplum/__setup/AbstractTest.java

@@ -129,8 +129,8 @@ public void before() throws Exception {
     // Mock with our executor which will run on main thread.
     ReflectionHelpers.setStaticField(Util.class, "asyncExecutor", new SynchronousExecutor());
     ReflectionHelpers.setStaticField(Util.class, "singleThreadExecutor", new SynchronousExecutor());
-    ReflectionHelpers.setStaticField(LeanplumEventDataManager.class, "databaseManager", null);
-    ReflectionHelpers.setStaticField(LeanplumEventDataManager.class, "database", null);
+
+    ReflectionHelpers.setStaticField(LeanplumEventDataManager.class, "instance", null);
     // Get and set application context.
     mContext = RuntimeEnvironment.application;
     Leanplum.setApplicationContext(mContext);

AndroidSDKTests/src/test/java/com/leanplum/internal/LeanplumEventDataManagerTest.java

@@ -67,10 +67,6 @@ public void setUp() {
     Leanplum.setApplicationContext(this.mContext);
   }
 
-  /**
-   * Test for {@link LeanplumEventDataManager.LeanplumDataBaseManager#migrateFromSharedPreferences(
-   *SQLiteDatabase)} that should migrate data from shared preferences to SQLite.
-   */
   @Test
   public void migrateFromSharedPreferencesTest() {
     setDatabaseToNull();
@@ -99,16 +95,16 @@ public void migrateFromSharedPreferencesTest() {
     assertEquals(3, count);
 
     // Create database. That should also migrate data from shared preferences.
-    LeanplumEventDataManager.init(mContext);
+    LeanplumEventDataManager.sharedInstance();
     // Assert in database after migration 3 events.
-    assertEquals(count, LeanplumEventDataManager.getEventsCount());
+    assertEquals(count, LeanplumEventDataManager.sharedInstance().getEventsCount());
 
     // Assert count 0 after data migration.
     count = preferences.getInt(Constants.Defaults.COUNT_KEY, 0);
     assertEquals(0, count);
 
     // Get list of events from SQLite.
-    List<Map<String, Object>> events = LeanplumEventDataManager.getEvents(3);
+    List<Map<String, Object>> events = LeanplumEventDataManager.sharedInstance().getEvents(3);
     assertNotNull(events);
     assertEquals(3, events.size());
     // Checks that all events inserted to SQLite in order.
@@ -120,10 +116,7 @@ public void migrateFromSharedPreferencesTest() {
   }
 
   public static void setDatabaseToNull(){
-    ReflectionHelpers.setStaticField(LeanplumEventDataManager.class, "databaseManager",
-        null);
-    ReflectionHelpers.setStaticField(LeanplumEventDataManager.class, "database",
-        null);
+    ReflectionHelpers.setStaticField(LeanplumEventDataManager.class, "instance", null);
   }
 }