Added / logic

BranchMetrics · Mar 29, 2024 · 127db77 · 127db77
1 parent 67bc668
commit 127db77
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/Branch-SDK-TestBed/src/main/assets/branch.json b/Branch-SDK-TestBed/src/main/assets/branch.json
@@ -1,3 +1,3 @@
-{ 
-
+{
+  "apiUrl": "https://api3.branch.io"
 }
diff --git a/Branch-SDK-TestBed/src/main/java/io/branch/branchandroidtestbed/SettingsActivity.java b/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("https://myapi.com/");
+                Branch.setAPIUrl(newApiUrl);
 
                 InputMethodManager imm = (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE);
                 imm.hideSoftInputFromWindow(apiUrlText.getWindowToken(), 0);

diff --git a/Branch-SDK/src/main/java/io/branch/referral/Branch.java b/Branch-SDK/src/main/java/io/branch/referral/Branch.java
@@ -507,8 +507,16 @@ public static void expectDelayedSessionInitialization(boolean expectDelayedInit)
      * @param url The {@link String} URL base URL that the Branch API uses.
      */
     public static void setAPIUrl(String url) {
-        PrefHelper.setAPIUrl(url);
-        BranchLogger.v("setAPIUrl: Branch API URL was set to " + url);
+        if (!TextUtils.isEmpty(url)) {
+            if (!url.endsWith("/")) {
+                url = url + "/";
+            }
+
+            PrefHelper.setAPIUrl(url);
+            BranchLogger.v("setAPIUrl: Branch API URL was set to " + url);
+        } else {
+            BranchLogger.w("setAPIUrl: URL cannot be empty or null");
+        }
     }
     /**
      * <p>Sets a custom CDN base URL.</p>

diff --git a/Branch-SDK/src/main/java/io/branch/referral/BranchUtil.java b/Branch-SDK/src/main/java/io/branch/referral/BranchUtil.java
@@ -144,7 +144,7 @@ public static void setAPIBaseUrlFromConfig(Context context) {
         BranchJsonConfig jsonConfig = BranchJsonConfig.getInstance(context);
         String apiUrl = jsonConfig.getAPIUrl();
         if (!TextUtils.isEmpty(apiUrl)) {
-            Branch.setAPIUrl(apiUrl + "/");
+            Branch.setAPIUrl(apiUrl);
         }
     }