toast after copy to clipboard is unnecessary on Android 13+

Daniel Gultsch created 8 months ago

Change summary

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 14 
src/main/java/eu/siacs/conversations/ui/OmemoActivity.java        |  6 
src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java       | 14 
3 files changed, 21 insertions(+), 13 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

@@ -2185,12 +2185,14 @@ public class ConversationFragment extends XmppFragment
         builder.setNegativeButton(
                 R.string.copy_to_clipboard,
                 (dialog, which) -> {
-                    activity.copyTextToClipboard(displayError, R.string.error_message);
-                    Toast.makeText(
-                                    activity,
-                                    R.string.error_message_copied_to_clipboard,
-                                    Toast.LENGTH_SHORT)
-                            .show();
+                    if (activity.copyTextToClipboard(displayError, R.string.error_message)
+                            && Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+                        Toast.makeText(
+                                        activity,
+                                        R.string.error_message_copied_to_clipboard,
+                                        Toast.LENGTH_SHORT)
+                                .show();
+                    }
                 });
         builder.setPositiveButton(R.string.confirm, null);
         builder.create().show();

src/main/java/eu/siacs/conversations/ui/OmemoActivity.java

@@ -1,6 +1,7 @@
 package eu.siacs.conversations.ui;
 
 import android.content.Intent;
+import android.os.Build;
 import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.view.View;
@@ -92,8 +93,9 @@ public abstract class OmemoActivity extends XmppActivity {
 
     protected void copyOmemoFingerprint(String fingerprint) {
         if (copyTextToClipboard(
-                CryptoHelper.prettifyFingerprint(fingerprint.substring(2)),
-                R.string.omemo_fingerprint)) {
+                        CryptoHelper.prettifyFingerprint(fingerprint.substring(2)),
+                        R.string.omemo_fingerprint)
+                && Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
             Toast.makeText(this, R.string.toast_message_omemo_fingerprint, Toast.LENGTH_SHORT)
                     .show();
         }

src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java

@@ -31,6 +31,7 @@ package eu.siacs.conversations.ui.util;
 
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
+import android.os.Build;
 import android.widget.Toast;
 import androidx.annotation.StringRes;
 import com.google.common.collect.Iterables;
@@ -93,14 +94,15 @@ public class ShareUtil {
         }
     }
 
-    public static void copyToClipboard(XmppActivity activity, Message message) {
-        if (activity.copyTextToClipboard(message.getBody(), R.string.message)) {
+    public static void copyToClipboard(final XmppActivity activity, final Message message) {
+        if (activity.copyTextToClipboard(message.getBody(), R.string.message)
+                && Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
             Toast.makeText(activity, R.string.message_copied_to_clipboard, Toast.LENGTH_SHORT)
                     .show();
         }
     }
 
-    public static void copyUrlToClipboard(XmppActivity activity, Message message) {
+    public static void copyUrlToClipboard(final XmppActivity activity, final Message message) {
         final String url;
         final int resId;
         if (message.isGeoUri()) {
@@ -117,7 +119,8 @@ public class ShareUtil {
                             : message.getBody().trim();
             resId = R.string.file_url;
         }
-        if (activity.copyTextToClipboard(url, resId)) {
+        if (activity.copyTextToClipboard(url, resId)
+                && Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
             Toast.makeText(activity, R.string.url_copied_to_clipboard, Toast.LENGTH_SHORT).show();
         }
     }
@@ -147,7 +150,8 @@ public class ShareUtil {
                     case "mailto" -> R.string.copied_email_address;
                     default -> R.string.uri_copied_to_clipboard;
                 };
-        if (activity.copyTextToClipboard(clip, label)) {
+        if (activity.copyTextToClipboard(clip, label)
+                && Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
             Toast.makeText(activity, toast, Toast.LENGTH_SHORT).show();
         }
     }