[SDK-2329] Added apiUrl check in BranchJSONConfig

Branch-SDK-TestBed/src/main/assets/branch.json

@@ -0,0 +1,3 @@
+{ 
+
+}

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

@@ -655,7 +655,7 @@ protected void onStart() {
         Branch.getInstance().addFacebookPartnerParameterWithName("ph", getHashedValue("6516006060"));
         Log.d("BranchSDK_Tester", "initSession");
 
-        initSessionsWithTests();
+        //initSessionsWithTests();
 
         // Branch integration validation: Validate Branch integration with your app
         // NOTE : The below method will run few checks for verifying correctness of the Branch integration.

Branch-SDK-TestBed/src/main/java/io/branch/branchandroidtestbed/SettingsActivity.java

@@ -61,7 +61,7 @@ void setupApiUrlText() {
         apiUrlText.setOnEditorActionListener((textView, i, keyEvent) -> {
             if (i == EditorInfo.IME_ACTION_DONE) {
                 String newApiUrl = textView.getText().toString();
-                Branch.setAPIUrl(newApiUrl);
+                Branch.setAPIUrl("https://myapi.com/");
 
                 InputMethodManager imm = (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE);
                 imm.hideSoftInputFromWindow(apiUrlText.getWindowToken(), 0);

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

@@ -377,6 +377,8 @@
             // Should only be set in json config
             deferInitForPluginRuntime(BranchUtil.getDeferInitForPluginRuntimeConfig(context));
 
+            BranchUtil.setAPIBaseUrlFromConfig(context);
+
             BranchUtil.setTestMode(BranchUtil.checkTestMode(context));
             branchReferral_ = initBranchSDK(context, BranchUtil.readBranchKey(context));
             getPreinstallSystemData(branchReferral_, context);
@@ -404,6 +406,8 @@
             // Should only be set in json config
             deferInitForPluginRuntime(BranchUtil.getDeferInitForPluginRuntimeConfig(context));
 
+            BranchUtil.setAPIBaseUrlFromConfig(context);
+
             BranchUtil.setTestMode(BranchUtil.checkTestMode(context));
             // If a Branch key is passed already use it. Else read the key
             if (!isValidBranchKey(branchKey)) {
@@ -504,6 +508,7 @@
      */
     public static void setAPIUrl(String url) {
         PrefHelper.setAPIUrl(url);
+        BranchLogger.v("setAPIUrl: Branch API URL was set to " + url);
     }
     /**
      * <p>Sets a custom CDN base URL.</p>

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

@@ -29,7 +29,8 @@
         liveKey,
         useTestInstance,
         enableLogging,
-        deferInitForPluginRuntime
+        deferInitForPluginRuntime,
+        apiUrl
     }
 
     /*
@@ -44,7 +45,8 @@
             "liveKey":"key_live_hcnegAumkH7Kv18M8AOHhfgiohpXq5tB",
             "useTestInstance": true,
             "enableLogging": true,
-            "deferInitForPluginRuntime": true
+            "deferInitForPluginRuntime": true,
+            "apiUrl": "https://api.branch.io"
        }
     */
 
@@ -186,4 +188,18 @@
             return false;
         }
     }
+
+    @Nullable
+    public String getAPIUrl() {
+        if (mConfiguration == null) return null;
+
+        try {
+            if (!mConfiguration.has("apiUrl")) return null;
+            return mConfiguration.getString("apiUrl");
+        }
+        catch (JSONException exception) {
+            Log.e(TAG, "Error parsing branch.json: " + exception.getMessage());
+            return null;
+        }
+    }
 }

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

@@ -10,6 +10,7 @@
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 
+import android.text.TextUtils;
 import android.util.DisplayMetrics;
 
 import org.json.JSONArray;
@@ -139,6 +140,14 @@
         return deferInitForPluginRuntime;
     }
 
+    public static void setAPIBaseUrlFromConfig(Context context) {
+        BranchJsonConfig jsonConfig = BranchJsonConfig.getInstance(context);
+        String apiUrl = jsonConfig.getAPIUrl();
+        if (!TextUtils.isEmpty(apiUrl)) {
+            Branch.setAPIUrl(apiUrl + "/");
+        }
+    }
+
     /**
      * Get the value of "io.branch.sdk.TestMode" entry in application manifest or from String res.
      * This value can be overridden via. {@link Branch#enableTestMode()}