Merge pull request #435 from RodrigoSMarques/dev

RodrigoSMarques · web-flow · commit a49642822f80 · 2025-05-23T23:50:38.000-03:00
Release 8.5.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,13 @@
+## 8.5.0
+### 🔧 Native SDK Updates
+* Updated included iOS SDK to 3.12.0 - [iOS Version History](https://github.com/BranchMetrics/ios-branch-deep-linking-attribution/releases)
+* Updated included Branch Android SDK to 5.18.0 - [Android Version History](https://github.com/BranchMetrics/android-branch-deep-linking-attribution/releases)
+
 ## 8.4.1
 ### 🐛 Bug Fixes
 * Fix issue #423: setRequestMetadata doesn't populate the key value pairs in the event request as expected
 
 ## 8.4.0
-### Native SDK Updates
 ### 🔧 Native SDK Updates
 * Updated included iOS SDK to 3.9.0 - [iOS Version History](https://github.com/BranchMetrics/ios-branch-deep-linking-attribution/releases)
 
diff --git a/README.md b/README.md
@@ -10,8 +10,8 @@ Branch.io helps mobile apps grow with deep links that power referral systems, sh
 
 Supports Android, iOS and Web.
 
-* Android - Branch SDK Version >= 5.15.0 [Android Version History](https://github.com/BranchMetrics/android-branch-deep-linking-attribution/releases)
-* iOS - Branch SDK Version >= 3.9.0 [iOS Version History](https://github.com/BranchMetrics/ios-branch-deep-linking-attribution/releases)
+* Android - Branch SDK Version >= 5.18.0 [Android Version History](https://github.com/BranchMetrics/android-branch-deep-linking-attribution/releases)
+* iOS - Branch SDK Version >= 3.12.0 [iOS Version History](https://github.com/BranchMetrics/ios-branch-deep-linking-attribution/releases)
 
 Implemented functions in plugin:
 
@@ -43,8 +43,30 @@ For details see:
 * [Android - only section: **Configure Branch Dashboard**](https://help.branch.io/developers-hub/docs/android-basic-integration#1-configure-branch-dashboard)
 
 ## Configure Platform Project
-### Android Integration
+### Disable default Flutter Deep Linking (Android / iOS)
+
+**Flutter version 3.27** has a [_breaking change_](https://docs.google.com/document/d/1TUhaEhNdi2BUgKWQFEbOzJgmUAlLJwIAhnFfZraKgQs/edit?tab=t.0) that alters the behavior of the Deep link default flag.
+
+You must manually set the value to **FALSE** in the project, according to the instructions below.
+
+#### iOS
+1. Navigate to **ios/Runner/Info.plist** file.
+2. Add the following in `<dict>` chapter:
 
+```xml
+<key>FlutterDeepLinkingEnabled</key>
+<false/>
+```
+
+#### Android
+1. Navigate to **android/app/src/main/AndroidManifest.xml** file.
+2. Add the following metadata tag and intent filter inside the tag with `.MainActivity`
+
+```xml
+<meta-data android:name="flutter_deeplinking_enabled" android:value="false" />
+```
+
+### Android Integration
 Follow only the steps:
 
 * [Configure App](https://help.branch.io/developers-hub/docs/android-basic-integration#4-configure-app)
@@ -79,32 +101,7 @@ If you want to disable NativeLink™ Deferred Deep Linking, follow the instructi
 	<true/>
 ```
 
-### Change Flutter Deep link flag (Android / iOS)
-
-**Flutter version 3.27** has a [_breaking change_](https://docs.google.com/document/d/1TUhaEhNdi2BUgKWQFEbOzJgmUAlLJwIAhnFfZraKgQs/edit?tab=t.0) that alters the behavior of the Deep link default flag.
-
-You must manually set the value to **FALSE** in the project, according to the instructions below.
-
-#### iOS
-
-1. Navigate to **ios/Runner/Info.plist** file. 
-2. Add the following in `<dict>` chapter:
-
-```xml
-<key>FlutterDeepLinkingEnabled</key>
-<false/>
-```
-#### Android
-
-1. Navigate to **android/app/src/main/AndroidManifest.xml** file.
-2. Add the following metadata tag and intent filter inside the tag with `.MainActivity`
-
-```xml
-<meta-data android:name="flutter_deeplinking_enabled" android:value="false" />
-```
-
 ### Web Integration
-
 You need add Branch Javascript in your `web\index.html` at the top of your `<body>` tag, to be able to use this package.
 
 ```javascript
diff --git a/android/build.gradle b/android/build.gradle
@@ -50,7 +50,7 @@ android {
     }
 
     dependencies {
-        implementation 'io.branch.sdk.android:library:5.15.+'
+        implementation 'io.branch.sdk.android:library:5.18.+'
         implementation 'com.google.android.gms:play-services-ads-identifier:18.2.0'
         implementation 'androidx.lifecycle:lifecycle-runtime:2.8.7'
         implementation 'androidx.browser:browser:1.8.0'
diff --git a/android/src/main/java/br/com/rsmarques/flutter_branch_sdk/FlutterBranchSdkPlugin.java b/android/src/main/java/br/com/rsmarques/flutter_branch_sdk/FlutterBranchSdkPlugin.java
@@ -10,7 +10,6 @@
 import android.os.Looper;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -56,8 +55,8 @@ public class FlutterBranchSdkPlugin implements FlutterPlugin, MethodCallHandler,
     private final JSONObject requestMetadata = new JSONObject();
     private final JSONObject facebookParameters = new JSONObject();
     private final JSONObject snapParameters = new JSONObject();
-    private final ArrayList<String> preInstallParameters = new ArrayList<String>();
-    private final ArrayList<String> campaingParameters = new ArrayList<String>();
+    private final ArrayList<String> preInstallParameters = new ArrayList<>();
+    private final ArrayList<String> campaingParameters = new ArrayList<>();
     private Activity activity;
     private Context context;
     private ActivityPluginBinding activityPluginBinding;
@@ -412,9 +411,9 @@ private void setupBranch(MethodCall call, final Result result) {
         }
 
         if (requestMetadata.length() > 0) {
-            Iterator keys = requestMetadata.keys();
+            Iterator<String> keys = requestMetadata.keys();
             while (keys.hasNext()) {
-                String key = (String) keys.next();
+                String key = keys.next();
                 try {
                     Branch.getInstance().setRequestMetadata(key, requestMetadata.getString(key));
                 } catch (JSONException e) {
@@ -423,9 +422,9 @@ private void setupBranch(MethodCall call, final Result result) {
             }
         }
         if (facebookParameters.length() > 0) {
-            Iterator keys = facebookParameters.keys();
+            Iterator<String> keys = facebookParameters.keys();
             while (keys.hasNext()) {
-                String key = (String) keys.next();
+                String key = keys.next();
                 try {
                     Branch.getInstance().addFacebookPartnerParameterWithName(key, facebookParameters.getString(key));
                 } catch (JSONException e) {
@@ -434,9 +433,9 @@ private void setupBranch(MethodCall call, final Result result) {
             }
         }
         if (snapParameters.length() > 0) {
-            Iterator keys = snapParameters.keys();
+            Iterator<String> keys = snapParameters.keys();
             while (keys.hasNext()) {
-                String key = (String) keys.next();
+                String key = keys.next();
                 try {
                     Branch.getInstance().addSnapPartnerParameterWithName(key, snapParameters.getString(key));
                 } catch (JSONException e) {
@@ -599,33 +598,11 @@ public void run() {
 
     private void listOnSearch(MethodCall call, Result result) {
         LogUtils.debug(DEBUG_NAME, "triggered listOnSearch");
-        if (!(call.arguments instanceof Map)) {
-            throw new IllegalArgumentException("Map argument expected");
-        }
-        HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
-        BranchUniversalObject buo = branchSdkHelper.convertToBUO((HashMap<String, Object>) argsMap.get("buo"));
-        if (argsMap.containsKey("lp")) {
-            LinkProperties linkProperties = branchSdkHelper.convertToLinkProperties((HashMap<String, Object>) argsMap.get("lp"));
-            //buo.listOnGoogleSearch(context, linkProperties);
-        } else {
-            //buo.listOnGoogleSearch(context);
-        }
         result.success(Boolean.TRUE);
     }
 
     private void removeFromSearch(MethodCall call, Result result) {
         LogUtils.debug(DEBUG_NAME, "triggered removeFromSearch");
-        if (!(call.arguments instanceof Map)) {
-            throw new IllegalArgumentException("Map argument expected");
-        }
-        HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
-        BranchUniversalObject buo = branchSdkHelper.convertToBUO((HashMap<String, Object>) argsMap.get("buo"));
-        if (argsMap.containsKey("lp")) {
-            LinkProperties linkProperties = branchSdkHelper.convertToLinkProperties((HashMap<String, Object>) argsMap.get("lp"));
-            //buo.removeFromLocalIndexing(context, linkProperties);
-        } else {
-            //buo.removeFromLocalIndexing(context);
-        }
         result.success(Boolean.TRUE);
     }
 
@@ -825,7 +802,7 @@ public void onDataFetched(JSONObject jsonObject, BranchError error) {
                                     jo.put("latd", jsonObject);
                                     response.put("data", branchSdkHelper.paramsToMap(jo));
                                 } catch (JSONException e) {
-                                    e.printStackTrace();
+                                    LogUtils.debug(DEBUG_NAME, e.getLocalizedMessage());
                                 }
                             } else {
                                 response.put("success", Boolean.FALSE);
@@ -848,7 +825,7 @@ public void onDataFetched(JSONObject jsonObject, BranchError error) {
                                     jo.put("latd", jsonObject);
                                     response.put("data", branchSdkHelper.paramsToMap(jo));
                                 } catch (JSONException e) {
-                                    e.printStackTrace();
+                                    LogUtils.debug(DEBUG_NAME, e.getLocalizedMessage());
                                 }
                             } else {
                                 response.put("success", Boolean.FALSE);
@@ -922,6 +899,7 @@ private void addFacebookPartnerParameter(MethodCall call) {
             try {
                 facebookParameters.put(key, value);
             } catch (JSONException error) {
+                LogUtils.debug(DEBUG_NAME, error.getLocalizedMessage());
             }
         }
         new Handler(Looper.getMainLooper()).post(new Runnable() {
@@ -987,6 +965,7 @@ private void addSnapPartnerParameter(MethodCall call) {
             try {
                 snapParameters.put(key, value);
             } catch (JSONException error) {
+                LogUtils.debug(DEBUG_NAME, error.getLocalizedMessage());
             }
         }
 
diff --git a/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -44,6 +44,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -61,6 +62,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/example/lib/home_page.dart b/example/lib/home_page.dart
@@ -385,8 +385,8 @@ class _HomePageState extends State<HomePage> {
 
   void showGeneratedLink(BuildContext context, String url) async {
     initDeepLinkData();
-    FlutterBranchSdk.setRequestMetadata('key1_1', 'value1');
-    FlutterBranchSdk.setRequestMetadata('key2_1', 'value2');
+    //FlutterBranchSdk.setRequestMetadata('key1_1', 'value1');
+    //FlutterBranchSdk.setRequestMetadata('key2_1', 'value2');
     showModalBottomSheet(
         isDismissible: true,
         isScrollControlled: true,
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -30,9 +30,16 @@ void main() async {
   FlutterBranchSdk.setRequestMetadata('key1', 'value1');
   FlqutterBranchSdk.setRequestMetadata('key2', 'value2');
   */
-  //await FlutterBranchSdk.requestTrackingAuthorization();
 
   await FlutterBranchSdk.init(enableLogging: true, branchAttributionLevel: BranchAttributionLevel.FULL);
   FlutterBranchSdk.setConsumerProtectionAttributionLevel(BranchAttributionLevel.FULL);
+
+  /*
+  AppTrackingStatus status = await FlutterBranchSdk.requestTrackingAuthorization();
+  if (status == AppTrackingStatus.notSupported) {
+    debugPrint('not supported');
+  }
+  FlutterBranchSdk.disableTracking(true);
+   */
   runApp(const MyApp());
 }
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.12.0"
+    version: "2.13.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -61,10 +61,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.3"
   fixnum:
     dependency: transitive
     description:
@@ -84,7 +84,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "8.4.0"
+    version: "8.5.0"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -115,10 +115,10 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
+      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.8"
+    version: "10.0.9"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
@@ -272,10 +272,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
+      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
       url: "https://pub.dev"
     source: hosted
-    version: "14.3.1"
+    version: "15.0.0"
 sdks:
   dart: ">=3.7.0-0 <4.0.0"
   flutter: ">=3.27.0"
diff --git a/ios/flutter_branch_sdk.podspec b/ios/flutter_branch_sdk.podspec
@@ -20,7 +20,7 @@ Flutter Plugin for create deep link using Brach SDK (https://branch.io). This pl
   s.source           = { :path => '.' }
   s.source_files = 'flutter_branch_sdk/sources/flutter_branch_sdk/**/*.swift'
   s.dependency 'Flutter'
-  s.dependency 'BranchSDK', '~> 3.9.0'
+  s.dependency 'BranchSDK', '~> 3.12.0'
   s.platform = :ios, '12.0'
   # Flutter.framework does not contain a i386 slice.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
diff --git a/ios/flutter_branch_sdk/Package.resolved b/ios/flutter_branch_sdk/Package.resolved
diff --git a/ios/flutter_branch_sdk/Package.swift b/ios/flutter_branch_sdk/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
         .library(name: "flutter-branch-sdk", targets: ["flutter_branch_sdk"])
     ],
     dependencies: [
-     .package(url: "https://github.com/BranchMetrics/ios-branch-sdk-spm", "3.9.0"..."3.10.0")
+     .package(url: "https://github.com/BranchMetrics/ios-branch-sdk-spm", "3.12.0"..."3.13.0")
     ],
     targets: [
         .target(
diff --git a/ios/flutter_branch_sdk/sources/flutter_branch_sdk/FlutterBranchSdkPlugin.swift b/ios/flutter_branch_sdk/sources/flutter_branch_sdk/FlutterBranchSdkPlugin.swift
@@ -10,7 +10,7 @@ let MESSAGE_CHANNEL = "flutter_branch_sdk/message";
 let EVENT_CHANNEL = "flutter_branch_sdk/event";
 let ERROR_CODE = "FLUTTER_BRANCH_SDK_ERROR";
 let PLUGIN_NAME = "Flutter";
-let PLUGIN_VERSION = "8.4.1";
+let PLUGIN_VERSION = "8.5.0";
 let COCOA_POD_NAME = "org.cocoapods.flutter-branch-sdk";
 
 public class FlutterBranchSdkPlugin: NSObject, FlutterPlugin, FlutterStreamHandler  {
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_branch_sdk
 description: "Flutter Plugin for create deep link using Brach SDK (https://branch.io). This plugin provides a cross-platform (iOS, Android, Web)."
-version: 8.4.1
+version: 8.5.0
 repository: https://github.com/RodrigoSMarques/flutter_branch_sdk
 
 environment:

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ android {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`dependencies {`
`53`		`- implementation 'io.branch.sdk.android:library:5.15.+'`
	`53`	`+ implementation 'io.branch.sdk.android:library:5.18.+'`
`54`	`54`	`implementation 'com.google.android.gms:play-services-ads-identifier:18.2.0'`
`55`	`55`	`implementation 'androidx.lifecycle:lifecycle-runtime:2.8.7'`
`56`	`56`	`implementation 'androidx.browser:browser:1.8.0'`