Merge pull request #3786 from deltachat/adb/improve-reactions-dialog

allow to react with same emoji as others

Author: adbenitez

src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientItem.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -23,6 +24,7 @@ public class ReactionRecipientItem extends LinearLayout {
   private TextView        reactionView;
 
   private int             contactId;
+  private String          reaction;
 
   public ReactionRecipientItem(Context context) {
     super(context);
@@ -44,6 +46,7 @@ protected void onFinishInflate() {
 
   public void bind(@NonNull GlideRequests glideRequests, int contactId, String reaction) {
     this.contactId      = contactId;
+    this.reaction       = reaction;
     DcContact dcContact = DcHelper.getContext(getContext()).getContact(contactId);
     Recipient recipient = new Recipient(getContext(), dcContact);
     this.contactPhotoImage.setAvatar(glideRequests, recipient, false);
@@ -58,4 +61,12 @@ public void unbind(GlideRequests glideRequests) {
   public int getContactId() {
     return contactId;
   }
+
+  public String getReaction() {
+    return reaction;
+  }
+
+  public View getReactionView() {
+    return reactionView;
+  }
 }

src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java

@@ -47,6 +47,11 @@ public static class ReactionViewHolder extends ViewHolder {
           clickListener.onItemClick(getView());
         }
       });
+      ((ReactionRecipientItem) itemView).getReactionView().setOnClickListener(view -> {
+        if (clickListener != null) {
+          clickListener.onReactionClick(getView());
+        }
+      });
     }
 
     public ReactionRecipientItem getView() {
@@ -93,6 +98,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int i)
 
   public interface ItemClickListener {
     void onItemClick(ReactionRecipientItem item);
+    void onReactionClick(ReactionRecipientItem item);
   }
 
   public void changeData(ArrayList<Pair<Integer, String>> contactsReactions) {

src/main/java/org/thoughtcrime/securesms/reactions/ReactionsDetailsFragment.java

@@ -17,6 +17,7 @@
 import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEvent;
 import com.b44t.messenger.rpc.Reactions;
+import com.b44t.messenger.rpc.Rpc;
 import com.b44t.messenger.rpc.RpcException;
 
 import org.thoughtcrime.securesms.ProfileActivity;
@@ -114,6 +115,39 @@ private void openConversation(int contactId) {
     requireContext().startActivity(intent);
   }
 
+  private String getSelfReaction(Rpc rpc, int accId) {
+    String result = null;
+    try {
+      final Reactions reactions = rpc.getMsgReactions(accId, msgId);
+      if (reactions != null) {
+        final Map<Integer, String[]> reactionsByContact = reactions.getReactionsByContact();
+        final String [] selfReactions = reactionsByContact.get(DcContact.DC_CONTACT_ID_SELF);
+        if (selfReactions != null && selfReactions.length > 0) {
+          result = selfReactions[0];
+        }
+      }
+    } catch(RpcException e) {
+      e.printStackTrace();
+    }
+    return result;
+  }
+
+  private void sendReaction(final String reaction) {
+    Rpc rpc = DcHelper.getRpc(requireActivity());
+    DcContext dcContext = DcHelper.getContext(requireActivity());
+    int accId = dcContext.getAccountId();
+
+    try {
+      if (reaction == null || reaction.equals(getSelfReaction(rpc, accId))) {
+        rpc.sendReaction(accId, msgId, "");
+      } else {
+        rpc.sendReaction(accId, msgId, reaction);
+      }
+    } catch(Exception e) {
+      e.printStackTrace();
+    }
+  }
+
   private class ListClickListener implements ReactionRecipientsAdapter.ItemClickListener {
 
     @Override
@@ -124,6 +158,12 @@ public void onItemClick(ReactionRecipientItem item) {
           openConversation(contactId);
         }
     }
+
+    @Override
+    public void onReactionClick(ReactionRecipientItem item) {
+      sendReaction(item.getReaction());
+      ReactionsDetailsFragment.this.dismiss();
+    }
   }
 
 }

src/main/res/layout/reaction_recipient_item.xml

@@ -50,8 +50,9 @@
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/reaction"
+        style="@style/ButtonSecondary"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="40dp"
         android:gravity="center"
         android:textSize="22dp"
         android:fontFamily="sans-serif"