Merge branch 'master' into release/4.2.7

Author: e7mac

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,14 @@
-Fixes #
+What              | Where/Who
+------------------|----------------------------------------
+JIRA Issue        | [JIRA_TICKET_ID](https://leanplum.atlassian.net/browse/JIRA_TICKET_ID)
+People Involved   | @colleague1, @colleague2
 
-## Proposed Changes
+[Notes on PR descriptions](https://leanplum.atlassian.net/wiki/spaces/PR/pages/288424408/Creating+a+GitHub+Pull+Request)
 
-  -
-  -
-  -
+## Background
 
+## Implementation
+
+## Testing steps
+
+## Is this change backwards-compatible?

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

@@ -626,7 +626,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();
@@ -812,6 +812,8 @@ protected Void doInBackground(Void... params) {
             if (variants == null) {
               Log.d("No variants received from the server.");
             }
+            Map<String, String> filenameToURLs = parseFilenameToURLs(response);
+            FileManager.setFilenameToURLs(filenameToURLs);
 
             if (BuildUtil.isNotificationChannelSupported(context)) {
               // Get notification channels and groups.
@@ -2110,6 +2112,8 @@ public void response(JSONObject response) {
               }
 
               parseVariantDebugInfo(response);
+              Map<String, String> filenameToURLs = parseFilenameToURLs(response);
+              FileManager.setFilenameToURLs(filenameToURLs);
             }
             if (callback != null) {
               OsHandler.getInstance().post(callback);
@@ -2228,6 +2232,7 @@ public static Map<String, Object> getVariantDebugInfo() {
    */
   public static void setDeviceLocation(Location location) {
     setDeviceLocation(location, LeanplumLocationAccuracyType.CELL);
+    Leanplum.countAggregator().incrementCount("setDeviceLocation");
   }
 
   /**
@@ -2243,6 +2248,7 @@ public static void setDeviceLocation(Location location, LeanplumLocationAccuracy
           "call setDeviceLocation. If you prefer to always set location manually, " +
           "then call disableLocationCollection.");
     }
+    Leanplum.countAggregator().incrementCount("setDeviceLocation_type");
     LeanplumInternal.setUserLocationAttribute(location, type,
         new LeanplumInternal.locationAttributeRequestsCallback() {
           @Override
@@ -2304,6 +2310,16 @@ public static Set<String> parseFeatureFlags(JSONObject response) {
     return featureFlagSet;
   }
 
+  @VisibleForTesting
+  public static Map<String, String> parseFilenameToURLs(JSONObject response) {
+    JSONObject filesObject = response.optJSONObject(
+            Constants.Keys.FILES);
+    if (filesObject != null) {
+      return JsonConverter.mapFromJson(filesObject);
+    }
+    return null;
+  }
+
   private static Set<String> toSet(JSONArray array) {
     Set<String> set = new HashSet<>();
     if (array != null) {

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

@@ -212,6 +212,7 @@ public static class Keys {
     public static final String LOGGING_ENABLED = "loggingEnabled";
     public static final String ENABLED_COUNTERS = "enabledSdkCounters";
     public static final String ENABLED_FEATURE_FLAGS = "enabledFeatureFlags";
+    public static final String FILES = "files";
     public static final String TIMEZONE = "timezone";
     public static final String TIMEZONE_OFFSET_SECONDS = "timezoneOffsetSeconds";
     public static final String TITLE = "Title";

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

@@ -66,6 +66,7 @@ interface ResourceUpdateCallback {
   private static boolean initializing = false;
   static final Object initializingLock = new Object();
   public static Var<HashMap<String, Object>> resources = null;
+  public static Map<String, String> filenameToURLs = null;
 
   public enum DownloadFileResult {
     NONE,
@@ -108,6 +109,9 @@ public static DownloadFileResult maybeDownloadFile(boolean isResource, String st
       if (!FileManager.fileExistsAtPath(realPath)) {
         realPath = FileManager.fileRelativeToDocuments(stringValue);
         if (!FileManager.fileExistsAtPath(realPath)) {
+          if (FileManager.filenameToURLs != null && FileManager.filenameToURLs.containsKey(stringValue) && urlValue == null) {
+            urlValue = FileManager.filenameToURLs.get(stringValue);
+          }
           RequestOld downloadRequest = RequestOld.get(Constants.Methods.DOWNLOAD_FILE, null);
           downloadRequest.onResponse(new RequestOld.ResponseCallback() {
             @Override
@@ -185,6 +189,10 @@ public static boolean fileExistsAtPath(String path) {
     return path != null && new File(path).exists();
   }
 
+  public static void setFilenameToURLs(Map<String, String> filenameToURLs) {
+    FileManager.filenameToURLs = filenameToURLs;
+  }
+
   @SuppressWarnings("SameReturnValue")
   private static String appBundlePath() {
     return "";

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,6 +25,8 @@
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Build;
+import android.os.Looper;
+import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
@@ -215,7 +217,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.
@@ -274,22 +276,27 @@ public Map<String, Object> createArgsDictionary() {
 
   private void saveRequestForLater(Map<String, Object> args) {
     try {
+
+      Context context = Leanplum.getContext();
+      if (context == null) {
+        return;
+      }
+
       requestSequenceRecorder.beforeWrite();
 
       synchronized (RequestOld.class) {
-        Context context = Leanplum.getContext();
         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
@@ -365,9 +372,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"));
     }
@@ -524,7 +531,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
@@ -692,7 +698,7 @@ public void sendEventually() {
       return;
     }
 
-    if (LeanplumEventDataManager.willSendErrorLog) {
+    if (LeanplumEventDataManager.sharedInstance().willSendErrorLogs()) {
       return;
     }
 
@@ -709,7 +715,7 @@ static void deleteSentRequests(int requestsCount) {
       return;
     }
     synchronized (RequestOld.class) {
-      LeanplumEventDataManager.deleteEvents(requestsCount);
+      LeanplumEventDataManager.sharedInstance().deleteEvents(requestsCount);
     }
   }
 
@@ -723,7 +729,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