Release 5.0.2 (#853)

Release 5.0.2
BranchMetrics · Jul 23, 2020 · 859f4d7 · 859f4d7
1 parent b06e01c
commit 859f4d7
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 773 deletions.
diff --git a/Branch-SDK-TestBed/src/main/java/io/branch/branchandroiddemo/CustomBranchApp.java b/Branch-SDK-TestBed/src/main/java/io/branch/branchandroiddemo/CustomBranchApp.java
@@ -3,11 +3,13 @@
 
 //import com.squareup.leakcanary.LeakCanary;
 
+import io.branch.referral.Branch;
 import io.branch.referral.BranchApp;
 
 public final class CustomBranchApp extends BranchApp {
     @Override
     public void onCreate() {
+        Branch.enableLogging();
         super.onCreate();
         // Uncomment to test memory leak
         // LeakCanary.install(this);

diff --git a/Branch-SDK/build.gradle b/Branch-SDK/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     // Unit tests with Google Ads
-    androidTestImplementation 'com.google.android.gms:play-services-ads:16.0.0'
+    androidTestImplementation 'com.google.android.gms:play-services-ads-identifier:17.0.0'
 }
 
 android {

diff --git a/Branch-SDK/src/androidTest/java/io/branch/indexing/HashHelperTest.java b/Branch-SDK/src/androidTest/java/io/branch/indexing/HashHelperTest.java
diff --git a/Branch-SDK/src/main/java/io/branch/indexing/ContentDiscoverer.java b/Branch-SDK/src/main/java/io/branch/indexing/ContentDiscoverer.java
diff --git a/Branch-SDK/src/main/java/io/branch/indexing/ContentDiscoveryManifest.java b/Branch-SDK/src/main/java/io/branch/indexing/ContentDiscoveryManifest.java
diff --git a/Branch-SDK/src/main/java/io/branch/indexing/HashHelper.java b/Branch-SDK/src/main/java/io/branch/indexing/HashHelper.java
diff --git a/Branch-SDK/src/main/java/io/branch/referral/BranchActivityLifecycleObserver.java b/Branch-SDK/src/main/java/io/branch/referral/BranchActivityLifecycleObserver.java
@@ -12,8 +12,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import io.branch.indexing.ContentDiscoverer;
-
 /**
  * <p>Class that observes activity life cycle events and determines when to start and stop
  * session.</p>
@@ -50,13 +48,6 @@ public void onActivityStarted(@NonNull Activity activity) {
         branch.currentActivityReference_ = new WeakReference<>(activity);
 
         branch.setIntentState(Branch.INTENT_STATE.PENDING);
-        // If configured on dashboard, trigger content discovery runnable
-        if (branch.getInitState() == Branch.SESSION_STATE.INITIALISED) {
-            try {
-                ContentDiscoverer.getInstance().discoverContent(activity, branch.getSessionReferredLink());
-            } catch (Exception ignore) {
-            }
-        }
         activityCnt_++;
 
         maybeRefreshAdvertisingID(activity);
@@ -108,7 +99,6 @@ public void onActivityStopped(@NonNull Activity activity) {
         Branch branch = Branch.getInstance();
         if (branch == null) return;
 
-        ContentDiscoverer.getInstance().onActivityStopped(activity);
         activityCnt_--; // Check if this is the last activity. If so, stop the session.
         if (activityCnt_ < 1) {
             branch.setInstantDeepLinkPossible(false);

diff --git a/Branch-SDK/src/main/java/io/branch/referral/Defines.java b/Branch-SDK/src/main/java/io/branch/referral/Defines.java
@@ -147,7 +147,6 @@ public enum Jsonkey {
         ContentData("content_data"),
         ContentEvents("events"),
         ContentAnalyticsMode("content_analytics_mode"),
-        ContentDiscovery("cd"),
         Environment("environment"),
         InstantApp("INSTANT_APP"),
         NativeApp("FULL_APP"),