fix: restore sharing functionality in Branch SDK

Author: wpinho-branch

Branch-SDK-TestBed/src/main/java/io/branch/branchandroidtestbed/MainActivity.java

@@ -353,7 +353,19 @@ public void onClick(View view) {
                         .addControlParameter("$android_deeplink_path", "custom/path/*")
                         .addControlParameter("$ios_url", "http://example.com/ios")
                         .setDuration(100);
-                Branch.init().share(MainActivity.this, branchUniversalObject, linkProperties, "Sharing Branch Short URL", "Using Native Chooser Dialog");
+                Branch.init().share(MainActivity.this, branchUniversalObject, linkProperties, new Branch.BranchNativeLinkShareListener() {
+                            @Override
+                            public void onLinkShareResponse(String sharedLink, BranchError error) {
+                                Log.d("Native Share Sheet:", "Link Shared: " + sharedLink);
+                            }
+
+                            @Override
+                            public void onChannelSelected(String channelName) {
+                                Log.d("Native Share Sheet:", "Channel Selected: " + channelName);
+                            }
+
+                        },
+                        "Sharing Branch Short URL", "Using Native Chooser Dialog");
             }
         });
 
@@ -584,8 +596,14 @@ public void onFailure(Exception e) {
         findViewById(R.id.logout_btn).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                Branch.init().logout();
-                Toast.makeText(getApplicationContext(), "Logged Out", Toast.LENGTH_LONG).show();
+                Branch.init().logout(new Branch.LogoutStatusListener() {
+                    @Override
+                    public void onLogoutFinished(boolean loggedOut, BranchError error) {
+                        Log.d("BranchSDK_Tester", "onLogoutFinished " + loggedOut + " errorMessage " + error);
+                        Toast.makeText(getApplicationContext(), "Logged Out", Toast.LENGTH_LONG).show();
+                    }
+                });
+
             }
         });
 

Branch-SDK/src/main/java/io/branch/referral/Branch.java

@@ -950,13 +950,18 @@ public boolean isUserIdentified() {
      * <p>This method should be called if you know that a different person is about to use the app. For example,
      * if you allow users to log out and let their friend use the app, you should call this to notify Branch
      * to create a new user for this device. This will clear the first and latest params, as a new session is created.</p>
+     *
+     * @param callback An instance of {@link io.branch.referral.Branch.LogoutStatusListener} to callback with the logout operation status.
      */
-    public void logout() {
+    public void logout(LogoutStatusListener callback) {
         prefHelper_.setIdentity(PrefHelper.NO_STRING_VALUE);
         prefHelper_.clearUserValues();
         //On Logout clear the link cache and all pending requests
         linkCache_.clear();
         requestQueue_.clear();
+        if (callback != null) {
+            callback.onLogoutFinished(true, null);
+        }
     }
 
     /**
@@ -1102,13 +1107,13 @@ String generateShortLinkInternal(ServerRequestCreateUrl req) {
      * @param activity          The {@link Activity} to show native share sheet chooser dialog.
      * @param buo               A {@link BranchUniversalObject} value containing the deep link params.
      * @param linkProperties    An object of {@link LinkProperties} specifying the properties of this link
-
+     * @param callback          A {@link Branch.BranchNativeLinkShareListener } instance for getting sharing status.
      * @param title             A {@link String } for setting title in native chooser dialog.
      * @param subject           A {@link String } for setting subject in native chooser dialog.
      */
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
-    public void share(@NonNull Activity activity, @NonNull BranchUniversalObject buo, @NonNull LinkProperties linkProperties, String title, String subject){
-            NativeShareLinkManager.getInstance().shareLink(activity, buo, linkProperties, title, subject);
+    public void share(@NonNull Activity activity, @NonNull BranchUniversalObject buo, @NonNull LinkProperties linkProperties, @Nullable BranchNativeLinkShareListener callback, String title, String subject){
+        NativeShareLinkManager.getInstance().shareLink(activity, buo, linkProperties, callback, title, subject);
     }
 
     /**

Branch-SDK/src/main/java/io/branch/referral/validators/LinkingValidatorDialogRowItem.java

@@ -17,6 +17,7 @@
 
 import io.branch.indexing.BranchUniversalObject;
 import io.branch.referral.Branch;
+import io.branch.referral.BranchError;
 import io.branch.referral.R;
 import io.branch.referral.util.LinkProperties;
 
@@ -112,7 +113,17 @@ private void HandleShareButtonClicked() {
         }
         BranchUniversalObject buo = new BranchUniversalObject().setCanonicalIdentifier(canonicalIdentifier);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-            Branch.init().share(getActivity(context), buo, lp, titleText.getText().toString(), infoText);
+            Branch.init().share(getActivity(context), buo, lp, new Branch.BranchNativeLinkShareListener() {
+                        @Override
+                        public void onLinkShareResponse(String sharedLink, BranchError error) {
+                        }
+
+                        @Override
+                        public void onChannelSelected(String channelName) {
+                        }
+                    },
+                    titleText.getText().toString(),
+                    infoText);
         }
     }