ContextMenu: Copy the srcUri for elements that don't have a linkUri

MozillaReality · Mar 31, 2020 · a58ce74 · a58ce74
1 parent ba34ff0
commit a58ce74
Showing 1 changed file with 19 additions and 13 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/ContextMenuWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/menus/ContextMenuWidget.java
@@ -129,20 +129,26 @@ public void setContextElement(ContextElement aContextElement) {
         }
         mItems.add(new MenuWidget.MenuItem(getContext().getString(R.string.context_menu_copy_link), 0, () -> {
             ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+            Uri uri;
             if (aContextElement.linkUri != null) {
-                Uri uri = Uri.parse(aContextElement.linkUri);
-                if (uri != null) {
-                    String label = aContextElement.title;
-                    if (StringUtils.isEmpty(label)) {
-                        label = aContextElement.altText;
-                    }
-                    if (StringUtils.isEmpty(label)) {
-                        label = aContextElement.altText;
-                    }
-                    if (StringUtils.isEmpty(label)) {
-                        label = aContextElement.linkUri;
-                    }
-                    ClipData clip = ClipData.newRawUri(label, uri);
+                uri = Uri.parse(aContextElement.linkUri);
+
+            } else {
+                uri = Uri.parse(aContextElement.srcUri);
+            }
+            if (uri != null) {
+                String label = aContextElement.title;
+                if (StringUtils.isEmpty(label)) {
+                    label = aContextElement.altText;
+                }
+                if (StringUtils.isEmpty(label)) {
+                    label = aContextElement.altText;
+                }
+                if (StringUtils.isEmpty(label)) {
+                    label = uri.toString();
+                }
+                ClipData clip = ClipData.newRawUri(label, uri);
+                if (clipboard != null) {
                     clipboard.setPrimaryClip(clip);
                 }
             }