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

Inline feature flag to show ACI SN by default.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-11-01 15:47:48 -04:00
parent a9be6aff44
commit 772bafbe43
3 changed files with 6 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,16 +56,9 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity {
boolean verified) {
Recipient recipient = Recipient.live(recipientId).resolve();
if (FeatureFlags.showAciSafetyNumberAsDefault()) {
if (!recipient.hasServiceId()) {
showExchangeMessagesDialog(context);
return;
}
} else {
if (!recipient.hasServiceId() || !recipient.hasE164()) {
showExchangeMessagesDialog(context);
return;
}
if (!recipient.hasServiceId()) {
showExchangeMessagesDialog(context);
return;
}
context.startActivity(newIntent(context, recipientId, identityKey, verified));

14
app/src/main/java/org/thoughtcrime/securesms/verify/VerifySafetyNumberViewModel.kt
View File

@@ -24,7 +24,6 @@ import org.thoughtcrime.securesms.recipients.LiveRecipient
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.storage.StorageSyncHelper
import org.thoughtcrime.securesms.util.FeatureFlags
import org.thoughtcrime.securesms.util.IdentityUtil
class VerifySafetyNumberViewModel(
@@ -70,17 +69,10 @@ class VerifySafetyNumberViewModel(
aciFingerprint = SafetyNumberFingerprint(version, localIdentifier, localIdentity, remoteIdentifier, remoteIdentity, generator.createFor(version, localIdentifier, localIdentity, remoteIdentifier, remoteIdentity))
}
if (FeatureFlags.showAciSafetyNumberAsDefault()) {
if (aciFingerprint != null) {
fingerprintList.add(aciFingerprint)
if (e164Fingerprint != null) {
fingerprintList.add(e164Fingerprint)
}
}
} else {
if (aciFingerprint != null && e164Fingerprint != null) {
if (aciFingerprint != null) {
fingerprintList.add(aciFingerprint)
if (e164Fingerprint != null) {
fingerprintList.add(e164Fingerprint)
fingerprintList.add(aciFingerprint)
}
}