Merge branch 'release/3.0.2'

Author: Enuviel

.gitignore

@@ -70,6 +70,7 @@ $RECYCLE.BIN/
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/dictionaries
+.idea/**
 
 # Sensitive or high-churn files:
 .idea/**/dataSources/

.idea/compiler.xml

@@ -2,9 +2,9 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.jfrog.artifactory'
 apply plugin: 'maven-publish'
 
-def COMPILE_SDK_VERSION=26
-def BUILD_TOOLS_VERSION='26.0.1'
-def SUPPORT_LIBRARY_VERSION='26.1.0'
+def COMPILE_SDK_VERSION=27
+def BUILD_TOOLS_VERSION='27.0.2'
+def SUPPORT_LIBRARY_VERSION='27.0.2'
 
 allprojects {
     gradle.projectsEvaluated {
@@ -16,19 +16,17 @@ allprojects {
 
 dependencies {
     // Compile dependencies will be added as dependency in pom file.
-    //noinspection GradleDynamicVersion
-    compile "com.android.support:support-v4:[22.0.0,${SUPPORT_LIBRARY_VERSION}]"
-    //noinspection GradleDynamicVersion
-    compile "com.android.support:appcompat-v7:[22.0.0,${SUPPORT_LIBRARY_VERSION}]"
+    api "com.android.support:support-v4:[22.0.0,${SUPPORT_LIBRARY_VERSION}]"
+    api "com.android.support:appcompat-v7:[22.0.0,${SUPPORT_LIBRARY_VERSION}]"
 
     // Provided dependencies are optional dependencies and will not show up in pom file.
-    provided('com.google.android.gms:play-services-gcm:[8.3.0,)') {
+    compileOnly('com.google.android.gms:play-services-gcm:[8.3.0,)') {
         exclude module: 'support-v4'
     }
-    provided('com.google.firebase:firebase-messaging:[10.0.0,)') {
+    compileOnly('com.google.firebase:firebase-messaging:[10.0.0,)') {
         exclude module: 'support-v4'
     }
-    provided('com.google.android.gms:play-services-location:[10.0.0,)') {
+    compileOnly('com.google.android.gms:play-services-location:[10.0.0,)') {
         exclude module: 'support-v4'
     }
 }
@@ -37,7 +35,7 @@ android {
     compileSdkVersion COMPILE_SDK_VERSION
     buildToolsVersion BUILD_TOOLS_VERSION
     useLibrary 'org.apache.http.legacy'
-    publishNonDefault true
+//    publishNonDefault true
 
     defaultConfig {
         consumerProguardFiles 'consumer-proguard-rules.pro'
@@ -119,7 +117,7 @@ publishing {
 
                 // Iterate over the compile dependencies (we don't want the test ones),
                 // adding a <dependency> node for each.
-                configurations.compile.allDependencies.each {
+                configurations.api.allDependencies.each {
                     if (it.group != null && it.name != null) {
                         def dependencyNode = dependenciesNode.appendNode('dependency')
                         dependencyNode.appendNode('groupId', it.group)
@@ -144,7 +142,7 @@ publishing {
 
                 // Iterate over the compile dependencies (we don't want the test ones),
                 // adding a <dependency> node for each.
-                configurations.compile.allDependencies.each {
+                configurations.api.allDependencies.each {
                     if (it.group != null && it.name != null) {
                         def dependencyNode = dependenciesNode.appendNode('dependency')
                         dependencyNode.appendNode('groupId', it.group)

.idea/misc.xml

@@ -295,6 +295,20 @@ public static void setDeviceId(String deviceId) {
     userSpecifiedDeviceId = true;
   }
 
+  /**
+   * Gets the deviceId in the current Leanplum session. This should only be called after
+   * {@link Leanplum#start}.
+   *
+   * @return String Returns the deviceId in the current Leanplum session.
+   */
+  public static String getDeviceId() {
+    if (!LeanplumInternal.hasCalledStart()) {
+      Log.e("Leanplum.start() must be called before calling getDeviceId.");
+      return null;
+    }
+    return Request.deviceId();
+  }
+
   /**
    * Sets the application context. This should be the first call to Leanplum.
    */
@@ -1921,6 +1935,8 @@ public void response(JSONObject response) {
               applyContentInResponse(response, false);
               if (response.optBoolean(Constants.Keys.SYNC_INBOX, false)) {
                 LeanplumInbox.getInstance().downloadMessages();
+              } else {
+                LeanplumInbox.getInstance().triggerInboxSyncedWithStatus(true);
               }
               if (response.optBoolean(Constants.Keys.LOGGING_ENABLED, false)) {
                 Constants.loggingEnabled = true;
@@ -1940,6 +1956,7 @@ public void error(Exception e) {
           if (callback != null) {
             OsHandler.getInstance().post(callback);
           }
+          LeanplumInbox.getInstance().triggerInboxSyncedWithStatus(false);
         }
       });
       req.sendIfConnected();

.idea/modules.xml

@@ -25,6 +25,7 @@
 import android.content.SharedPreferences;
 
 import com.leanplum.callbacks.InboxChangedCallback;
+import com.leanplum.callbacks.InboxSyncedCallback;
 import com.leanplum.callbacks.VariablesChangedCallback;
 import com.leanplum.internal.AESCrypt;
 import com.leanplum.internal.CollectionUtil;
@@ -65,13 +66,15 @@ public class LeanplumInbox {
   private boolean didLoad = false;
 
   private final List<InboxChangedCallback> changedCallbacks;
+  private final List<InboxSyncedCallback> syncedCallbacks;
   private final Object updatingLock = new Object();
 
   private LeanplumInbox() {
     this.unreadCount = 0;
     this.messages = new HashMap<>();
     this.didLoad = false;
     this.changedCallbacks = new ArrayList<>();
+    this.syncedCallbacks = new ArrayList<>();
     downloadedImageUrls = new HashSet<>();
   }
 
@@ -178,6 +181,29 @@ public void removeChangedHandler(InboxChangedCallback handler) {
     }
   }
 
+  /**
+   * Add a callback for when the forceContentUpdate was called.
+   *
+   * @param handler InboxSyncedCallback callback that need to be added.
+   */
+  public void addSyncedHandler(InboxSyncedCallback handler) {
+    synchronized (syncedCallbacks) {
+      syncedCallbacks.add(handler);
+    }
+  }
+
+
+  /**
+   * Removes a inbox synced callback.
+   *
+   * @param handler InboxSyncedCallback callback that need to be removed.
+   */
+  public void removeSyncedHandler(InboxSyncedCallback handler) {
+    synchronized (syncedCallbacks) {
+      syncedCallbacks.remove(handler);
+    }
+  }
+
   /**
    * Static 'getInstance' method.
    */
@@ -241,6 +267,19 @@ void triggerChanged() {
     }
   }
 
+  /**
+   * Trigger InboxSyncedCallback with status of forceContentUpdate.
+   * @param success True if forceContentUpdate was successful.
+   */
+  void triggerInboxSyncedWithStatus(boolean success) {
+    synchronized (changedCallbacks) {
+      for (InboxSyncedCallback callback : syncedCallbacks) {
+        callback.setSuccess(success);
+        OsHandler.getInstance().post(callback);
+      }
+    }
+  }
+
   void load() {
     if (Constants.isNoop()) {
       return;
@@ -353,6 +392,7 @@ public void response(JSONObject response) {
 
           if (!willDownladImages) {
             update(messages, unreadCount, true);
+            triggerInboxSyncedWithStatus(true);
             return;
           }
 
@@ -362,13 +402,21 @@ public void response(JSONObject response) {
                 @Override
                 public void variablesChanged() {
                   update(messages, totalUnreadCount, true);
+                  triggerInboxSyncedWithStatus(true);
                 }
               });
         } catch (Throwable t) {
+          triggerInboxSyncedWithStatus(false);
           Util.handleException(t);
         }
       }
     });
+    req.onError(new Request.ErrorCallback() {
+      @Override
+      public void error(Exception e) {
+        triggerInboxSyncedWithStatus(false);
+      }
+    });
     req.sendIfConnected();
   }