From 25b023c39135b858f93f702a1c623c0010c728c2 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 13 Nov 2024 19:08:21 +0100
Subject: [PATCH] show toast when reaction can not be added

---
 .../eu/siacs/conversations/ui/AddReactionActivity.java |  9 +++++++--
 .../siacs/conversations/ui/ConversationFragment.java   |  7 ++++++-
 .../siacs/conversations/ui/adapter/MessageAdapter.java | 10 +++++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java b/src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java
index 9b50817547daa4f4d7d0a17a6aa0aeda8cb857e4..709202f659dbb772ba872dc888399dac543bf88e 100644
--- a/src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java
@@ -45,12 +45,17 @@ public class AddReactionActivity extends XmppActivity {
         }
         final var aggregated = m.getAggregatedReactions();
         if (aggregated.ourReactions.contains(emoji)) {
-            xmppConnectionService.sendReactions(m, aggregated.ourReactions);
+            if (!xmppConnectionService.sendReactions(m, aggregated.ourReactions)) {
+                Toast.makeText(this, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show();
+                return;
+            }
         } else {
             final ImmutableSet.Builder<String> reactionBuilder = new ImmutableSet.Builder<>();
             reactionBuilder.addAll(aggregated.ourReactions);
             reactionBuilder.add(emoji);
-            xmppConnectionService.sendReactions(m, reactionBuilder.build());
+            if (!xmppConnectionService.sendReactions(m, reactionBuilder.build())) {
+                Toast.makeText(this, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show();
+            }
         }
         finish();
     }
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index e118c0a4302b007f31d9fca8958abf461b1e99b6..73b8dfc7c3aa3ba6be4e69ab37cec8fd986635d4 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -2141,7 +2141,12 @@ public class ConversationFragment extends XmppFragment
     }
 
     private void addReaction(final Message message) {
-        activity.addReaction(message, reactions -> activity.xmppConnectionService.sendReactions(message, reactions));
+        activity.addReaction(message, reactions -> {
+            if (activity.xmppConnectionService.sendReactions(message, reactions)) {
+                return;
+            }
+            Toast.makeText(activity, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show();
+        });
     }
 
     private void reportMessage(final Message message) {
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 5ed24dfb12b6c7196a0c1f3366fdc01b0ac07767..8d3fa2b8aa85da03b27c5c98b55caad3a0656bfd 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -1122,7 +1122,15 @@ public class MessageAdapter extends ArrayAdapter<Message> {
     }
 
     private void addReaction(final Message message) {
-        activity.addReaction(message, reactions -> activity.xmppConnectionService.sendReactions(message,reactions));
+        activity.addReaction(
+                message,
+                reactions -> {
+                    if (activity.xmppConnectionService.sendReactions(message, reactions)) {
+                        return;
+                    }
+                    Toast.makeText(activity, R.string.could_not_add_reaction, Toast.LENGTH_LONG)
+                            .show();
+                });
     }
 
     private void promptOpenKeychainInstall(View view) {