Merge branch 'master' of https://github.com/BranchMetrics/react-native-branch-deep-linking-attribution into Release-5.6.0

Author: gdeluna-branch

android/src/main/java/io/branch/rnbranch/RNBranchModule.java

@@ -445,6 +445,21 @@ public void setIdentity(String identity) {
         branch.setIdentity(identity);
     }
 
+   @ReactMethod
+    public void setIdentityAsync(String identity, Promise promise) {
+        Branch branch = Branch.getInstance();
+        branch.setIdentity(identity, new BranchReferralInitListener() {
+            @Override
+            public void onInitFinished(JSONObject referringParams, BranchError error) {
+                if (error != null) {
+                    promise.reject("RNBranch::Error::setIdentityAsync failed", error.getMessage());
+                } else {
+                    promise.resolve(convertJsonToMap(referringParams));
+                }
+            }
+        });
+    }
+
     @ReactMethod
     public void setRequestMetadataKey(String key, String value) {
         // setRequestMetadata does not do what it appears to do.  Call directly to the native code.

ios/RNBranch.m

@@ -407,6 +407,21 @@ - (BranchUniversalObject *)findUniversalObjectWithIdent:(NSString *)ident reject
     [self.class.branch setIdentity:identity];
 }
 
+#pragma mark setIdentityAsync
+RCT_EXPORT_METHOD(
+                  setIdentityAsync:(NSString *)identity
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(__unused RCTPromiseRejectBlock)reject
+                  ) {
+    [self.class.branch setIdentity: identity withCallback:^(NSDictionary *params, NSError *error) {
+        if (!error) {
+            resolve(params);
+        } else {
+            reject(@"RNBranch::Error::setIdentityAsync failed", error.localizedDescription, error);
+        }
+    }];
+}
+
 #pragma mark setRequestMetadataKey
 RCT_EXPORT_METHOD(
                   setRequestMetadataKey:(NSString *)key

src/index.d.ts

@@ -276,13 +276,25 @@ interface BranchLinkControlParams {
   $samsung_url?: string;
 }
 
+interface BranchShareSuccess {
+  completed: true;
+  error: null;
+  channel: string;
+}
+
+interface BranchShareFailure {
+  completed: false;
+  error: null | string;
+  channel: null;
+}
+
 interface BranchUniversalObject {
   ident: string;
   showShareSheet: (
     shareOptions?: BranchShareSheetOptions,
     linkProperties?: BranchLinkProperties,
     controlParams?: BranchLinkControlParams
-  ) => void;
+  ) => Promise<BranchShareSuccess | BranchShareFailure>;
   generateShortUrl: (
     linkProperties: BranchLinkProperties,
     controlParams: BranchLinkControlParams
@@ -310,9 +322,10 @@ interface Branch {
   getFirstReferringParams: () => Promise<BranchParams>;
   lastAttributedTouchData: (attributionWindow?: number) => Promise<BranchParams>;
   setIdentity: (identity: string) => void;
+  setIdentityAsync: (identity: string) => Promise<BranchParams>;
   setRequestMetadata: (key: string, value: string) => void;
   addFacebookPartnerParameter: (name: string, value: string) => void;
-  clearPartnerParameter: () => void;
+  clearPartnerParameters: () => void;
   logout: () => void;
   openURL: (url: string, options?: { newActivity?: boolean }) => void;
   createBranchUniversalObject: (

src/index.js

@@ -62,6 +62,7 @@ class Branch {
   getFirstReferringParams = RNBranch.getFirstReferringParams
   lastAttributedTouchData =  (attributionWindow = {}) => RNBranch.lastAttributedTouchData(attributionWindow)
   setIdentity = (identity) => RNBranch.setIdentity(identity)
+  setIdentityAsync = (identity) => RNBranch.setIdentityAsync(identity)
   setRequestMetadata = (key, value) => {
     console.info('[Branch] setRequestMetadata has limitations when called from JS.  Some network calls are made prior to the JS layer being available, those calls will not have the metadata.')
     return RNBranch.setRequestMetadataKey(key, value)
@@ -70,7 +71,7 @@ class Branch {
     console.info('[Branch] addFacebookPartnerParameter has limitations when called from JS.  Some network calls are made prior to the JS layer being available, those calls will not have the partner parameters.')
     return RNBranch.addFacebookPartnerParameter(name, value)
   }
-  clearPartnerParameter = RNBranch.clearPartnerParameter
+  clearPartnerParameters = RNBranch.clearPartnerParameters
   logout = RNBranch.logout
   userCompletedAction = (event, state = {}) => RNBranch.userCompletedAction(event, state)
   getShortUrl = RNBranch.getShortUrl