SDK-1120 Fix getSdkVersionNumber in v/2 events, release new patch (5.0.7) (#898)

* fix

* fix getSdkVersionNumber in v2 events too and bump up version code to 5.0.7

Author: bklastaitis-branch

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

@@ -427,7 +427,7 @@ public void testPackageName() {
     @Test
     public void testSdkVersion() {
         Assert.assertNotNull(Branch.getSdkVersionNumber());
-        Assert.assertEquals(BuildConfig.VERSION_NAME, Branch.getSdkVersionNumber());
+        Assert.assertEquals(io.branch.referral.BuildConfig.VERSION_NAME, Branch.getSdkVersionNumber());
     }
 
     private void getFBUrl(final FBUrl res) throws InterruptedException {

Branch-SDK/src/main/java/io/branch/referral/Base64.java

@@ -534,7 +534,7 @@ public static byte[] encode(byte[] input, int offset, int len, int flags) {
         encoder.output = new byte[output_len];
         encoder.process(input, offset, len, true);
 
-        if (BuildConfig.DEBUG && (encoder.op != output_len))
+        if (io.branch.referral.BuildConfig.DEBUG && (encoder.op != output_len))
             throw new AssertionError();
 
         return encoder.output;
@@ -717,7 +717,7 @@ public boolean process(byte[] input, int offset, int len, boolean finish) {
                     output[op++] = '\n';
                 }
 
-                if (BuildConfig.DEBUG && (tailLen != 0 || p != len))
+                if (io.branch.referral.BuildConfig.DEBUG && (tailLen != 0 || p != len))
                     throw new AssertionError();
             } else {
                 // Save the leftovers in tail to be consumed on the next

Branch-SDK/src/main/java/io/branch/referral/Branch.java

@@ -25,8 +25,6 @@
 import android.text.TextUtils;
 import android.view.View;
 
-import io.branch.referral.BuildConfig;
-
 import io.branch.referral.Defines.PreinstallKey;
 import io.branch.referral.ServerRequestGetLATD.BranchLastAttributedTouchDataListener;
 import org.json.JSONArray;
@@ -2929,7 +2927,7 @@ public static InitSessionBuilder sessionBuilder(Activity activity) {
      * @return String value representing the current SDK version number (e.g. 4.3.2)
      */
     public static String getSdkVersionNumber() {
-        return BuildConfig.VERSION_NAME;
+        return io.branch.referral.BuildConfig.VERSION_NAME;
     }
 
     //-------------------------- DEPRECATED --------------------------------------//

Branch-SDK/src/main/java/io/branch/referral/DeviceInfo.java

@@ -8,8 +8,6 @@
 import android.util.DisplayMetrics;
 import android.webkit.WebSettings;
 
-import com.google.firebase.BuildConfig;
-
 import io.branch.referral.Defines.ModuleNameKeys;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -203,7 +201,7 @@ void updateRequestWithV2Params(ServerRequest serverRequest, PrefHelper prefHelpe
 
             userDataObj.put(Defines.Jsonkey.AppVersion.getKey(), getAppVersion());
             userDataObj.put(Defines.Jsonkey.SDK.getKey(), "android");
-            userDataObj.put(Defines.Jsonkey.SdkVersion.getKey(), BuildConfig.VERSION_NAME);
+            userDataObj.put(Defines.Jsonkey.SdkVersion.getKey(), Branch.getSdkVersionNumber());
             userDataObj.put(Defines.Jsonkey.UserAgent.getKey(), getDefaultBrowserAgent(context_));
 
             if (serverRequest instanceof ServerRequestGetLATD) {

Branch-SDK/src/main/java/io/branch/referral/network/BranchRemoteInterface.java

@@ -11,7 +11,6 @@
 
 import io.branch.referral.Branch;
 import io.branch.referral.BranchError;
-import io.branch.referral.BuildConfig;
 import io.branch.referral.Defines;
 import io.branch.referral.PrefHelper;
 import io.branch.referral.ServerResponse;

ChangeLog.md

@@ -1,4 +1,8 @@
 # Branch Android SDK change log
+- v5.0.7
+  * _*Master Release*_ - March 1, 2020
+  * Patch: fix getSdkVersionNumber() API in v2 events as well
+  
 - v5.0.6
   * _*Master Release*_ - February 26, 2020
   * Add INITIATE_STREAM and COMPLETE_STREAM standard events

gradle.properties

@@ -1,5 +1,5 @@
-VERSION_NAME=5.0.6
-VERSION_CODE=050006
+VERSION_NAME=5.0.7
+VERSION_CODE=050007
 GROUP=io.branch.sdk.android
 
 POM_DESCRIPTION=Use the Branch SDK (branch.io) to create and power the links that point back to your apps for all of these things and more. Branch makes it incredibly simple to create powerful deep links that can pass data across app install and open while handling all edge cases (using on desktop vs. mobile vs. already having the app installed, etc). Best of all, it is really simple to start using the links for your own app: only 2 lines of code to register the deep link router and one more line of code to create the links with custom data.