Merge pull request #36 from BranchMetrics/INTENG-21514

nsingh-branch · web-flow · commit 7d744ad264f2 · 2024-11-18T16:01:37.000-08:00
[INTENG-21514] Fix bug with Marketing Cloud Visitor ID not being included
diff --git a/AdobeBranchExample/build.gradle b/AdobeBranchExample/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace 'io.branch.adobe.demo'
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
     defaultConfig {
         applicationId "io.branch.adobe.demo"
@@ -38,10 +39,10 @@ dependencies {
     api project(path: ':AdobeBranchExtension')
 
     // Adobe
-    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'
+    implementation 'com.adobe.marketing.mobile:analytics:3.0.1'
+    implementation 'com.adobe.marketing.mobile:userprofile:3.0.0'
+    implementation 'com.adobe.marketing.mobile:core:3.2.0'
+    implementation 'com.adobe.marketing.mobile:lifecycle:3.0.1'
+    implementation 'com.adobe.marketing.mobile:identity:3.0.1'
+    implementation 'com.adobe.marketing.mobile:signal:3.0.0'
 }
diff --git a/AdobeBranchExample/src/main/java/io/branch/adobe/demo/DemoApplication.java b/AdobeBranchExample/src/main/java/io/branch/adobe/demo/DemoApplication.java
@@ -17,6 +17,7 @@
 
 import io.branch.adobe.extension.AdobeBranchExtension;
 import io.branch.referral.Branch;
+import io.branch.referral.BranchLogger;
 import io.branch.referral.PrefHelper;
 
 public class DemoApplication extends Application {
@@ -27,12 +28,12 @@ public class DemoApplication extends Application {
     public void onCreate() {
         super.onCreate();
 
-        Branch.enableLogging();
+        Branch.enableLogging(BranchLogger.BranchLogLevel.VERBOSE);
 
+        Analytics.setVisitorIdentifier("custom_identifier_1234"); // to test custom visitor ID (key: "vid")
 
         // Initialize
         initAdobeBranch();
-        Analytics.setVisitorIdentifier("custom_identifier_1234"); // to test custom visitor ID (key: "vid")
     }
 
     private void initAdobeBranch() {
diff --git a/AdobeBranchExample/src/main/java/io/branch/adobe/demo/SwagActivity.java b/AdobeBranchExample/src/main/java/io/branch/adobe/demo/SwagActivity.java
@@ -9,8 +9,8 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
-import com.adobe.marketing.mobile.ExtensionError;
-import com.adobe.marketing.mobile.ExtensionErrorCallback;
+import com.adobe.marketing.mobile.Extension;
+import com.adobe.marketing.mobile.ExtensionHelper;
 import com.adobe.marketing.mobile.MobileCore;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
@@ -28,7 +28,7 @@
 import io.branch.referral.util.LinkProperties;
 import io.branch.referral.util.ShareSheetStyle;
 
-public class SwagActivity extends AppCompatActivity implements View.OnClickListener, ExtensionErrorCallback<ExtensionError> {
+public class SwagActivity extends AppCompatActivity implements View.OnClickListener {
     private static final String TAG = "Branch::SwagActivity";
 
     public static final String SWAG_DATA = "swag";
@@ -75,21 +75,18 @@ protected void onResume() {
 
     @Override
     public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.add_to_cart:
-                doAddToCart(view);
-                break;
-
-            case R.id.purchase:
-                doPurchase(view);
-                break;
+        int id = view.getId();
+        if (id == R.id.add_to_cart) {
+            doAddToCart(view);
+        } else if (id == R.id.purchase) {
+            doPurchase(view);
         }
     }
-
-    @Override
-    public void error(final ExtensionError extensionError) {
-        Log.e(TAG, String.format("An error occurred while dispatching event %d %s", extensionError.getErrorCode(), extensionError.getErrorName()));
-    }
+    
+//
+//    public void error(final ExtensionError extensionError) {
+//        Log.e(TAG, String.format("An error occurred while dispatching event %d %s", extensionError.getErrorCode(), extensionError.getErrorName()));
+//    }
 
 
     private void init(String swagData) {
diff --git a/AdobeBranchExtension/build.gradle b/AdobeBranchExtension/build.gradle
@@ -1,6 +1,16 @@
-apply plugin: 'com.android.library'
+plugins {
+    id 'com.android.library'
+    id 'maven-publish'
+    id 'signing'
+}
 
 android {
+    namespace 'io.branch.adobe.extension'
+
+    buildFeatures {
+        buildConfig = true
+    }
+
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
 
     defaultConfig {
@@ -14,11 +24,21 @@ android {
     }
 
     buildTypes {
+        debug {
+            enableUnitTestCoverage = true
+            enableAndroidTestCoverage = true
+            buildConfigField "long", "VERSION_CODE", project.VERSION_CODE
+            buildConfigField "String", "VERSION_NAME", "\"${project.VERSION_NAME}\""
+        }
+
         release {
             minifyEnabled false
             consumerProguardFile('proguard-rules.pro')
+            buildConfigField "long", "VERSION_CODE", project.VERSION_CODE
+            buildConfigField "String", "VERSION_NAME", "\"${project.VERSION_NAME}\""
         }
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -36,21 +56,127 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     // Branch
-    api 'io.branch.sdk.android:library:5.11.0'
+    api 'io.branch.sdk.android:library:5.13.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.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 'com.adobe.marketing.mobile:analytics:3.0.1'
+    androidTestImplementation 'com.adobe.marketing.mobile:userprofile:3.0.0'
+    implementation 'com.adobe.marketing.mobile:core:3.2.0'
+    implementation 'com.adobe.marketing.mobile:lifecycle:3.0.1'
+    implementation 'com.adobe.marketing.mobile:identity:3.0.1'
+    implementation 'com.adobe.marketing.mobile:signal:3.0.0'
 
     androidTestImplementation project(path: ':AdobeBranchExtension')
 }
 
-apply from: 'https://raw.githubusercontent.com/BranchMetrics/GradleToMavenOptionalDependencies/master/gradle-maven-push.gradle'
+def isReleaseBuild() {
+    return !VERSION_NAME.contains("SNAPSHOT")
+}
+
+def getReleaseRepositoryUrl() {
+    return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
+            : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+}
+
+def getSnapshotRepositoryUrl() {
+    return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL
+            : "https://oss.sonatype.org/content/repositories/snapshots/"
+}
+
+def getRepositoryUsername() {
+    return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : ""
+}
+
+def getRepositoryPassword() {
+    return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.findByName('release')
+            groupId = GROUP
+            artifactId = POM_ARTIFACT_ID
+            version = VERSION_NAME
+
+//            // Attach sources and Javadocs
+//            artifact androidSourcesJar
+//            artifact androidJavadocsJar
+
+            // Configure POM
+            pom {
+                name.set(POM_NAME)
+                description.set(POM_DESCRIPTION)
+                url.set(POM_URL)
+                packaging = POM_PACKAGING
+
+                scm {
+                    url.set(POM_SCM_URL)
+                    connection.set(POM_SCM_CONNECTION)
+                    developerConnection.set(POM_SCM_DEV_CONNECTION)
+                }
+
+                licenses {
+                    license {
+                        name.set(POM_LICENCE_NAME)
+                        url.set(POM_LICENCE_URL)
+                        distribution.set(POM_LICENCE_DIST)
+                    }
+                }
+
+                developers {
+                    developer {
+                        id.set(POM_DEVELOPER_ID)
+                        name.set(POM_DEVELOPER_NAME)
+                    }
+                }
+
+                // Optional dependencies
+                withXml {
+                    asNode().dependencies.dependency.findAll {
+                        it.artifactId.text() == 'okhttp' || it.artifactId.text() == 'firebase-appindexing'
+                    }.each {
+                        if (it.optional)
+                            it.optional.value = 'true'
+                        else
+                            it.appendNode('optional', 'true')
+                    }
+                }
+            }
+        }
+    }
+
+    repositories {
+        maven {
+            url = isReleaseBuild() ? getReleaseRepositoryUrl() : getSnapshotRepositoryUrl()
+            credentials {
+                username = getRepositoryUsername()
+                password = getRepositoryPassword()
+            }
+        }
+    }
+}
+
+signing {
+    useGpgCmd()
+    sign publishing.publications.mavenJava
+}
+
+task androidSourcesJar(type: Jar) {
+    archiveClassifier.set("sources")
+    from android.sourceSets.main.java.srcDirs
+}
+
+task androidJavadocs(type: Javadoc) {
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+
+task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+    archiveClassifier.set("javadoc")
+    from androidJavadocs.destinationDir
+}
diff --git a/AdobeBranchExtension/src/main/java/io/branch/adobe/extension/AdobeBranchExtension.java b/AdobeBranchExtension/src/main/java/io/branch/adobe/extension/AdobeBranchExtension.java
@@ -193,12 +193,12 @@ private void handleSharedStateEvent(final Event event) {
             if (ADOBE_ANALYTICS_EXTENSION.equals(stateowner)) {
                 extensionSharedState = getApi().getSharedState(ADOBE_ANALYTICS_EXTENSION, event, true, resolution);
             } else if (ADOBE_IDENTITY_EXTENSION.equals(stateowner)) {
-                extensionSharedState = getApi().getSharedState(ADOBE_ANALYTICS_EXTENSION, event, true, resolution);
+                extensionSharedState = getApi().getSharedState(ADOBE_IDENTITY_EXTENSION, event, true, resolution);
             }
 
             if (extensionSharedState != null) {
                 for (Map.Entry<String, Object> entry : extensionSharedState.getValue().entrySet()) {
-                    BranchLogger.d(String.format("identity extension shared state = %s", extensionSharedState));
+                    BranchLogger.d(String.format("identity extension shared state = %s", entry.toString()));
 
                     Object value = entry.getValue();
                     if (value == null) continue;
@@ -209,15 +209,18 @@ private void handleSharedStateEvent(final Event event) {
                     switch (key) {
                         case IDENTITY_ID:
                             // pass Adobe Experience Cloud ID (https://app.gitbook.com/@aep-sdks/s/docs/using-mobile-extensions/mobile-core/identity/identity-api-reference#getExperienceCloudIdTitle)
+                            BranchLogger.d(TAG + "Setting Branch Request Metadata's $marketing_cloud_visitor_id to Adobe Experience Cloud ID: " + valueAsString);
                             branch.setRequestMetadata("$marketing_cloud_visitor_id", valueAsString);
                             break;
                         case ANALYTICS_VISITOR_ID:
                             // pass Adobe Custom Visitor ID (https://aep-sdks.gitbook.io/docs/using-mobile-extensions/adobe-analytics/analytics-api-reference#getvisitoridentifier)
+                            BranchLogger.d(TAG + "Setting Branch Request Metadata's $analytics_visitor_id to Adobe Custom Visitor ID: " + valueAsString);
                             branch.setRequestMetadata("$analytics_visitor_id", valueAsString);
                             break;
                         case ANALYTICS_TRACKING_ID:
                             // pass Adobe Tracking ID (https://aep-sdks.gitbook.io/docs/using-mobile-extensions/adobe-analytics/analytics-api-reference#gettrackingidentifier)
                             // if MARKETING_CLOUD_VISITOR_ID is set this will always be null unless the Adobe Launch client set a grace period to support both IDs (https://docs.adobe.com/content/help/en/id-service/using/implementation/setup-analytics.html#:~:text=Grace%20periods%20can%20run%20for,a%20grace%20period%20if%20required.&text=You%20need%20a%20grace%20period,the%20same%20Analytics%20report%20suite.)
+                            BranchLogger.d(TAG + "Setting Branch Request Metadata's $adobe_visitor_id to Adobe Tracking ID: " + valueAsString);
                             branch.setRequestMetadata("$adobe_visitor_id", valueAsString);
                             break;
                     }
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    
     repositories {
         google()
         mavenCentral()
@@ -10,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath "com.android.tools.build:gradle:8.3.2"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
@@ -35,9 +35,9 @@ BUILD_TOOLS_VERSION=30.0.2
 SUPPORT_LIB_VERSION=26.0.0
 
 ANDROID_BUILD_TARGET_SDK_MINIMUM=21
-ANDROID_BUILD_TARGET_SDK_VERSION=32
+ANDROID_BUILD_TARGET_SDK_VERSION=34
 ANDROID_BUILD_TOOLS_VERSION=30.0.2
-ANDROID_BUILD_SDK_VERSION=32
+ANDROID_BUILD_SDK_VERSION=34
 
 android.useAndroidX=true
 android.enableJetifier=true

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`// Top-level build file where you can add configuration options common to all sub-projects/modules.`
`2`	`2`
`3`	`3`	`buildscript {`
`4`		`-`
`5`	`4`	`repositories {`
`6`	`5`	`google()`
`7`	`6`	`mavenCentral()`
`@@ -10,7 +9,7 @@ buildscript {`
`10`	`9`	`}`
`11`	`10`	`}`
`12`	`11`	`dependencies {`
`13`		`- classpath 'com.android.tools.build:gradle:3.5.1'`
	`12`	`+ classpath "com.android.tools.build:gradle:8.3.2"`
`14`	`13`
`15`	`14`	`// NOTE: Do not place your application dependencies here; they belong`
`16`	`15`	`// in the individual module build.gradle files`