Android: Fix clipboard issue with urls

Both hasUrls() and hasText() can return true when containing urls, as hasText() checks hasUrls() as well. Pick-to: 6.4 6.2 5.15 Fixes: QTBUG-85773 Change-Id: I91a34f151e7de17ab5b9a2f24bc0b6e6c097d7f9 Reviewed-by: Assam Boudjelthia <[email protected]>
RawnHelly · Oct 20, 2022 · 5f9591b · 5f9591b
1 parent fffea48
commit 5f9591b
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/src/plugins/platforms/android/androidjniclipboard.cpp b/src/plugins/platforms/android/androidjniclipboard.cpp
@@ -35,18 +35,6 @@ namespace QtAndroidClipboard
     void setClipboardMimeData(QMimeData *data)
     {
         clearClipboardData();
-        if (data->hasText()) {
-            QJniObject::callStaticMethod<void>(applicationClass(),
-                                               "setClipboardText", "(Ljava/lang/String;)V",
-                                               QJniObject::fromString(data->text()).object());
-        }
-        if (data->hasHtml()) {
-            QJniObject::callStaticMethod<void>(applicationClass(),
-                                               "setClipboardHtml",
-                                               "(Ljava/lang/String;Ljava/lang/String;)V",
-                                               QJniObject::fromString(data->text()).object(),
-                                               QJniObject::fromString(data->html()).object());
-        }
         if (data->hasUrls()) {
             QList<QUrl> urls = data->urls();
             for (const auto &u : std::as_const(urls)) {
@@ -55,6 +43,16 @@ namespace QtAndroidClipboard
                                                    "(Ljava/lang/String;)V",
                                                    QJniObject::fromString(u.toEncoded()).object());
             }
+        } else if (data->hasText()) { // hasText || hasUrls, so the order matter here.
+            QJniObject::callStaticMethod<void>(applicationClass(),
+                                               "setClipboardText", "(Ljava/lang/String;)V",
+                                               QJniObject::fromString(data->text()).object());
+        } else if (data->hasHtml()) {
+            QJniObject::callStaticMethod<void>(applicationClass(),
+                                               "setClipboardHtml",
+                                               "(Ljava/lang/String;Ljava/lang/String;)V",
+                                               QJniObject::fromString(data->text()).object(),
+                                               QJniObject::fromString(data->html()).object());
         }
     }