Merge pull request #819 from BranchMetrics/Staging

Staging

Author: bklastaitis-branch

Branch-SDK-TestBed/src/main/java/io/branch/branchandroiddemo/MainActivity.java

@@ -256,7 +256,7 @@ public void onClick(View v) {
                 Intent i = new Intent(getApplicationContext(), CreditHistoryActivity.class);
                 // Test for preventing second intent reading
                 i.setData(Uri.parse("https://testintentread.app.link?error_if_assigned_to_android_app_link"));
-                i.putExtra(Defines.Jsonkey.ForceNewBranchSession.getKey(), false);
+                i.putExtra(Defines.IntentKeys.ForceNewBranchSession.getKey(), false);
                 startActivity(i);
             }
         });
@@ -358,8 +358,8 @@ public void onClick(View view) {
                     return;
                 }
 //                intent.setData(Uri.parse(shortURL));
-                intent.putExtra(Defines.Jsonkey.AndroidPushNotificationKey.getKey(),shortURL);
-                intent.putExtra(Defines.Jsonkey.ForceNewBranchSession.getKey(), true);
+                intent.putExtra(Defines.IntentKeys.BranchURI.getKey(), shortURL);
+                intent.putExtra(Defines.IntentKeys.ForceNewBranchSession.getKey(), true);
                 PendingIntent pendingIntent =  PendingIntent.getActivity(MainActivity.this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
 
                 NotificationCompat.Builder builder = new NotificationCompat.Builder(MainActivity.this, branchChannelID)

Branch-SDK/proguard-project.txt

@@ -18,3 +18,7 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# Huawei's OAID (Google's advertising id equivalent)
+-keep class com.huawei.hms.ads.** { *; }
+-keep interface com.huawei.hms.ads.** { *; }

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

@@ -77,6 +77,11 @@ public void initBranchTestInstance() {
 
         Assert.assertEquals(branch, Branch.getInstance());
     }
+    
+    @Test
+    public void testSdkVersion() {
+        Assert.assertNotNull(Branch.getSdkVersionNumber());
+    }
 
     Context getTestContext() {
         return mContext;