Code change to allow custom URL configuration per Operating System

Code change to allow custom URL configuration per Operating System

Author: RodrigoSMarques

android/src/main/java/br/com/rsmarques/flutter_branch_sdk/BranchJsonConfig.java

@@ -19,9 +19,13 @@ public class BranchJsonConfig {
     public final Boolean enableLogging;
     public final Boolean useTestInstance;
 
+    public final String apiUrlAndroid;
+    public final String apiUrlIOS;
 
     private BranchJsonConfig(JSONObject jsonObject) {
         this.apiUrl = jsonObject.optString("apiUrl", "");
+        this.apiUrlAndroid = jsonObject.optString("apiUrlAndroid", "");
+        this.apiUrlIOS = jsonObject.optString("apiUrlIOS", "");
         this.branchKey = jsonObject.optString("branchKey", "");
         this.liveKey = jsonObject.optString("liveKey", "");
         this.testKey = jsonObject.optString("testKey", "");

android/src/main/java/br/com/rsmarques/flutter_branch_sdk/FlutterBranchSdkPlugin.java

@@ -406,10 +406,18 @@ private void setupBranch(MethodCall call, final Result result) {
 
         if (branchJsonConfig != null) {
             if (!branchJsonConfig.apiUrl.isEmpty()) {
-                Branch.setAPIUrl(branchJsonConfig.apiUrl);
-                LogUtils.debug(DEBUG_NAME, "Set API URL from branch-config.json: " + branchJsonConfig.apiUrl);
+                LogUtils.debug(DEBUG_NAME, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+                LogUtils.debug(DEBUG_NAME, "The apiUrl parameter has been deprecated. Please use apiUrlAndroid instead. Check the documentation.");
+                LogUtils.debug(DEBUG_NAME, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+                throw new IllegalArgumentException("The apiUrl parameter has been deprecated. Please use apiUrlAndroid instead. Check the documentation.");
             }
 
+            if (!branchJsonConfig.apiUrlAndroid.isEmpty()) {
+                Branch.setAPIUrl(branchJsonConfig.apiUrlAndroid);
+                LogUtils.debug(DEBUG_NAME, "Set API URL from branch-config.json: " + branchJsonConfig.apiUrlAndroid);
+            }
+
+
             if (branchJsonConfig.enableLogging) {
                 Branch.enableLogging();
                 LogUtils.debug(DEBUG_NAME, "Set EnableLogging from branch-config.json");

example/.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819"
+  revision: "d693b4b9dbac2acd4477aea4555ca6dcbea44ba2"
   channel: "stable"
 
 project_type: app
@@ -13,11 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
-      base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
-    - platform: web
-      create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
-      base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
+      create_revision: d693b4b9dbac2acd4477aea4555ca6dcbea44ba2
+      base_revision: d693b4b9dbac2acd4477aea4555ca6dcbea44ba2
+    - platform: ios
+      create_revision: d693b4b9dbac2acd4477aea4555ca6dcbea44ba2
+      base_revision: d693b4b9dbac2acd4477aea4555ca6dcbea44ba2
 
   # User provided section
 

example/assets/branch-config.json

@@ -1,5 +1,7 @@
 {
-  "apiUrl_test": "https://branch-api-proxy.onrender.com",
+  "apiUrl_old": "https://branch-api-proxy.onrender.com",
+  "apiUrlAndroid": "https://branch-api-proxy.onrender.com",
+  "apiUrlIOS": "https://branch-api-proxy.onrender.com",
   "branchKey": "key_test_ipQTteg11ENANDeCzSXgqdgfuycWoXYH",
   "liveKey": "key_live_bkJRqpb15wLqUAgsDVNUIobjyviWi6Wx",
   "testKey": "key_test_ipQTteg11ENANDeCzSXgqdgfuycWoXYH",

example/ios/.gitignore

@@ -1,34 +1,34 @@
-**/dgph
-*.mode1v3
-*.mode2v3
-*.moved-aside
-*.pbxuser
-*.perspectivev3
-**/*sync/
-.sconsign.dblite
-.tags*
-**/.vagrant/
-**/DerivedData/
-Icon?
-**/Pods/
-**/.symlinks/
-profile
-xcuserdata
-**/.generated/
-Flutter/App.framework
-Flutter/Flutter.framework
-Flutter/Flutter.podspec
-Flutter/Generated.xcconfig
-Flutter/ephemeral/
-Flutter/app.flx
-Flutter/app.zip
-Flutter/flutter_assets/
-Flutter/flutter_export_environment.sh
-ServiceDefinitions.json
-Runner/GeneratedPluginRegistrant.*
-
-# Exceptions to above rules.
-!default.mode1v3
-!default.mode2v3
-!default.pbxuser
-!default.perspectivev3
+**/dgph
+*.mode1v3
+*.mode2v3
+*.moved-aside
+*.pbxuser
+*.perspectivev3
+**/*sync/
+.sconsign.dblite
+.tags*
+**/.vagrant/
+**/DerivedData/
+Icon?
+**/Pods/
+**/.symlinks/
+profile
+xcuserdata
+**/.generated/
+Flutter/App.framework
+Flutter/Flutter.framework
+Flutter/Flutter.podspec
+Flutter/Generated.xcconfig
+Flutter/ephemeral/
+Flutter/app.flx
+Flutter/app.zip
+Flutter/flutter_assets/
+Flutter/flutter_export_environment.sh
+ServiceDefinitions.json
+Runner/GeneratedPluginRegistrant.*
+
+# Exceptions to above rules.
+!default.mode1v3
+!default.mode2v3
+!default.pbxuser
+!default.perspectivev3

example/ios/Flutter/Debug.xcconfig

@@ -1,2 +1 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
-#include "Generated.xcconfig"
+#include "Generated.xcconfig"

example/ios/Flutter/Release.xcconfig

@@ -1,2 +1 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
-#include "Generated.xcconfig"
+#include "Generated.xcconfig"