Merge pull request #92 from BranchMetrics/fix/issue-80-fix-ios-plugin…

…-issues Fix/issue 80 fix ios plugin issues
BranchMetrics · Apr 5, 2016 · 12c447f · 12c447f
2 parents 9e43086 + bc304b1
commit 12c447f
Show file tree

Hide file tree

Showing 6 changed files with 219 additions and 225 deletions.
diff --git a/README.md b/README.md
@@ -109,7 +109,7 @@ If you use a custom domain or subdomain for your Branch links, you should also a
 
 ## Plugin Methods
 
-**Some methods are promisified**, therefore you can easily get its success and error callback by chaining `.then()` method.
+**Most methods are promisified**, therefore you can easily get its success and error callback by chaining `.then()` method.
 
 *Example*
 ```js
@@ -168,13 +168,15 @@ The `initSession()` method automatically also sets an internal deep link hander
 
 ```js
 onDeviceReady: function() {
-    Branch.initSession();
-},
-onResume: function() {
-    Branch.initSession();
+    Branch.initSession().then(function (res) {
+        console.log(res);
+        alert('Response: ' + JSON.stringify(res));
+    }).catch(function (err) {
+        console.error(err);
+        alert('Error: ' + JSON.stringify(err));
+    });;;
 },
 initialize: function() {
-    document.addEventListener('resume', onResume, false);
     document.addEventListener('deviceready', onDeviceReady, false);
 },
 ```
@@ -183,7 +185,11 @@ Then add the method `DeepLinkHandler()` which will act as our callback when the
 
 ```js
 function DeepLinkHandler(data) {
-    alert('Data from initSession: ' + data.data);
+    if (data) {
+        alert('Data from deep link: ' + JSON.stringify(data));
+    } else {
+        alert('No data found');
+    }
 }
 ```
 
@@ -243,7 +249,11 @@ Logs out the current session, replaces session IDs and identity IDs.
 
 ##### Usage
 ```js
-Branch.logout();
+Branch.logout().then(function (res) {
+    console.log(res);
+}).catch(function (err) {
+    console.error(err);
+});
 ```
 
 ### <a id="userCompletedAction"></a>userCompletedAction(action[, metaData])
@@ -258,9 +268,17 @@ Registers custom events.
 
 ##### Usage
 ```js
-Branch.userCompletedAction('complete_purchase');
+Branch.userCompletedAction('complete_purchase').then(function (res) {
+    console.log(res);
+}).catch(function (err) {
+    console.error(err);
+});
 
-Branch.userCompletedAction('registered', { user: 'Test' });
+Branch.userCompletedAction('registered', { user: 'Test' }).then(function (res) {
+    console.log(res);
+}).catch(function (err) {
+    console.error(err);
+});
 ```
 ------
 
@@ -438,33 +456,33 @@ branchUniversalObj.onShareSheetLaunched(function () {
 });
 ```
 
-###### onShareSheetDismissed   
+###### onShareSheetDismissed
 
-The event fires when the share sheet is dismissed.    
+The event fires when the share sheet is dismissed.
 
-```js   
-branchUniversalObj.onShareSheetDismissed(function () {    
-  console.log('Share sheet dimissed');    
-});   
-```   
+```js
+branchUniversalObj.onShareSheetDismissed(function () {
+  console.log('Share sheet dimissed');
+});
+```
 
-###### onLinkShareResponse    
+###### onLinkShareResponse
 
-The event returns a dictionary of the response data.    
+The event returns a dictionary of the response data.
 
-```js   
-branchUniversalObj.onLinkShareResponse(function (res) {   
-  console.log('Share link response: ' + JSON.stringify(res));   
-});   
-```   
+```js
+branchUniversalObj.onLinkShareResponse(function (res) {
+  console.log('Share link response: ' + JSON.stringify(res));
+});
+```
 
-###### onChannelSelected    
+###### onChannelSelected
 
-The event fires when a channel is selected.   
+The event fires when a channel is selected.
 
-```js   
-branchUniversalObj.onChannelSelected(function (res) {   
-  console.log('Channel selected: ' + JSON.stringify(res));    
+```js
+branchUniversalObj.onChannelSelected(function (res) {
+  console.log('Channel selected: ' + JSON.stringify(res));
 });
 ```
 

diff --git a/src/android/io/branch/BranchSDK.java b/src/android/io/branch/BranchSDK.java
@@ -787,6 +787,10 @@ public void onInitFinished(JSONObject referringParams, BranchError error) {
 
             Log.d(LCAT, "SessionListener onInitFinished()");
 
+            String out = String.format("DeepLinkHandler(%s)", referringParams.toString());
+
+            webView.sendJavascript(out);
+
             if (error == null) {
 
                 // params are the deep linked params associated with the link that the user clicked -> was re-directed to this app
@@ -798,25 +802,15 @@ public void onInitFinished(JSONObject referringParams, BranchError error) {
                     Log.d(LCAT, "return is not null");
                     Log.d(LCAT, referringParams.toString());
                 }
-
-                String out = String.format("DeepLinkHandler(%s)", referringParams.toString());
-
-                webView.sendJavascript(out);
-                if (this._callbackContext != null) {
-                    this._callbackContext.success(referringParams);
-                }
+
+                this._callbackContext.success(referringParams);
 
             } else {
                 String errorMessage = error.getMessage();
 
                 Log.d(LCAT, errorMessage);
 
-                String out = String.format("DeepLinkHandler(%s)", referringParams.toString());
-
-                webView.sendJavascript(out);
-                if (this._callbackContext != null) {
-                    this._callbackContext.error(errorMessage);
-                }
+                this._callbackContext.error(errorMessage);
             }
 
         }

diff --git a/src/ios/BranchSDK.h b/src/ios/BranchSDK.h
@@ -21,7 +21,7 @@
 @property (copy) NSDictionary *metadata;
 @property (copy) NSDate *expirationDate;
 
-@property (strong, nonatomic) BranchUniversalObject *branchUniversalObj;
+@property (strong, nonatomic) NSMutableArray *branchUniversalObjArray;
 
 // BranchSDK Basic Methods
 - (void)initSession:(CDVInvokedUrlCommand*)command;
@@ -41,9 +41,6 @@
 
 // Branch Universal Object Methods
 - (void)createBranchUniversalObject:(CDVInvokedUrlCommand*)command;
-- (void)initWithCanonicalIdentifier:(CDVInvokedUrlCommand*)command;
-- (void)initWithTitle:(CDVInvokedUrlCommand*)command;
-- (void)addMetadata:(CDVInvokedUrlCommand*)command;
 - (void)registerView:(CDVInvokedUrlCommand*)command;
 - (void)generateShortUrl:(CDVInvokedUrlCommand*)command;
 - (void)showShareSheet:(CDVInvokedUrlCommand*)command;