Merge pull request #35 from BranchMetrics/SDK-2312

[SDK-2312] Updated Branch Android SDK version and AEP SDK's

Author: nsingh-branch

AdobeBranchExample/build.gradle

@@ -20,6 +20,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    packagingOptions {
+        exclude 'META-INF/com.android.tools/proguard/coroutines.pro'
+    }
 }
 
 dependencies {
@@ -35,10 +38,10 @@ dependencies {
     api project(path: ':AdobeBranchExtension')
 
     // Adobe
-    implementation 'com.adobe.marketing.mobile:analytics:2.0.2'
-    implementation 'com.adobe.marketing.mobile:userprofile:2.0.0'
-    implementation 'com.adobe.marketing.mobile:core:2.2.0'
-    implementation 'com.adobe.marketing.mobile:lifecycle:2.0.2'
-    implementation 'com.adobe.marketing.mobile:identity:2.0.2'
+    implementation 'com.adobe.marketing.mobile:analytics:2.0.3'
+    implementation 'com.adobe.marketing.mobile:userprofile:2.0.1'
+    implementation 'com.adobe.marketing.mobile:core:2.6.2'
+    implementation 'com.adobe.marketing.mobile:lifecycle:2.0.4'
+    implementation 'com.adobe.marketing.mobile:identity:2.0.3'
     implementation 'com.adobe.marketing.mobile:signal:2.0.1'
 }

AdobeBranchExample/src/main/AndroidManifest.xml

@@ -15,9 +15,9 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".ProductActivity"
-            android:label="@string/app_name"
             android:launchMode="singleTask"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

AdobeBranchExample/src/main/java/io/branch/adobe/demo/DemoApplication.java

@@ -1,6 +1,7 @@
 package io.branch.adobe.demo;
 
 import android.app.Application;
+import android.util.Log;
 
 import com.adobe.marketing.mobile.Analytics;
 import com.adobe.marketing.mobile.Extension;
@@ -20,24 +21,26 @@
 
 public class DemoApplication extends Application {
     private static final String ADOBE_APP_ID = "d10f76259195/b0503e1a5dce/launch-9948a3b3a89d-development";
+    private static final String TAG = "AdobeBranchExample::";
 
     @Override
     public void onCreate() {
         super.onCreate();
 
         Branch.enableLogging();
 
+
         // Initialize
         initAdobeBranch();
         Analytics.setVisitorIdentifier("custom_identifier_1234"); // to test custom visitor ID (key: "vid")
     }
 
     private void initAdobeBranch() {
-        PrefHelper.Debug("initAdobeBranch()");
+        Log.d(TAG, "initAdobeBranch()");
 
         MobileCore.setApplication(this);
         MobileCore.configureWithAppID(ADOBE_APP_ID);
-        MobileCore.setLogLevel(LoggingMode.ERROR);
+        MobileCore.setLogLevel(LoggingMode.VERBOSE);
 
         // NOTE! following code will enable you to configure exclusion list or allow list, but you can't define both!
         // If you don't configure any, all events will send to Branch which is not ideal!
@@ -55,7 +58,7 @@ private void initAdobeBranch() {
         extensions.add(Signal.EXTENSION);
         extensions.add(AdobeBranchExtension.EXTENSION);
         MobileCore.registerExtensions(extensions, o -> {
-            PrefHelper.Debug("AEP Mobile SDK is initialized");
+            Log.d(TAG, "AEP Mobile SDK is initialized");
         });
 
     }

AdobeBranchExample/src/main/java/io/branch/adobe/demo/ProductActivity.java

@@ -3,6 +3,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListAdapter;
@@ -30,6 +31,7 @@
 
 public class ProductActivity extends AppCompatActivity {
     private List<SwagModel> swagModelList;
+    private static final String TAG = "AdobeBranchExample::";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -80,14 +82,14 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
             ListAdapter customAdapter = new SwagAdapter(this, R.layout.swag_item, swagModelList);
             listView.setAdapter(customAdapter);
         } catch (JSONException e) {
-            PrefHelper.Debug("Error initializing List: " + e.getLocalizedMessage());
+            Log.d(TAG, "Error initializing List: " + e.getLocalizedMessage());
         }
     }
 
     private Branch.BranchReferralInitListener branchInitSessionCallback = new Branch.BranchReferralInitListener() {
             @Override
             public void onInitFinished(JSONObject referringParams, BranchError error) {
-                PrefHelper.Debug("initBranchSession, referringParams = " + referringParams + ", error = " + error);
+                Log.d(TAG, "initBranchSession, referringParams = " + referringParams + ", error = " + error);
                 if (referringParams == null) return;
                 try {
                     // You would think that there was an easier way to figure this out than looking at LinkProperties code

AdobeBranchExtension/build.gradle

@@ -36,18 +36,18 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     // Branch
-    api 'io.branch.sdk.android:library:5.4.0'
+    api 'io.branch.sdk.android:library:5.11.0'
     implementation ('com.google.android.gms:play-services-ads-identifier:17.0.0')
     // for Huawei devices without GMS, adding it requires bumping up min api level to 19 though, so we
     // leave it up to the client to add it following Branch documentation here: https://help.branch.io/developers-hub/docs/android-basic-integration
     //implementation 'com.huawei.hms:ads-identifier:3.4.28.305'
 
     // Adobe
-    androidTestImplementation 'com.adobe.marketing.mobile:analytics:2.0.2'
-    androidTestImplementation 'com.adobe.marketing.mobile:userprofile:2.0.0'
-    implementation 'com.adobe.marketing.mobile:core:2.2.0'
-    implementation 'com.adobe.marketing.mobile:lifecycle:2.0.2'
-    implementation 'com.adobe.marketing.mobile:identity:2.0.2'
+    androidTestImplementation 'com.adobe.marketing.mobile:analytics:2.0.3'
+    androidTestImplementation 'com.adobe.marketing.mobile:userprofile:2.0.1'
+    implementation 'com.adobe.marketing.mobile:core:2.6.2'
+    implementation 'com.adobe.marketing.mobile:lifecycle:2.0.4'
+    implementation 'com.adobe.marketing.mobile:identity:2.0.3'
     implementation 'com.adobe.marketing.mobile:signal:2.0.1'
 
     androidTestImplementation project(path: ':AdobeBranchExtension')

AdobeBranchExtension/src/main/java/io/branch/adobe/extension/AdobeBranchExtension.java

@@ -17,8 +17,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import io.branch.referral.Branch;
+import io.branch.referral.BranchLogger;
 import io.branch.referral.BranchPluginSupport;
-import io.branch.referral.PrefHelper;
 import io.branch.referral.util.BRANCH_STANDARD_EVENT;
 import io.branch.referral.util.BranchEvent;
 import io.branch.referral.util.CurrencyType;
@@ -73,7 +73,7 @@ protected void onRegistered() {
         AdobeBranch.getAutoInstance( MobileCore.getApplication().getApplicationContext());
         registerListeners();
 
-        PrefHelper.Debug("AdobeBranchExtension was successfully registered.");
+        BranchLogger.d(TAG + "AdobeBranchExtension was successfully registered.");
     }
 
     private void registerListeners() {
@@ -99,12 +99,12 @@ public boolean readyForEvent(Event event) {
     }
 
     void handleAdobeEvent(final Event event) {
-        PrefHelper.Debug(TAG + String.format("Started processing new event [%s] of type [%s] and source [%s]",
+        BranchLogger.d(TAG + String.format("Started processing new event [%s] of type [%s] and source [%s]",
                 branchEventNameFromAdobeEvent(event), event.getType(), event.getSource()));
 
         if (Branch.getInstance() == null) {
             // Branch is not initialized.
-            PrefHelper.Debug("Branch is not initialized yet. Can not handle Adobe event.");
+            BranchLogger.d(TAG + "Branch is not initialized yet. Can not handle Adobe event.");
             return;
         }
 
@@ -115,7 +115,7 @@ void handleAdobeEvent(final Event event) {
         } else if (isTrackedEvent(event)) {
             handleEvent(event);
         } else {
-            PrefHelper.Debug(TAG + "Event Dropped: " + branchEventNameFromAdobeEvent(event));
+            BranchLogger.d(TAG + "Event Dropped: " + branchEventNameFromAdobeEvent(event));
         }
     }
 
@@ -151,7 +151,7 @@ private boolean isSharedStateEvent(final Event event) {
     private void handleBranchConfigurationEvent(final Event event) {
         Map<String, Object> eventData = event.getEventData();
         if (eventData != null) {
-            PrefHelper.Debug("Configuring AdobeBranch");
+            BranchLogger.d(TAG + "Configuring AdobeBranch");
 
             Object object = eventData.get(AdobeBranch.KEY_APICONFIGURATION);
 
@@ -167,7 +167,7 @@ private void handleBranchConfigurationEvent(final Event event) {
 
                 } catch (Exception e) {
                     // Internal Error.
-                    PrefHelper.LogAlways(TAG + "handleBranchConfigurationEvent Exception" + e.getMessage());
+                    BranchLogger.w(TAG + "Error while configuring AdobeBranch" + e.getMessage());
                 }
             } else if (object == null) {
                 apiWhitelist = null;
@@ -198,7 +198,7 @@ private void handleSharedStateEvent(final Event event) {
 
             if (extensionSharedState != null) {
                 for (Map.Entry<String, Object> entry : extensionSharedState.getValue().entrySet()) {
-                    PrefHelper.Debug(String.format("identity extension shared state = %s", extensionSharedState.toString()));
+                    BranchLogger.d(String.format("identity extension shared state = %s", extensionSharedState));
 
                     Object value = entry.getValue();
                     if (value == null) continue;
@@ -244,13 +244,13 @@ private void handleEvent(final Event event) {
         BranchEvent branchEvent = branchEventFromAdobeEvent(event);
         if (branchEvent != null) {
             try {
-                PrefHelper.Debug(TAG + "Track BranchEvent: " + branchEvent.getEventName());
+                BranchLogger.d(TAG + "Track BranchEvent: " + branchEvent.getEventName());
 
                 branchEvent.logEvent(MobileCore.getApplication().getApplicationContext());
 
                 deviceDataSharedState(event);
             } catch (Exception e) {
-                PrefHelper.LogAlways(TAG + "handleTrackEvent Exception" + e.getMessage());
+                BranchLogger.w(TAG + "handleTrackEvent Exception" + e.getMessage());
             }
         }
     }

ChangeLog.md

@@ -1,11 +1,15 @@
 # Adobe Branch SDK Extension change log
 
+- v2.1.0
+  * April 1, 2024
+  * Update Branch Android SDK to 5.11.0
+  * Updated AEP SDKs
+  
 - v2.0.0
   * June 20, 2023
   * Update Branch Android SDK to 5.4.2
   * Updated from ACPCore to AEPCore
 
-
 - v1.4.0
   * January 12, 2023
   * Update Branch Android SDK to 5.2.7

gradle.properties

@@ -11,8 +11,8 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME=2.0.0
-VERSION_CODE=200000
+VERSION_NAME=2.1.0
+VERSION_CODE=200100
 GROUP=io.branch.sdk.android
 
 POM_NAME=Branch Adobe Android SDK