fix(editor): clipboard content is sometimes pasted as `ClipData.Item …

…{ ... }`
Rosemoe · Dec 5, 2024 · 6e04493 · 6e04493
1 parent 72d8b57
commit 6e04493
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/editor/src/main/java/io/github/rosemoe/sora/util/ClipDataUtils.java b/editor/src/main/java/io/github/rosemoe/sora/util/ClipDataUtils.java
@@ -24,12 +24,17 @@
 package io.github.rosemoe.sora.util;
 
 import android.content.ClipData;
+import android.content.Context;
 
 import androidx.annotation.Nullable;
 
 public class ClipDataUtils {
 
     public static String clipDataToString(@Nullable ClipData clipData) {
+        return clipDataToString(null, clipData);
+    }
+
+    public static String clipDataToString(@Nullable Context context, @Nullable ClipData clipData) {
         if (clipData == null) {
             return "";
         }
@@ -39,11 +44,9 @@ public static String clipDataToString(@Nullable ClipData clipData) {
                 sb.append('\n');
             }
             var item = clipData.getItemAt(i);
-            var text = item.getText();
-            if (text == null) {
-                text = item.toString();
-            }
-            sb.append(text);
+            var text = context != null ? item.coerceToText(context) : item.getText();
+            if (text != null)
+                sb.append(text);
         }
         return sb.toString();
     }

diff --git a/editor/src/main/java/io/github/rosemoe/sora/widget/CodeEditor.java b/editor/src/main/java/io/github/rosemoe/sora/widget/CodeEditor.java
@@ -3512,7 +3512,7 @@ public void pasteText() {
             if (!clipboardManager.hasPrimaryClip() || (clip = clipboardManager.getPrimaryClip()) == null) {
                 return;
             }
-            pasteText(ClipDataUtils.clipDataToString(clip));
+            pasteText(ClipDataUtils.clipDataToString(getContext(), clip));
         } catch (Exception e) {
             Log.w(LOG_TAG, "Error pasting text to editor", e);
             Toast.makeText(getContext(), e.toString(), Toast.LENGTH_SHORT).show();
@@ -4736,7 +4736,7 @@ public boolean onDragEvent(DragEvent event) {
                 }
                 touchHandler.draggingSelection = null;
                 setSelection(targetPos.line, targetPos.column);
-                pasteText(ClipDataUtils.clipDataToString(event.getClipData()));
+                pasteText(ClipDataUtils.clipDataToString(getContext(), event.getClipData()));
                 requestFocus();
                 postInvalidate();
                 // Call super for notifying listeners