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

Refactor app settings.

Browse Source
This commit is contained in:
Alex Hart
2021-05-12 13:02:44 -03:00
committed by Greyson Parrelli
parent a94d77d81e
commit f2d5ea0391
179 changed files with 5244 additions and 3894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/migrations/BackupNotificationMigrationJob.java
View File

@@ -8,6 +8,7 @@ import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.backup.BackupFileIOError;
import org.thoughtcrime.securesms.jobmanager.Data;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.util.BackupUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -43,13 +44,13 @@ public final class BackupNotificationMigrationJob extends MigrationJob {
@Override
public void performMigration() {
if (Build.VERSION.SDK_INT >= 29 && !TextSecurePreferences.isBackupEnabled(context) && BackupUtil.hasBackupFiles(context)) {
if (Build.VERSION.SDK_INT >= 29 && !SignalStore.settings().isBackupEnabled() && BackupUtil.hasBackupFiles(context)) {
Log.w(TAG, "Stranded backup! Notifying.");
BackupFileIOError.UNKNOWN.postNotification(context);
} else {
Log.w(TAG, String.format(Locale.US, "Does not meet criteria. API: %d, BackupsEnabled: %s, HasFiles: %s",
Build.VERSION.SDK_INT,
TextSecurePreferences.isBackupEnabled(context),
SignalStore.settings().isBackupEnabled(),
BackupUtil.hasBackupFiles(context)));
}
}

3
app/src/main/java/org/thoughtcrime/securesms/migrations/UserNotificationMigrationJob.java
View File

@@ -17,6 +17,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.ThreadDatabase;
import org.thoughtcrime.securesms.jobmanager.Data;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.notifications.NotificationChannels;
import org.thoughtcrime.securesms.notifications.NotificationIds;
import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -63,7 +64,7 @@ public class UserNotificationMigrationJob extends MigrationJob {
return;
}
if (!TextSecurePreferences.isNewContactsNotificationEnabled(context)) {
if (!SignalStore.settings().isNotifyWhenContactJoinsSignal()) {
Log.w(TAG, "New contact notifications disabled! Skipping.");
return;
}