Skip to content

Commit

Permalink
Merge pull request #371 from RodrigoSMarques/bugfix
Browse files Browse the repository at this point in the history 
Release 8.1.1
  • Loading branch information
@RodrigoSMarques
RodrigoSMarques authored Aug 28, 2024
2 parents 6ab26a3 + 884c997 commit 0c80115
Show file tree
Hide file tree
Showing 5 changed files with 91 additions and 76 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
## 8.1.1
### 🐛 Bug Fixes
* Fix issue #368: "-118, Warning. Session initialization already happened" triggered in the listSession callback

## 8.1.0
### 🔧 Native SDK Updates

* Updated included iOS SDK to 3.6.0 - [iOS Version History](https://github.com/BranchMetrics/ios-branch-deep-linking-attribution/releases)

* Updated included Branch Android SDK to 5.12.2 - [Android Version History](https://github.com/BranchMetrics/android-branch-deep-linking-attribution/releases)

## 8.0.4
Expand Down
110 changes: 61 additions & 49 deletions android/src/main/java/br/com/rsmarques/flutter_branch_sdk/FlutterBranchSdkPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import android.os.Looper;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import org.json.JSONException;
import org.json.JSONObject;
Expand Down Expand Up @@ -50,18 +51,63 @@ public class FlutterBranchSdkPlugin implements FlutterPlugin, MethodCallHandler,
private static final String DEBUG_NAME = "FlutterBranchSDK";
private static final String MESSAGE_CHANNEL = "flutter_branch_sdk/message";
private static final String EVENT_CHANNEL = "flutter_branch_sdk/event";
private Activity activity;
private Context context;
private ActivityPluginBinding activityPluginBinding;
private EventSink eventSink = null;
private Map<String, Object> sessionParams = null;
private BranchError initialError = null;
private final FlutterBranchSdkHelper branchSdkHelper = new FlutterBranchSdkHelper();
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 Activity activity;
private Context context;
private ActivityPluginBinding activityPluginBinding;
private EventSink eventSink = null;
private Map<String, Object> sessionParams = null;
private BranchError initialError = null;
/**
* ---------------------------------------------------------------------------------------------
* Branch SDK Call Methods
* --------------------------------------------------------------------------------------------
**/
private final Branch.BranchReferralInitListener branchReferralInitListener = new
Branch.BranchReferralInitListener() {
@Override
public void onInitFinished(JSONObject params, BranchError error) {
LogUtils.debug(DEBUG_NAME, "triggered onInitFinished");
if (error == null) {
LogUtils.debug(DEBUG_NAME, "BranchReferralInitListener - params: " + params.toString());
try {
sessionParams = branchSdkHelper.paramsToMap(params);
} catch (JSONException e) {
LogUtils.debug(DEBUG_NAME, "BranchReferralInitListener - error to Map: " + e.getLocalizedMessage());
return;
}
if (eventSink != null) {
eventSink.success(sessionParams);
sessionParams = null;
}
} else if (error.getErrorCode() == BranchError.ERR_BRANCH_ALREADY_INITIALIZED) {
LogUtils.debug(DEBUG_NAME, "BranchReferralInitListener : " + error.getMessage());
try {
sessionParams = branchSdkHelper.paramsToMap(Branch.getInstance().getLatestReferringParams());
} catch (JSONException e) {
LogUtils.debug(DEBUG_NAME, "BranchReferralInitListener - error to Map: " + e.getLocalizedMessage());
return;
}
if (eventSink != null) {
eventSink.success(sessionParams);
sessionParams = null;
}
} else {
LogUtils.debug(DEBUG_NAME, "BranchReferralInitListener - error: " + error);
if (eventSink != null) {
eventSink.error(String.valueOf(error.getErrorCode()), error.getMessage(), null);
initialError = null;
} else {
initialError = error;
}
}
}
};
private boolean isInitialized = false;

/**
Expand All @@ -74,6 +120,7 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
LogUtils.debug(DEBUG_NAME, "triggered onAttachedToEngine");
setupChannels(binding.getBinaryMessenger(), binding.getApplicationContext());
}

@Override
public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
LogUtils.debug(DEBUG_NAME, "triggered onDetachedFromEngine");
Expand Down Expand Up @@ -342,41 +389,6 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result rawResult) {
}
}

/**
* ---------------------------------------------------------------------------------------------
* Branch SDK Call Methods
* --------------------------------------------------------------------------------------------
**/
private final Branch.BranchReferralInitListener branchReferralInitListener = new
Branch.BranchReferralInitListener() {
@Override
public void onInitFinished(JSONObject params, BranchError error) {
LogUtils.debug(DEBUG_NAME, "triggered onInitFinished");
if (error == null) {
LogUtils.debug(DEBUG_NAME, "BranchReferralInitListener - params: " + params.toString());

try {
sessionParams = branchSdkHelper.paramsToMap(params);
} catch (JSONException e) {
LogUtils.debug(DEBUG_NAME, "BranchReferralInitListener - error to Map: " + e.getLocalizedMessage());
return;
}
if (eventSink != null) {
eventSink.success(sessionParams);
sessionParams = null;
}
} else {
LogUtils.debug(DEBUG_NAME, "BranchReferralInitListener - error: " + error);
if (eventSink != null) {
eventSink.error(String.valueOf(error.getErrorCode()), error.getMessage(), null);
initialError = null;
} else {
initialError = error;
}
}
}
};

private void setupBranch(MethodCall call, final Result result) {
LogUtils.debug(DEBUG_NAME, "triggered setupBranch");
if (!(call.arguments instanceof Map)) {
Expand Down Expand Up @@ -662,14 +674,14 @@ private void setRequestMetadata(MethodCall call) {
final String key = call.argument("key");
final String value = call.argument("value");

if (requestMetadata.has(key) && value.isEmpty()) {
requestMetadata.remove(key);
} else {
try {
requestMetadata.put(key, value);
} catch (JSONException error) {
}
return;
if (requestMetadata.has(key) && value.isEmpty()) {
requestMetadata.remove(key);
} else {
try {
requestMetadata.put(key, value);
} catch (JSONException error) {
}
return;
}
new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override
Expand Down
26 changes: 13 additions & 13 deletions example/pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ packages:
path: ".."
relative: true
source: path
version: "8.0.4"
version: "8.1.0"
flutter_lints:
dependency: "direct dev"
description:
Expand Down Expand Up @@ -123,18 +123,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
url: "https://pub.dev"
source: hosted
version: "10.0.4"
version: "10.0.5"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
url: "https://pub.dev"
source: hosted
version: "3.0.3"
version: "3.0.5"
leak_tracker_testing:
dependency: transitive
description:
Expand Down Expand Up @@ -163,18 +163,18 @@ packages:
dependency: transitive
description:
name: material_color_utilities
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
url: "https://pub.dev"
source: hosted
version: "0.8.0"
version: "0.11.1"
meta:
dependency: transitive
description:
name: meta
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
url: "https://pub.dev"
source: hosted
version: "1.12.0"
version: "1.15.0"
path:
dependency: transitive
description:
Expand Down Expand Up @@ -248,10 +248,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
url: "https://pub.dev"
source: hosted
version: "0.7.0"
version: "0.7.2"
typed_data:
dependency: transitive
description:
Expand Down Expand Up @@ -280,10 +280,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
url: "https://pub.dev"
source: hosted
version: "14.2.1"
version: "14.2.5"
sdks:
dart: ">=3.3.0 <4.0.0"
flutter: ">=3.18.0-18.0.pre.54"
24 changes: 12 additions & 12 deletions pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
url: "https://pub.dev"
source: hosted
version: "10.0.4"
version: "10.0.5"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
url: "https://pub.dev"
source: hosted
version: "3.0.3"
version: "3.0.5"
leak_tracker_testing:
dependency: transitive
description:
Expand Down Expand Up @@ -124,18 +124,18 @@ packages:
dependency: transitive
description:
name: material_color_utilities
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
url: "https://pub.dev"
source: hosted
version: "0.8.0"
version: "0.11.1"
meta:
dependency: transitive
description:
name: meta
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
url: "https://pub.dev"
source: hosted
version: "1.12.0"
version: "1.15.0"
path:
dependency: transitive
description:
Expand Down Expand Up @@ -201,10 +201,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
url: "https://pub.dev"
source: hosted
version: "0.7.0"
version: "0.7.2"
vector_math:
dependency: transitive
description:
Expand All @@ -217,10 +217,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
url: "https://pub.dev"
source: hosted
version: "14.2.1"
version: "14.2.5"
sdks:
dart: ">=3.3.0 <4.0.0"
flutter: ">=3.18.0-18.0.pre.54"
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Original file line number Diff line number Diff line change
@@ -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.1.0
version: 8.1.1
homepage: https://github.com/RodrigoSMarques/flutter_branch_sdk

environment:
Expand Down

0 comments on commit 0c80115

Please sign in to comment.