Merge pull request #723 from BranchMetrics/Staging

Release v4.0.0

Author: csalmi-branch

.circleci/config.yml

@@ -0,0 +1,19 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/code
+    docker:
+      - image: circleci/android:api-28
+    steps:
+      - checkout
+      - run:
+          name: Update SDK Tools
+          command: $ANDROID_HOME/tools/bin/sdkmanager --update
+      - run:
+          name: Run Lint
+          command: ./gradlew lint
+      - run:
+          name: Run Build
+          command: ./gradlew build
+      - store_artifacts:
+          path: ./Branch-SDK/build/outputs/aar/

.gitlab-ci.yml

@@ -0,0 +1,44 @@
+image: openjdk:8-jdk
+
+variables:
+  ANDROID_COMPILE_SDK: "29"
+  ANDROID_BUILD_TOOLS: "28.0.3"
+  ANDROID_SDK_TOOLS:   "4333796"
+
+stages:
+- build
+- test
+
+lintDebug:
+  stage: build
+  tags:
+  - mac_mini
+  script:
+  - ./gradlew lint
+
+buildDebug:
+  stage: build
+  tags:
+  - mac_mini
+  script:
+  - ./gradlew build
+  artifacts:
+    paths:
+    - ./Branch-SDK/build/outputs/aar/
+
+debugTests:
+  stage: build
+  tags:
+  - mac_mini
+  script:
+  - ./gradlew test
+
+emulatortest_py:
+  stage: test
+  tags:
+  - mac_mini
+  script:
+  - python -u ./deploy/build_and_test.py
+  artifacts:
+    paths:
+    - ./Branch-SDK/build/reports/androidTests/connected/

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

@@ -1,8 +1,8 @@
 package io.branch.branchandroiddemo;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.json.JSONException;
 import org.json.JSONObject;

Branch-SDK-TestBed/build.gradle

@@ -5,14 +5,14 @@ dependencies {
     implementation ('com.google.android.gms:play-services-ads:16.0.0')
 
     /* Add chrome custom tabs for guaranteed matching */
-    implementation ('com.android.support:customtabs:23.3.0') {
+    implementation ('androidx.browser:browser:1.0.0') {
         exclude module: 'support-v4'
     }
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test:rules:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
 
 android {
@@ -26,7 +26,7 @@ android {
         versionName project.VERSION_NAME
         versionCode Integer.parseInt(project.VERSION_CODE)
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     signingConfigs { release }

Branch-SDK/androidTest/io/assets/pre_install_apps.branch

@@ -0,0 +1,9 @@
+{
+    "apps": {
+        "io.branch.referral.test": {
+            "preinstall_partner": "branch_",
+            "preinstall_campaign": "branch_campaign",
+            "custom_key": "custom_value"
+        }
+    }
+}

Branch-SDK/androidTest/io/assets/pre_install_apps_no_package.branch

@@ -0,0 +1,9 @@
+{
+    "apps": {
+        "io.branch.referral.packager": {
+            "preinstall_partner": "branch_",
+            "preinstall_campaign": "branch_campaign",
+            "custom_key": "custom_value"
+        }
+    }
+}

Branch-SDK/androidTest/io/assets/pre_install_apps_null.branch

@@ -0,0 +1,52 @@
+package io.branch.indexing;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class HashHelperTest {
+
+    @Before
+    public void setUp() {
+
+    }
+
+    @After
+    public void tearDown() {
+
+    }
+
+    @Test
+    public void testHelloWoldMD5() {
+        byte[] hash = new byte[] {
+                94, -74, 59, -69, -32, 30, -18, -48, -109, -53, 34, -69, -113, 90, -51, -61
+        };
+        String expected = new String(hash);
+
+        HashHelper helper = new HashHelper();
+        String actual = helper.hashContent("hello world");
+
+        // verify the hash is not MD5
+        Assert.assertFalse(expected.equals(actual));
+    }
+
+    @Test
+    public void testHelloWorldSHA256() {
+        byte[] hash = new byte[] {
+                -71, 77, 39, -71, -109, 77, 62, 8, -91, 46, 82, -41, -38, 125, -85, -6, -60, -124, -17, -29, 122, 83, -128, -18, -112, -120, -9, -84, -30, -17, -51, -23
+        };
+        String expected = new String(hash);
+
+        HashHelper helper = new HashHelper();
+        String actual = helper.hashContent("hello world");
+
+        // verify the hash is SHA256
+        Assert.assertTrue(expected.equals(actual));
+    }
+
+}

Branch-SDK/androidTest/io/branch/indexing/HashHelperTest.java

@@ -1,7 +1,7 @@
 package io.branch.referral;
 
 import android.content.Context;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import android.util.Log;
 
 import org.json.JSONObject;
@@ -33,6 +33,15 @@ public void testStandardEvent() throws Throwable {
         Assert.assertTrue(isStandardEvent(branchEvent));
     }
 
+    @Test
+    public void testCustomerEventAlias() throws Throwable {
+        BRANCH_STANDARD_EVENT eventType = BRANCH_STANDARD_EVENT.CUSTOMER_EVENT_ALIAS;
+        Assert.assertEquals("CUSTOMER_EVENT_ALIAS", eventType.getName());
+
+        BranchEvent branchEvent = new BranchEvent(eventType);
+        Assert.assertTrue(isStandardEvent(branchEvent));
+    }
+
     @Test
     public void testCustomEvent() throws Throwable {
         BranchEvent branchEvent = new BranchEvent("CustomEvent");
@@ -234,6 +243,11 @@ ServerRequest doFinalUpdate(ServerRequest request) {
         return request;
     }
 
+    ServerRequest doFinalUpdateOnMainThread(ServerRequest request) {
+        request.doFinalUpdateOnMainThread();
+        return request;
+    }
+
     void DebugLogQueue(Context context) {
         ServerRequestQueue queue = ServerRequestQueue.getInstance(context);
 

Branch-SDK/androidTest/io/branch/referral/BranchEventTest.java

@@ -1,6 +1,6 @@
 package io.branch.referral;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.json.JSONObject;
 import org.junit.Assert;