Fix CT initialization when Leanplum.start is called later (#574)

* Fix CT initialization when Leanplum.start is called later than Application.onCreate

* Fix deviceId and userId storage when LP token is null (#575)

* Fix travis build

Author: vasct

.travis.yml

@@ -1,19 +1,12 @@
 if: (tag IS present) OR (type = pull_request)
 
 language: android
+dist: bionic
+jdk: openjdk17
 
 env:
   global:
     - JAVA_TOOL_OPTIONS=-Dhttps.protocols=TLSv1.2
-    - BUILD_API=34
-    - BUILD_TOOLS=34.0.0
-    - ABI=x86
-    - EMU_API=22
-    - EMU_FLAVOR=default
-    - ANDROID_HOME=/usr/local/android-sdk
-    - TOOLS=${ANDROID_HOME}/cmdline-tools/latest
-    # PATH order is important, the 'emulator' script exists in more than one place
-    - PATH=${ANDROID_HOME}:${ANDROID_HOME}/emulator:${TOOLS}:${TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH}
     # If you want to run snapshot tests change value to 'true'. Build time will be increased by 6 minutes.
     - RUN_SNAPSHOT_TESTS=false
     - ROBOLECTRIC_SDK8_URL=https://repo1.maven.org/maven2/org/robolectric/android-all/8.0.0_r4-robolectric-r1/android-all-8.0.0_r4-robolectric-r1
@@ -23,36 +16,26 @@ env:
 android:
   components:
     - tools
+    - platform-tools
+    - tools
+    - build-tools-34.0.0
+    - android-34
+    - extras;android;m2repository
+   # Uncomment for snapshot tests
+   #- sys-img-x86-android-22
 
-licenses:
+  licenses:
   - 'android-sdk-preview-license-.+'
   - 'android-sdk-license-.+'
   - 'google-gdk-license-.+'
 
 before_install:
-  - curl -s "https://get.sdkman.io" | bash
-  - source "$HOME/.sdkman/bin/sdkman-init.sh"
-  - sdk install java 17.0.2-open
-  - sdk use java 17.0.2-open
-  # Install cmdline-tools (older tools doesn't support Java 11)
-  - wget -q "https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip" -O android-commandline-tools-linux.zip
-  - mkdir -p ${ANDROID_HOME}/cmdline-tools
-  - unzip -q android-commandline-tools-linux.zip -d ${ANDROID_HOME}/cmdline-tools
-  - mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest
   # Library for image manipulation in snapshot tests
   - if [[ $RUN_SNAPSHOT_TESTS == true ]]; then python -m pip install Tools/Pillow-6.2.2-cp27-cp27mu-manylinux1_x86_64.whl --user; fi;
 
 before_script:
-  # Install Android SDK and run emulator
-  - echo 'count=0' > /home/travis/.android/repositories.cfg # avoid harmless sdkmanager warning
-  - echo y | ${TOOLS}/bin/sdkmanager "platform-tools" >/dev/null
-  - echo y | ${TOOLS}/bin/sdkmanager "tools" >/dev/null
-  - echo y | ${TOOLS}/bin/sdkmanager "build-tools;$BUILD_TOOLS" >/dev/null
-  - echo y | ${TOOLS}/bin/sdkmanager "platforms;android-$EMU_API" >/dev/null
-  - echo y | ${TOOLS}/bin/sdkmanager "platforms;android-$BUILD_API" >/dev/null
-  - echo y | ${TOOLS}/bin/sdkmanager "extras;android;m2repository" >/dev/null
-  - if [[ $RUN_SNAPSHOT_TESTS == true ]]; then echo y | ${TOOLS}/bin/sdkmanager "system-images;android-$EMU_API;$EMU_FLAVOR;$ABI"; fi;
-  - if [[ $RUN_SNAPSHOT_TESTS == true ]]; then echo no | avdmanager create avd --force -n test -k "system-images;android-$EMU_API;$EMU_FLAVOR;$ABI" -c 100M; fi;
+  # Run emulator
+  - if [[ $RUN_SNAPSHOT_TESTS == true ]]; then echo no | android create avd --force -n test -t android-22 --abi x86 -c 100M; fi;
   - if [[ $RUN_SNAPSHOT_TESTS == true ]]; then emulator -verbose -avd test -no-accel -no-snapshot -no-window -no-audio -camera-back none -camera-front none -selinux permissive -qemu -m 2048 & fi;
 
 script:

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

@@ -447,15 +447,22 @@ public static void saveDiffs() {
     if (Constants.isNoop()) {
       return;
     }
-    if (APIConfig.getInstance().token() == null) {
-      return;
-    }
+
     Context context = Leanplum.getContext();
     SharedPreferences defaults = context.getSharedPreferences(LEANPLUM, Context.MODE_PRIVATE);
     SharedPreferences.Editor editor = defaults.edit();
 
     // Crypt functions return input text if there was a problem.
     AESCrypt aesContext = new AESCrypt(APIConfig.getInstance().appId(), APIConfig.getInstance().token());
+    editor.putString(Constants.Params.DEVICE_ID, aesContext.encrypt(APIConfig.getInstance().deviceId()));
+    editor.putString(Constants.Params.USER_ID, aesContext.encrypt(APIConfig.getInstance().userId()));
+
+    if (APIConfig.getInstance().token() == null) {
+      // The token is not used when encrypting and decrypting DEVICE_ID and USER_ID
+      // See WrapperFactory.getDeviceAndUserFromPrefs
+      SharedPreferencesUtil.commitChanges(editor);
+      return;
+    }
 
     String variablesCipher = aesContext.encrypt(JsonConverter.toJson(diffs));
     editor.putString(Constants.Defaults.VARIABLES_KEY, variablesCipher);
@@ -493,8 +500,6 @@ public static void saveDiffs() {
     editor.putString(Constants.Defaults.VARIABLES_JSON_KEY, aesContext.encrypt(varsJson));
     editor.putString(Constants.Defaults.VARIABLES_SIGN_KEY, aesContext.encrypt(varsSignature));
 
-    editor.putString(Constants.Params.DEVICE_ID, aesContext.encrypt(APIConfig.getInstance().deviceId()));
-    editor.putString(Constants.Params.USER_ID, aesContext.encrypt(APIConfig.getInstance().userId()));
     editor.putString(Constants.Keys.LOGGING_ENABLED,
         aesContext.encrypt(String.valueOf(Constants.loggingEnabled)));
     SharedPreferencesUtil.commitChanges(editor);

AndroidSDKCore/src/main/java/com/leanplum/migration/wrapper/CTWrapper.kt

@@ -28,6 +28,7 @@ import android.text.TextUtils
 import com.clevertap.android.sdk.ActivityLifecycleCallback
 import com.clevertap.android.sdk.CleverTapAPI
 import com.clevertap.android.sdk.CleverTapInstanceConfig
+import com.clevertap.android.sdk.CoreMetaData
 import com.leanplum.LeanplumActivityHelper
 import com.leanplum.callbacks.CleverTapInstanceCallback
 import com.leanplum.internal.Constants
@@ -59,7 +60,7 @@ internal class CTWrapper(
   private var identityManager = IdentityManager(deviceId, userId ?: deviceId, loggedInUserId)
   private var firstTimeStart = identityManager.isFirstTimeStart()
 
-  @SuppressLint("WrongConstant")
+  @SuppressLint("WrongConstant", "RestrictedApi")
   override fun launch(context: Context, callbacks: List<CleverTapInstanceCallback>) {
     instanceCallbackList.addAll(callbacks)
 
@@ -89,13 +90,22 @@ internal class CTWrapper(
     }
     cleverTapInstance?.apply {
       setLibrary("Leanplum")
-      if (!ActivityLifecycleCallback.registered && LeanplumActivityHelper.getCurrentActivity() != null) {
-        ActivityLifecycleCallback.register(context.applicationContext as? Application)
-        if (!LeanplumActivityHelper.isActivityPaused() && !CleverTapAPI.isAppForeground()) {
-          // Trigger onActivityResumed because onResume of ActivityLifecycle has already been executed
-          // in this case. This could happen on first start with ct migration. This method will also
-          // trigger App Launched if it was not send already.
-          CleverTapAPI.onActivityResumed(LeanplumActivityHelper.getCurrentActivity())
+      if (LeanplumActivityHelper.getCurrentActivity() != null) {
+        if (!ActivityLifecycleCallback.registered) {
+          ActivityLifecycleCallback.register(context.applicationContext as? Application)
+          if (!LeanplumActivityHelper.isActivityPaused() && !CleverTapAPI.isAppForeground()) {
+            // Trigger onActivityResumed because onResume of ActivityLifecycle has already been executed
+            // in this case. This could happen on first start with ct migration. This method will also
+            // trigger App Launched if it was not send already.
+            CleverTapAPI.onActivityResumed(LeanplumActivityHelper.getCurrentActivity(), cleverTapID)
+          }
+        } else if (CoreMetaData.getCurrentActivity() == null && !LeanplumActivityHelper.isActivityPaused()) {
+          // If CT ActivityLifecycleCallback was registered before LP had created the CT instance
+          // CleverTapAPI.onActivityResumed would have not executed its initialization logic
+          // (CleverTapAPI.instances would still have been null). This is checked here by
+          // CoreMetaData.getCurrentActivity() == null.
+          // In this case call onActivityResumed explicitly.
+          CleverTapAPI.onActivityResumed(LeanplumActivityHelper.getCurrentActivity(), cleverTapID)
         }
       }
       if (identityManager.isAnonymous()) {

sdk-version.txt

@@ -1 +1 @@
-7.6.2
+7.6.3-beta2