fix: android do not call onPaste if disabled

mattermost · Jan 19, 2023 · 753852d · 753852d
1 parent 69f65de
commit 753852d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/android/src/main/java/com/mattermost/pasteinput/PasteInputEditText.kt b/android/src/main/java/com/mattermost/pasteinput/PasteInputEditText.kt
@@ -12,6 +12,11 @@ import java.lang.Exception
 
 class PasteInputEditText(context: ThemedReactContext) : ReactEditText(context) {
   private lateinit var mOnPasteListener: IPasteInputListener
+  private var mDisabledCopyPaste: Boolean = false
+
+  fun setDisableCopyPaste(disabled: Boolean) {
+    this.mDisabledCopyPaste = disabled
+  }
 
   fun setOnPasteListener(listener: IPasteInputListener) {
     mOnPasteListener = listener
@@ -36,7 +41,9 @@ class PasteInputEditText(context: ThemedReactContext) : ReactEditText(context) {
         }
       }
 
-      getOnPasteListener().onPaste(inputContentInfo.contentUri)
+      if (!mDisabledCopyPaste) {
+        getOnPasteListener().onPaste(inputContentInfo.contentUri)
+      }
 
       true
     }

diff --git a/android/src/main/java/com/mattermost/pasteinput/PasteInputManager.kt b/android/src/main/java/com/mattermost/pasteinput/PasteInputManager.kt
@@ -31,6 +31,7 @@ class PasteInputManager(reactContext: ReactContext) : ReactTextInputManager() {
      disableCopyPaste = disabled
      editText.customInsertionActionModeCallback = PasteInputActionCallback(editText, disabled)
      editText.customSelectionActionModeCallback = PasteInputActionCallback(editText, disabled)
+     editText.setDisableCopyPaste(disabled)
    }
 
   @RequiresApi(Build.VERSION_CODES.M)
@@ -53,7 +54,6 @@ class PasteInputManager(reactContext: ReactContext) : ReactTextInputManager() {
      pasteInputEditText.setOnPasteListener(PasteInputListener(pasteInputEditText))
    }
 
-   @Nullable
    override fun getExportedCustomBubblingEventTypeConstants(): MutableMap<String, Any> {
      val map = super.getExportedCustomBubblingEventTypeConstants()!!
      map.put(