empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix group recipient showing in verify safety number change "learn more".

Browse source
This commit is contained in:
Alan Evans 2021-01-14 10:18:56 -04:00
parent f8c053cc96
commit aa2094a2cc
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View file

@ -22,7 +22,6 @@ import android.app.Activity;
import android.content.ClipData; import android.content.ClipData;
import android.content.ClipboardManager; import android.content.ClipboardManager;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
@ -1438,6 +1437,10 @@ public class ConversationFragment extends LoggingFragment {
@Override @Override
public void onSafetyNumberLearnMoreClicked(@NonNull Recipient recipient) { public void onSafetyNumberLearnMoreClicked(@NonNull Recipient recipient) {
if (recipient.isGroup()) {
throw new AssertionError("Must be individual");
}
AlertDialog dialog = new AlertDialog.Builder(requireContext()) AlertDialog dialog = new AlertDialog.Builder(requireContext())
.setView(R.layout.safety_number_changed_learn_more_dialog) .setView(R.layout.safety_number_changed_learn_more_dialog)
.setPositiveButton(R.string.ConversationFragment_verify, (d, w) -> { .setPositiveButton(R.string.ConversationFragment_verify, (d, w) -> {

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
View file

@ -221,7 +221,7 @@ public final class ConversationUpdateItem extends LinearLayout
actionButton.setVisibility(VISIBLE); actionButton.setVisibility(VISIBLE);
actionButton.setOnClickListener(v -> { actionButton.setOnClickListener(v -> {
if (batchSelected.isEmpty() && eventListener != null) { if (batchSelected.isEmpty() && eventListener != null) {
eventListener.onSafetyNumberLearnMoreClicked(conversationRecipient); eventListener.onSafetyNumberLearnMoreClicked(conversationMessage.getMessageRecord().getIndividualRecipient());
} }
}); });
} else if (conversationMessage.getMessageRecord().isGroupCall()) { } else if (conversationMessage.getMessageRecord().isGroupCall()) {