瀏覽代碼

Merge branch '136-nullPointerExceptionFromLongPressPaste' into 'master'

Resolve "貼上有時候會拋出NullPointerException"

See merge request kdanandroid/pdf/pdfreaderreadermodule!67
Wayne Huang 4 年之前
父節點
當前提交
eb660a9a7b
共有 1 個文件被更改,包括 6 次插入4 次删除
  1. 6 4
      src/main/java/com/kdanmobile/reader/screen/contextmenu/MyKMPDFContextMenuCallback.kt

+ 6 - 4
src/main/java/com/kdanmobile/reader/screen/contextmenu/MyKMPDFContextMenuCallback.kt

@@ -335,10 +335,12 @@ open class MyKMPDFContextMenuCallback(private val kmpdfFactory: KMPDFFactory?) :
             btnPaste.setTextColor(ContextCompat.getColor(context, R.color.reader_contextMenu_text_disabled))
         }
         btnPaste.setOnClickListener {
-            if (clipboardManager.hasPrimaryClip()) {
-                val kmpdfLongPressCreateAnnotController = kmpdfFactory?.getController(KMPDFFactory.ControllerType.LONGCLICK) as KMPDFLongPressCreateAnnotController?
-                kmpdfLongPressCreateAnnotController?.longPress_Paste()
-                onLongPress()
+            if (clipboardManager.hasPrimaryClip() && !(clipboardManager.primaryClip?.getItemAt(0)?.text?.toString()).isNullOrEmpty()) {
+                try {
+                    val kmpdfLongPressCreateAnnotController = kmpdfFactory?.getController(KMPDFFactory.ControllerType.LONGCLICK) as KMPDFLongPressCreateAnnotController?
+                    kmpdfLongPressCreateAnnotController?.longPress_Paste()
+                    onLongPress()
+                } catch (e: Exception) {}
             }
             dismissPopupWindow()
         }