fix(share_plus): reset isCalledBack on android correctly after closing share-sheet

coder-with-a-bushido · coder-with-a-bushido · commit 25c252660a40 · 2023-12-06T14:33:58.000+05:30
diff --git a/packages/share_plus/share_plus/android/src/main/kotlin/dev/fluttercommunity/plus/share/MethodCallHandler.kt b/packages/share_plus/share_plus/android/src/main/kotlin/dev/fluttercommunity/plus/share/MethodCallHandler.kt
@@ -40,6 +40,7 @@ internal class MethodCallHandler(
                     isWithResult,
                 )
 
+                manager.signalShareSheetCalledBack()
                 if (!isWithResult) {
                     if (isResultRequested) {
                         result.success("dev.fluttercommunity.plus/share/unavailable")
@@ -62,6 +63,7 @@ internal class MethodCallHandler(
                         isWithResult,
                     )
 
+                    manager.signalShareSheetCalledBack()
                     if (!isWithResult) {
                         if (isResultRequested) {
                             result.success("dev.fluttercommunity.plus/share/unavailable")
diff --git a/packages/share_plus/share_plus/android/src/main/kotlin/dev/fluttercommunity/plus/share/ShareSuccessManager.kt b/packages/share_plus/share_plus/android/src/main/kotlin/dev/fluttercommunity/plus/share/ShareSuccessManager.kt
@@ -34,6 +34,14 @@ internal class ShareSuccessManager(private val context: Context) : ActivityResul
         }
     }
 
+    /**
+     * Set the `isCalledBack` to `true`. Must be called in every share-sheet calling method
+     * before returning.
+     */
+    fun signalShareSheetCalledBack(){
+        isCalledBack.set(true)
+    }
+
     /**
      * Must be called if `.startActivityForResult` is not available to avoid deadlocking.
      */

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ internal class MethodCallHandler(`
`40`	`40`	`isWithResult,`
`41`	`41`	`)`
`42`	`42`
	`43`	`+ manager.signalShareSheetCalledBack()`
`43`	`44`	`if (!isWithResult) {`
`44`	`45`	`if (isResultRequested) {`
`45`	`46`	`result.success("dev.fluttercommunity.plus/share/unavailable")`
`@@ -62,6 +63,7 @@ internal class MethodCallHandler(`
`62`	`63`	`isWithResult,`
`63`	`64`	`)`
`64`	`65`
	`66`	`+ manager.signalShareSheetCalledBack()`
`65`	`67`	`if (!isWithResult) {`
`66`	`68`	`if (isResultRequested) {`
`67`	`69`	`result.success("dev.fluttercommunity.plus/share/unavailable")`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,14 @@ internal class ShareSuccessManager(private val context: Context) : ActivityResul`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ /**`
	`38`	+ * Set the `isCalledBack` to `true`. Must be called in every share-sheet calling method
	`39`	`+ * before returning.`
	`40`	`+ */`
	`41`	`+ fun signalShareSheetCalledBack(){`
	`42`	`+ isCalledBack.set(true)`
	`43`	`+ }`
	`44`	`+`
`37`	`45`	`/**`
`38`	`46`	* Must be called if `.startActivityForResult` is not available to avoid deadlocking.
`39`	`47`	`*/`