Merge branch 'master' into un-X

Author: e7mac

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

@@ -552,46 +552,47 @@ static synchronized void start(final Context context, final String userId,
         }
         return;
       }
-      // Reduce latency by running the rest of the start call in a background thread.
-      Util.executeAsyncTask(true, new AsyncTask<Void, Void, Void>() {
-        @Override
-        protected Void doInBackground(Void... params) {
-          initializedMessageTemplates = true;
-          MessageTemplates.register(Leanplum.getContext());
 
-          LeanplumInternal.setStartedInBackground(actuallyInBackground);
+      initializedMessageTemplates = true;
+      MessageTemplates.register(Leanplum.getContext());
 
-          final Map<String, ?> validAttributes = LeanplumInternal.validateAttributes(attributes,
-              "userAttributes", true);
-          LeanplumInternal.setCalledStart(true);
+      LeanplumInternal.setStartedInBackground(actuallyInBackground);
 
-          if (validAttributes != null) {
-            LeanplumInternal.getUserAttributeChanges().add(validAttributes);
-          }
+      final Map<String, ?> validAttributes = LeanplumInternal.validateAttributes(attributes,
+          "userAttributes", true);
+      LeanplumInternal.setCalledStart(true);
 
-          RequestOld.loadToken();
-          VarCache.setSilent(true);
-          VarCache.loadDiffs();
-          VarCache.setSilent(false);
-          LeanplumInbox.getInstance().load();
-
-          // Setup class members.
-          VarCache.onUpdate(new CacheUpdateBlock() {
-            @Override
-            public void updateCache() {
-              triggerVariablesChanged();
-              if (RequestOld.numPendingDownloads() == 0) {
-                triggerVariablesChangedAndNoDownloadsPending();
-              }
-            }
-          });
-          RequestOld.onNoPendingDownloads(new RequestOld.NoPendingDownloadsCallback() {
-            @Override
-            public void noPendingDownloads() {
-              triggerVariablesChangedAndNoDownloadsPending();
-            }
-          });
+      if (validAttributes != null) {
+        LeanplumInternal.getUserAttributeChanges().add(validAttributes);
+      }
+
+      RequestOld.loadToken();
+      VarCache.setSilent(true);
+      VarCache.loadDiffs();
+      VarCache.setSilent(false);
+      LeanplumInbox.getInstance().load();
+
+      // Setup class members.
+      VarCache.onUpdate(new CacheUpdateBlock() {
+        @Override
+        public void updateCache() {
+          triggerVariablesChanged();
+          if (RequestOld.numPendingDownloads() == 0) {
+            triggerVariablesChangedAndNoDownloadsPending();
+          }
+        }
+      });
+      RequestOld.onNoPendingDownloads(new RequestOld.NoPendingDownloadsCallback() {
+        @Override
+        public void noPendingDownloads() {
+          triggerVariablesChangedAndNoDownloadsPending();
+        }
+      });
 
+      // Reduce latency by running the rest of the start call in a background thread.
+      Util.executeAsyncTask(true, new AsyncTask<Void, Void, Void>() {
+        @Override
+        protected Void doInBackground(Void... params) {
           try {
             startHelper(userId, validAttributes, actuallyInBackground);
           } catch (Throwable t) {

sdk-version.txt

@@ -1 +1 @@
-5.0.0
+5.2.0