Merge pull request #781 from BranchMetrics/Staging

Release 4.2.1

Author: bklastaitis-branch

Branch-SDK-TestBed/src/androidTest/java/io/branch/branchandroiddemo/BranchSDKTests.java

@@ -22,6 +22,8 @@
 import io.branch.referral.BranchError;
 import io.branch.referral.BranchShortLinkBuilder;
 import io.branch.referral.PrefHelper;
+import io.branch.referral.ServerRequestGetCPID;
+import io.branch.referral.util.BranchCPID;
 
 @RunWith(AndroidJUnit4.class)
 public class BranchSDKTests {
@@ -30,6 +32,25 @@ public class BranchSDKTests {
     private Branch branch;
     private PrefHelper prefHelper;
 
+    CountDownLatch lock = new CountDownLatch(1);
+
+    @Test
+    public void testGetCPID() throws Throwable {
+        branch.initSession();
+        branch.getCrossPlatformIds(new ServerRequestGetCPID.BranchCrossPlatformIdListener() {
+            @Override public void onDataFetched(BranchCPID cpidResponse, BranchError error) {
+                if (error == null) {
+                    Assert.assertNotNull(cpidResponse);
+                } else {
+                    Assert.fail("getCrossPlatformIds returned error, " + error.getMessage());
+                }
+                lock.countDown();
+            }
+        });
+
+        Assert.assertTrue(lock.await(5000, TimeUnit.MILLISECONDS));
+    }
+
     @Before
     public void setUp() {
         mContext = InstrumentationRegistry.getContext();

Branch-SDK-TestBed/src/main/AndroidManifest.xml

@@ -91,8 +91,4 @@
         <!--</receiver>-->
 
     </application>
-
-    <instrumentation
-        android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="io.branch.branchandroiddemo" />
 </manifest>

Branch-SDK/src/androidTest/java/io/branch/referral/BranchCPIDTest.java

@@ -2,8 +2,8 @@
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import io.branch.referral.Defines.RequestPath;
-import io.branch.referral.util.BranchCrossPlatformId;
-import io.branch.referral.util.BranchLastAttributedTouchData;
+
+import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,9 +17,7 @@ public class BranchCPIDTest extends BranchEventTest {
 
     @Test
     public void testGetCPID() throws Throwable{
-        Branch branch = Branch.getInstance(getTestContext());
-
-        new BranchCrossPlatformId(null, getTestContext());
+        Branch.getInstance(getTestContext()).getCrossPlatformIds(null);
 
         ServerRequestQueue queue = ServerRequestQueue.getInstance(getTestContext());
         Assert.assertEquals(1, queue.getSize());
@@ -31,9 +29,7 @@ public void testGetCPID() throws Throwable{
 
     @Test
     public void testGetLATD() throws Throwable{
-        Branch branch = Branch.getInstance(getTestContext());
-
-        new BranchLastAttributedTouchData(null, getTestContext());
+        Branch.getInstance(getTestContext()).getLastAttributedTouchData(null);
 
         ServerRequestQueue queue = ServerRequestQueue.getInstance(getTestContext());
         Assert.assertEquals(1, queue.getSize());
@@ -43,4 +39,50 @@ public void testGetLATD() throws Throwable{
         Assert.assertEquals(cpidRequest.getRequestPath(), RequestPath.GetLATD.getPath());
     }
 
+    @Test
+    public void testGetLATDAttributionWindowDefault() throws Throwable {
+        Branch branch = Branch.getInstance(getTestContext());
+        PrefHelper prefHelper = PrefHelper.getInstance(getTestContext());
+
+        // Defaults to ServerRequestGetLATD.defaultAttributionWindow
+        int defValue = prefHelper.getLATDAttributionWindow();
+        Assert.assertEquals(ServerRequestGetLATD.defaultAttributionWindow, defValue);
+
+        // After request with custom attribution window, still defaults to ServerRequestGetLATD.defaultAttributionWindow
+        branch.getLastAttributedTouchData(null, 80);
+        int prefValueA = prefHelper.getLATDAttributionWindow();
+        Assert.assertEquals(ServerRequestGetLATD.defaultAttributionWindow, prefValueA);
+    }
+
+    @Test
+    public void testGetLATDAttributionWindowSetting() throws Throwable {
+        //setup
+        Branch branch = Branch.getInstance(getTestContext());
+        PrefHelper prefHelper = PrefHelper.getInstance(getTestContext());
+
+        // Defaults to ServerRequestGetLATD.defaultAttributionWindow
+        int defValue = prefHelper.getLATDAttributionWindow();
+        Assert.assertEquals(ServerRequestGetLATD.defaultAttributionWindow, defValue);
+
+        // Setting new attribution window to 10
+        prefHelper.setLATDAttributionWindow(10);
+        int newValue = prefHelper.getLATDAttributionWindow();
+        Assert.assertEquals(10, newValue);
+
+        // make request, get its post body, check that the attribution window equals 10
+        branch.getLastAttributedTouchData(null);
+        ServerRequestQueue queue = ServerRequestQueue.getInstance(getTestContext());
+        Assert.assertEquals(1, queue.getSize());
+
+        ServerRequest latdRequest = queue.peekAt(0);
+        Assert.assertTrue(latdRequest instanceof ServerRequestGetLATD);
+
+        JSONObject postBody = latdRequest.getPost();
+        Assert.assertNotNull(postBody);
+        JSONObject userData = postBody.optJSONObject(Defines.Jsonkey.UserData.getKey());
+        Assert.assertNotNull(userData);
+
+        int atrWind = userData.optInt(Defines.Jsonkey.LATDAttributionWindow.getKey());
+        Assert.assertEquals(10, atrWind);
+    }
 }

Branch-SDK/src/androidTest/java/io/branch/referral/BranchTest.java

@@ -2,7 +2,8 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import androidx.test.InstrumentationRegistry;
+
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Assert;
@@ -22,7 +23,7 @@ public class BranchTest {
 
     @Before
     public void setUp() {
-        mContext = InstrumentationRegistry.getContext();
+        mContext = ApplicationProvider.getApplicationContext();
     }
 
     @After

Branch-SDK/src/main/java/io/branch/indexing/BranchUniversalObject.java

@@ -19,6 +19,7 @@
 
 import io.branch.referral.Branch;
 import io.branch.referral.BranchError;
+import io.branch.referral.BranchShareSheetBuilder;
 import io.branch.referral.BranchShortLinkBuilder;
 import io.branch.referral.BranchUtil;
 import io.branch.referral.Defines;
@@ -650,7 +651,7 @@ public void showShareSheet(@NonNull Activity activity, @NonNull LinkProperties l
                 PrefHelper.Debug("Sharing error. Branch instance is not created yet. Make sure you have initialised Branch.");
             }
         } else {
-            Branch.ShareLinkBuilder shareLinkBuilder = new Branch.ShareLinkBuilder(activity, getLinkBuilder(activity, linkProperties));
+            BranchShareSheetBuilder shareLinkBuilder = new BranchShareSheetBuilder(activity, getLinkBuilder(activity, linkProperties));
             shareLinkBuilder.setCallback(new LinkShareListenerWrapper(callback, shareLinkBuilder, linkProperties))
                     .setChannelProperties(channelProperties)
                     .setSubject(style.getMessageTitle())
@@ -943,12 +944,12 @@ private BranchUniversalObject(Parcel in) {
      */
     private class LinkShareListenerWrapper implements Branch.BranchLinkShareListener {
         private final Branch.BranchLinkShareListener originalCallback_;
-        private final Branch.ShareLinkBuilder shareLinkBuilder_;
+        private final BranchShareSheetBuilder shareSheetBuilder_;
         private final LinkProperties linkProperties_;
 
-        LinkShareListenerWrapper(Branch.BranchLinkShareListener originalCallback, Branch.ShareLinkBuilder shareLinkBuilder, LinkProperties linkProperties) {
+        LinkShareListenerWrapper(Branch.BranchLinkShareListener originalCallback, BranchShareSheetBuilder shareLinkBuilder, LinkProperties linkProperties) {
             originalCallback_ = originalCallback;
-            shareLinkBuilder_ = shareLinkBuilder;
+            shareSheetBuilder_ = shareLinkBuilder;
             linkProperties_ = linkProperties;
         }
 
@@ -988,7 +989,7 @@ public void onChannelSelected(String channelName) {
             }
             if (originalCallback_ instanceof Branch.ExtendedBranchLinkShareListener) {
                 if (((Branch.ExtendedBranchLinkShareListener) originalCallback_).onChannelSelected(channelName, BranchUniversalObject.this, linkProperties_)) {
-                    shareLinkBuilder_.setShortLinkBuilderInternal(getLinkBuilder(shareLinkBuilder_.getShortLinkBuilder(), linkProperties_));
+                    shareSheetBuilder_.setShortLinkBuilderInternal(getLinkBuilder(shareSheetBuilder_.getShortLinkBuilder(), linkProperties_));
                 }
             }
         }