From 6ffeaacc50864ebde9b5e9068db38388e18599b0 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Wed, 5 Feb 2025 14:48:06 -0500 Subject: [PATCH] Remove emojipicker dependency --- build.gradle | 1 - .../conversations/ui/AddReactionActivity.java | 68 ------------------- .../siacs/conversations/ui/XmppActivity.java | 8 --- .../ui/adapter/MessageAdapter.java | 3 - src/main/res/layout/activity_add_reaction.xml | 25 ------- src/main/res/layout/dialog_add_reaction.xml | 13 +--- 6 files changed, 1 insertion(+), 117 deletions(-) delete mode 100644 src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java delete mode 100644 src/main/res/layout/activity_add_reaction.xml diff --git a/build.gradle b/build.gradle index db836d8ef19acde52733409b7b58f6c73136cc7b..1f757a30dcfdc39dc8349606128573eff4cdbae1 100644 --- a/build.gradle +++ b/build.gradle @@ -89,7 +89,6 @@ dependencies { implementation "androidx.emoji2:emoji2:1.5.0" freeImplementation "androidx.emoji2:emoji2-bundled:1.5.0" - implementation "androidx.emoji2:emoji2-emojipicker:1.5.0" implementation 'org.bouncycastle:bcmail-jdk18on:1.78.1' implementation 'org.bouncycastle:bcpg-jdk18on:1.78.1' diff --git a/src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java b/src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java deleted file mode 100644 index 709202f659dbb772ba872dc888399dac543bf88e..0000000000000000000000000000000000000000 --- a/src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java +++ /dev/null @@ -1,68 +0,0 @@ -package eu.siacs.conversations.ui; - -import android.os.Bundle; -import android.widget.Toast; - -import androidx.databinding.DataBindingUtil; - -import com.google.common.base.Strings; -import com.google.common.collect.ImmutableSet; - -import eu.siacs.conversations.R; -import eu.siacs.conversations.databinding.ActivityAddReactionBinding; - -public class AddReactionActivity extends XmppActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - final ActivityAddReactionBinding binding = - DataBindingUtil.setContentView(this, R.layout.activity_add_reaction); - Activities.setStatusAndNavigationBarColors(this, binding.getRoot()); - - setSupportActionBar(binding.toolbar); - binding.toolbar.setNavigationIcon(R.drawable.ic_clear_24dp); - binding.toolbar.setNavigationOnClickListener(v -> finish()); - setTitle(R.string.add_reaction_title); - binding.emojiPicker.setOnEmojiPickedListener( - emojiViewItem -> addReaction(emojiViewItem.getEmoji())); - } - - private void addReaction(final String emoji) { - final var intent = getIntent(); - final var conversation = intent == null ? null : intent.getStringExtra("conversation"); - final var message = intent == null ? null : intent.getStringExtra("message"); - if (Strings.isNullOrEmpty(conversation) || Strings.isNullOrEmpty(message)) { - Toast.makeText(this, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show(); - return; - } - final var c = xmppConnectionService.findConversationByUuid(conversation); - final var m = c == null ? null : c.findMessageWithUuid(message); - if (m == null) { - Toast.makeText(this, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show(); - return; - } - final var aggregated = m.getAggregatedReactions(); - if (aggregated.ourReactions.contains(emoji)) { - if (!xmppConnectionService.sendReactions(m, aggregated.ourReactions)) { - Toast.makeText(this, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show(); - return; - } - } else { - final ImmutableSet.Builder reactionBuilder = new ImmutableSet.Builder<>(); - reactionBuilder.addAll(aggregated.ourReactions); - reactionBuilder.add(emoji); - if (!xmppConnectionService.sendReactions(m, reactionBuilder.build())) { - Toast.makeText(this, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show(); - } - } - finish(); - } - - @Override - protected void refreshUiReal() {} - - @Override - protected void onBackendConnected() {} -} diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index 00e7decb39e2347dfcb92ad3f629437f6cd923e8..0c0879dbdae53b6468ed4bfae904854b54fc7ff1 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -388,14 +388,6 @@ public abstract class XmppActivity extends ActionBarActivity { dialog.dismiss(); }); } - viewBinding.more.setOnClickListener( - v -> { - dialog.dismiss(); - final var intent = new Intent(this, AddReactionActivity.class); - intent.putExtra("conversation", message.getConversation().getUuid()); - intent.putExtra("message", message.getUuid()); - startActivity(intent); - }); dialog.show(); } 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 36299d486175c467c4969810f2268af0c2b32f70..5a7f55d26b76115ee90101d0304b61f97524ba31 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -67,9 +67,6 @@ import com.cheogram.android.Util; import com.cheogram.android.WebxdcPage; import com.cheogram.android.WebxdcUpdate; -import androidx.emoji2.emojipicker.EmojiViewItem; -import androidx.emoji2.emojipicker.RecentEmojiProvider; - import com.google.android.material.button.MaterialButton; import com.google.android.material.chip.ChipGroup; import com.google.android.material.color.MaterialColors; diff --git a/src/main/res/layout/activity_add_reaction.xml b/src/main/res/layout/activity_add_reaction.xml deleted file mode 100644 index 0a963b02c6b2385a3de0369be310100dbea25b8c..0000000000000000000000000000000000000000 --- a/src/main/res/layout/activity_add_reaction.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/layout/dialog_add_reaction.xml b/src/main/res/layout/dialog_add_reaction.xml index 6546f37f85f4c8dbad55928b331c011f605adb5b..674e18c1af383c79d3b7d5320899e5285c029057 100644 --- a/src/main/res/layout/dialog_add_reaction.xml +++ b/src/main/res/layout/dialog_add_reaction.xml @@ -15,17 +15,6 @@ android:layout_height="wrap_content" android:layout_centerHorizontal="true" /> -