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

Fix blocking bugs for internal link and sync testing.

Browse Source
This commit is contained in:
Cody Henthorne
2025-10-08 16:09:01 -04:00
parent 33a7f55fa3
commit f8eaa96412
27 changed files with 212 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
View File

@@ -135,6 +135,10 @@ public final class Megaphones {
}
private static boolean shouldShowLinkedDeviceInactiveMegaphone() {
if (SignalStore.account().isLinkedDevice()) {
return false;
}
LeastActiveLinkedDevice device = SignalStore.misc().getLeastActiveLinkedDevice();
if (device == null) {
return false;
@@ -487,11 +491,11 @@ public final class Megaphones {
}
private static boolean shouldShowOnboardingMegaphone(@NonNull Context context) {
return SignalStore.onboarding().hasOnboarding(context);
return SignalStore.account().isPrimaryDevice() && SignalStore.onboarding().hasOnboarding(context);
}
private static boolean shouldShowNewLinkedDeviceMegaphone() {
return SignalStore.misc().getNewLinkedDeviceId() > 0 && !NotificationChannels.getInstance().areNotificationsEnabled();
return SignalStore.account().isPrimaryDevice() && SignalStore.misc().getNewLinkedDeviceId() > 0 && !NotificationChannels.getInstance().areNotificationsEnabled();
}
private static boolean shouldShowTurnOffCircumventionMegaphone() {
@@ -542,7 +546,8 @@ public final class Megaphones {
long phoneNumberDiscoveryDisabledAt = SignalStore.phoneNumberPrivacy().getPhoneNumberDiscoverabilityModeTimestamp();
PhoneNumberDiscoverabilityMode listingMode = SignalStore.phoneNumberPrivacy().getPhoneNumberDiscoverabilityMode();
return !hasUsername &&
return SignalStore.account().isPrimaryDevice() &&
!hasUsername &&
listingMode == PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE &&
!hasCompleted &&
phoneNumberDiscoveryDisabledAt > 0 &&
@@ -550,7 +555,7 @@ public final class Megaphones {
}
private static boolean shouldShowPnpLaunchMegaphone() {
return TextUtils.isEmpty(SignalStore.account().getUsername()) && !SignalStore.uiHints().hasCompletedUsernameOnboarding();
return SignalStore.account().isPrimaryDevice() && TextUtils.isEmpty(SignalStore.account().getUsername()) && !SignalStore.uiHints().hasCompletedUsernameOnboarding();
}
private static boolean shouldShowTurnOnBackupsMegaphone(@NonNull Context context) {
@@ -562,7 +567,7 @@ public final class Megaphones {
return false;
}
if (!SignalStore.account().isRegistered() || TextSecurePreferences.isUnauthorizedReceived(context)) {
if (!SignalStore.account().isRegistered() || TextSecurePreferences.isUnauthorizedReceived(context) || SignalStore.account().isLinkedDevice()) {
return false;
}
@@ -580,7 +585,7 @@ public final class Megaphones {
}
private static boolean shouldShowBackupSchedulePermissionMegaphone(@NonNull Context context) {
return Build.VERSION.SDK_INT >= 31 && SignalStore.settings().isBackupEnabled() && !ServiceUtil.getAlarmManager(context).canScheduleExactAlarms();
return SignalStore.account().isPrimaryDevice() && Build.VERSION.SDK_INT >= 31 && SignalStore.settings().isBackupEnabled() && !ServiceUtil.getAlarmManager(context).canScheduleExactAlarms();
}
/**

4
app/src/main/java/org/thoughtcrime/securesms/megaphone/PinsForAllSchedule.java
View File

@@ -49,6 +49,10 @@ class PinsForAllSchedule implements MegaphoneSchedule {
return false;
}
if (SignalStore.account().isLinkedDevice()) {
return false;
}
if (pinCreationFailedDuringRegistration()) {
return true;
}

8
app/src/main/java/org/thoughtcrime/securesms/megaphone/SignalPinReminderSchedule.java
View File

@@ -14,6 +14,10 @@ final class SignalPinReminderSchedule implements MegaphoneSchedule {
return false;
}
if (SignalStore.account().isLinkedDevice()) {
return false;
}
if (!SignalStore.pin().arePinRemindersEnabled()) {
return false;
}
@@ -22,6 +26,10 @@ final class SignalPinReminderSchedule implements MegaphoneSchedule {
return false;
}
if (SignalStore.account().isLinkedDevice()) {
return false;
}
long lastReminderTime = SignalStore.pin().getLastReminderTime();
long interval = SignalStore.pin().getCurrentInterval();

4
app/src/main/java/org/thoughtcrime/securesms/megaphone/VerifyBackupKeyReminderSchedule.kt
View File

@@ -16,6 +16,10 @@ class VerifyBackupKeyReminderSchedule : MegaphoneSchedule {
return false
}
if (SignalStore.account.isLinkedDevice) {
return false
}
val lastVerifiedTime = SignalStore.backup.lastVerifyKeyTime
val previouslySnoozed = SignalStore.backup.hasSnoozedVerified
val isFirstReminder = !SignalStore.backup.hasVerifiedBefore