Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for displaying both ACI and e164 safety numbers.

Browse Source
This commit is contained in:
Clark
2023-07-19 10:17:45 -04:00
committed by Nicholas
parent 00bbb6bc6e
commit 461875b0e4
29 changed files with 1633 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
View File

@@ -4391,7 +4391,7 @@ public class ConversationParentFragment extends Fragment
public void onClicked(final List<IdentityRecord> unverifiedIdentities) {
Log.i(TAG, "onClicked: " + unverifiedIdentities.size());
if (unverifiedIdentities.size() == 1) {
startActivity(VerifyIdentityActivity.newIntent(requireContext(), unverifiedIdentities.get(0), false));
VerifyIdentityActivity.startOrShowExchangeMessagesDialog(requireContext(), unverifiedIdentities.get(0), false);
} else {
String[] unverifiedNames = new String[unverifiedIdentities.size()];
@@ -4403,7 +4403,7 @@ public class ConversationParentFragment extends Fragment
builder.setIcon(R.drawable.ic_warning);
builder.setTitle(R.string.ConversationFragment__no_longer_verified);
builder.setItems(unverifiedNames, (dialog, which) -> {
startActivity(VerifyIdentityActivity.newIntent(requireContext(), unverifiedIdentities.get(which), false));
VerifyIdentityActivity.startOrShowExchangeMessagesDialog(requireContext(), unverifiedIdentities.get(which), false);
});
builder.show();
}

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeDialog.java
View File

@@ -225,7 +225,7 @@ public final class SafetyNumberChangeDialog extends DialogFragment implements Sa
@Override
public void onViewIdentityRecord(@NonNull IdentityRecord identityRecord) {
startActivity(VerifyIdentityActivity.newIntent(requireContext(), identityRecord));
VerifyIdentityActivity.startOrShowExchangeMessagesDialog(requireContext(), identityRecord);
}
public interface Callback {

2
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationDialogs.kt
View File

@@ -55,7 +55,7 @@ object ConversationDialogs {
{ ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecord(recipient.id) },
{ identityRecord ->
identityRecord.ifPresent {
fragment.startActivity(VerifyIdentityActivity.newIntent(fragment.requireContext(), identityRecord.get()))
VerifyIdentityActivity.startOrShowExchangeMessagesDialog(fragment.requireContext(), identityRecord.get())
}
d.dismiss()
}

4
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
View File

@@ -3246,7 +3246,7 @@ class ConversationFragment :
override fun onUnverifiedBannerClicked(unverifiedIdentities: List<IdentityRecord>) {
if (unverifiedIdentities.size == 1) {
startActivity(VerifyIdentityActivity.newIntent(requireContext(), unverifiedIdentities[0], false))
VerifyIdentityActivity.startOrShowExchangeMessagesDialog(requireContext(), unverifiedIdentities[0], false)
} else {
val unverifiedNames = unverifiedIdentities
.map { Recipient.resolved(it.recipientId).getDisplayName(requireContext()) }
@@ -3255,7 +3255,7 @@ class ConversationFragment :
MaterialAlertDialogBuilder(requireContext())
.setIcon(R.drawable.ic_warning)
.setTitle(R.string.ConversationFragment__no_longer_verified)
.setItems(unverifiedNames) { _, which: Int -> startActivity(VerifyIdentityActivity.newIntent(requireContext(), unverifiedIdentities[which], false)) }
.setItems(unverifiedNames) { _, which: Int -> VerifyIdentityActivity.startOrShowExchangeMessagesDialog(requireContext(), unverifiedIdentities[which], false) }
.show()
}
}