Merge pull request #9 from RodrigoSMarques/bugfix

Bugfix Branch SDK initialization
RodrigoSMarques · Feb 2, 2020 · e239497 · e239497
2 parents 68283f1 + d2d0117
commit e239497
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 0.1.5
+* Bugfix Branch SDK initialization
 ## 0.1.4
 * Bugfix BranchUniversalObject with keywords empty
 * Documentation update

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
@@ -171,7 +171,8 @@ public void onActivityCreated(Activity activity, Bundle bundle) {
 
     @Override
     public void onActivityStarted(Activity activity) {
-        Branch.getInstance().initSession(branchReferralInitListener, activity.getIntent().getData(), activity);
+        Branch.getInstance().initSession(branchReferralInitListener, activity.getIntent() != null ?
+                activity.getIntent().getData() : null, activity);
     }
 
     @Override

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -75,7 +75,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.1.3"
+    version: "0.1.5"
   flutter_test:
     dependency: "direct dev"
     description: flutter

diff --git a/lib/src/branch_event.dart b/lib/src/branch_event.dart
@@ -66,6 +66,7 @@ class BranchEvent {
   }
 
   void addCustomData(String key, dynamic value) {
+    if ((key == null) || (value == null)) return;
     this._customData[key] = value;
   }
 

diff --git a/lib/src/branch_universal_object.dart b/lib/src/branch_universal_object.dart
@@ -53,11 +53,13 @@ class BranchUniversalObject {
 
   ///Adds any keywords associated with the content referred
   void addKeyWords(List<dynamic> keywords) {
+    if (keywords == null) return;
     this.keywords.addAll(keywords);
   }
 
   ///Add a keyword associated with the content referred
   void addKeyWord(String keyword) {
+    if (keyword == null) return;
     this.keywords.add(keyword);
   }
 

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).
-version: 0.1.4
+version: 0.1.5
 homepage: https://github.com/RodrigoSMarques/flutter_branch_sdk
 
 dependencies:
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,6 +66,7 @@ class BranchEvent { @@
       }
       void addCustomData(String key, dynamic value) {
+        if ((key == null) || (value == null)) return;
         this._customData[key] = value;
       }
@@ Expand Down @@