From 6926a359bbbcce30edfeec03ff47120244223b2b Mon Sep 17 00:00:00 2001
From: NidhiDixit09 <93544270+NidhiDixit09@users.noreply.github.com>
Date: Mon, 18 Dec 2023 10:34:55 -0800
Subject: [PATCH] Removed Extra Code

---
 .../receivers/SharingBroadcastReceiver.kt     | 24 ------------------
 .../main/java/io/branch/referral/Branch.java  |  1 -
 .../io/branch/referral/util/SharingUtil.kt    | 25 +++++++------------
 3 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/Branch-SDK/src/main/java/io/branch/receivers/SharingBroadcastReceiver.kt b/Branch-SDK/src/main/java/io/branch/receivers/SharingBroadcastReceiver.kt
index 587efd166..85461ff7d 100644
--- a/Branch-SDK/src/main/java/io/branch/receivers/SharingBroadcastReceiver.kt
+++ b/Branch-SDK/src/main/java/io/branch/receivers/SharingBroadcastReceiver.kt
@@ -15,29 +15,5 @@ class SharingBroadcastReceiver: BroadcastReceiver() {
 
         BranchLogger.v("Intent: $intent")
         BranchLogger.v("Clicked component: $clickedComponent")
-
-        val sharedIntent : Intent? = SharingUtil.chooserIntent?.getParcelableExtra(Intent.EXTRA_INTENT);
-        val shareIntentdExtraText = sharedIntent?.getStringExtra(Intent.EXTRA_TEXT)
-
-        BranchLogger.v("Intent Shared: $sharedIntent");
-        BranchLogger.v("Intent Shared Text: $shareIntentdExtraText");
-
-        sharedIntent?.putExtra(Intent.EXTRA_TEXT, "test Nidhi")
-
-        SharingUtil.chooserIntent?.putExtra(Intent.EXTRA_INTENT,sharedIntent)
-
-        val sharedIntent2 : Intent? = SharingUtil.chooserIntent?.getParcelableExtra(Intent.EXTRA_INTENT);
-        val shareIntentdExtraText2 = sharedIntent2?.getStringExtra(Intent.EXTRA_TEXT)
-
-        BranchLogger.v("Intent Shared Updated: $sharedIntent2");
-        BranchLogger.v("Intent Shared Text Updated: $shareIntentdExtraText2");
-
-        // TODO : Get Pointer to BranchLinkShareListener and call function onChannelSelected
-
-       // val shareIntent3 = Intent.createChooser(shareIntent, null)
-        // context.startActivity(shareIntent3)
-
-
-
     }
 }
\ No newline at end of file
diff --git a/Branch-SDK/src/main/java/io/branch/referral/Branch.java b/Branch-SDK/src/main/java/io/branch/referral/Branch.java
index fcd0b7a1b..eacffe852 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/Branch.java
+++ b/Branch-SDK/src/main/java/io/branch/referral/Branch.java
@@ -78,7 +78,6 @@ public class Branch {
 
     /**
      * Hard-coded {@link String} that denotes a {@link BranchLinkData#tags}; applies to links that
-     * Hard-coded {@link String} that denotes a {@link BranchLinkData}; applies to links that
      * are shared with others directly as a user action, via social media for instance.
      */
     public static final String FEATURE_TAG_SHARE = "share";
diff --git a/Branch-SDK/src/main/java/io/branch/referral/util/SharingUtil.kt b/Branch-SDK/src/main/java/io/branch/referral/util/SharingUtil.kt
index 26c20a201..6cc4f7c19 100644
--- a/Branch-SDK/src/main/java/io/branch/referral/util/SharingUtil.kt
+++ b/Branch-SDK/src/main/java/io/branch/referral/util/SharingUtil.kt
@@ -8,27 +8,21 @@ import androidx.annotation.RequiresApi
 import io.branch.receivers.SharingBroadcastReceiver
 
 object SharingUtil {
-
-    val shareIntent = Intent().apply {
-        action = Intent.ACTION_SEND
-        type = "text/plain"
-        putExtra(Intent.EXTRA_TEXT, "test1234")
-        putExtra(Intent.EXTRA_SUBJECT, "")
-    }
-    var chooserIntent: Intent? = null
-
-    @JvmStatic @RequiresApi(Build.VERSION_CODES.LOLLIPOP_MR1)
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP_MR1)
     fun share(text: String, subject: String?, activity: Activity) {
-
         val immutabilityIntentFlags: Int =
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 PendingIntent.FLAG_MUTABLE
             } else {
                 0
             }
-
-
-         chooserIntent =
+        val shareIntent = Intent().apply {
+            action = Intent.ACTION_SEND
+            type = "text/plain"
+            putExtra(Intent.EXTRA_TEXT, text)
+            putExtra(Intent.EXTRA_SUBJECT, subject)
+        }
+        val chooserIntent =
             Intent.createChooser(
                 shareIntent,
                 null, // dialog title optional
@@ -36,12 +30,11 @@ object SharingUtil {
                     activity.applicationContext,
                     0,
                     Intent(activity.applicationContext, SharingBroadcastReceiver::class.java),
-                    PendingIntent.FLAG_UPDATE_CURRENT
+                    PendingIntent.FLAG_UPDATE_CURRENT or immutabilityIntentFlags
                 ).intentSender
             )
 
         activity.startActivityForResult(chooserIntent, 1002)
 
-        // TODO: Call onLinkShareResponse function once activity finishes.
     }
 }
\ No newline at end of file