Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 20:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always show verify safety numbers option.

Browse Source
This commit is contained in:
Clark
2023-07-19 16:15:56 -04:00
committed by Nicholas
parent c5a27b2cc7
commit 5aa304ea9a
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
View File

@@ -543,7 +543,6 @@ class ConversationSettingsFragment : DSLSettingsFragment(
} }
} }
if (recipientState.identityRecord != null) {
clickPref( clickPref(
title = DSLSettingsText.from(R.string.ConversationSettingsFragment__view_safety_number), title = DSLSettingsText.from(R.string.ConversationSettingsFragment__view_safety_number),
icon = DSLSettingsIcon.from(R.drawable.ic_safety_number_24), icon = DSLSettingsIcon.from(R.drawable.ic_safety_number_24),
@@ -553,7 +552,6 @@ class ConversationSettingsFragment : DSLSettingsFragment(
} }
) )
} }
}
if (state.sharedMedia != null && state.sharedMedia.count > 0) { if (state.sharedMedia != null && state.sharedMedia.count > 0) {
dividerPref() dividerPref()

5
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java
View File

@@ -314,14 +314,11 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF
}); });
viewModel.getIdentity().observe(getViewLifecycleOwner(), identityRecord -> { viewModel.getIdentity().observe(getViewLifecycleOwner(), identityRecord -> {
viewSafetyNumberButton.setVisibility(identityRecord != null ? View.VISIBLE : View.GONE); viewSafetyNumberButton.setVisibility(View.VISIBLE);
if (identityRecord != null) {
viewSafetyNumberButton.setOnClickListener(view -> { viewSafetyNumberButton.setOnClickListener(view -> {
dismiss(); dismiss();
viewModel.onViewSafetyNumberClicked(requireActivity(), identityRecord); viewModel.onViewSafetyNumberClicked(requireActivity(), identityRecord);
}); });
}
}); });
avatar.setOnClickListener(view -> { avatar.setOnClickListener(view -> {

7
app/src/main/java/org/thoughtcrime/securesms/verify/VerifyIdentityActivity.java
View File

@@ -5,6 +5,7 @@ import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -35,8 +36,12 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity {
private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme(); private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
public static void startOrShowExchangeMessagesDialog(@NonNull Context context, public static void startOrShowExchangeMessagesDialog(@NonNull Context context,
@NonNull IdentityRecord identityRecord) { @Nullable IdentityRecord identityRecord) {
if (identityRecord != null) {
startOrShowExchangeMessagesDialog(context, identityRecord.getRecipientId(), identityRecord.getIdentityKey(), identityRecord.getVerifiedStatus() == IdentityTable.VerifiedStatus.VERIFIED); startOrShowExchangeMessagesDialog(context, identityRecord.getRecipientId(), identityRecord.getIdentityKey(), identityRecord.getVerifiedStatus() == IdentityTable.VerifiedStatus.VERIFIED);
} else {
showExchangeMessagesDialog(context);
}
} }
public static void startOrShowExchangeMessagesDialog(@NonNull Context context, public static void startOrShowExchangeMessagesDialog(@NonNull Context context,