Add some polish to backups changes.

This commit is contained in:
Alex Hart
2020-10-22 12:07:01 -03:00
committed by Cody Henthorne
parent 9c97cd8816
commit e93d7518f3
8 changed files with 83 additions and 28 deletions

View File

@@ -11,7 +11,8 @@ public final class SettingsValues extends SignalStoreValues {
public static final String LINK_PREVIEWS = "settings.link_previews";
public static final String KEEP_MESSAGES_DURATION = "settings.keep_messages_duration";
private static final String SIGNAL_BACKUP_DIRECTORY = "settings.signal.backup.directory";
private static final String SIGNAL_BACKUP_DIRECTORY = "settings.signal.backup.directory";
private static final String SIGNAL_LATEST_BACKUP_DIRECTORY = "settings.signal.backup.directory,latest";
public static final String THREAD_TRIM_LENGTH = "pref_trim_length";
public static final String THREAD_TRIM_ENABLED = "pref_trim_threads";
@@ -61,11 +62,23 @@ public final class SettingsValues extends SignalStoreValues {
public void setSignalBackupDirectory(@NonNull Uri uri) {
putString(SIGNAL_BACKUP_DIRECTORY, uri.toString());
putString(SIGNAL_LATEST_BACKUP_DIRECTORY, uri.toString());
}
public @Nullable
Uri getSignalBackupDirectory() {
String uri = getString(SIGNAL_BACKUP_DIRECTORY, "");
public @Nullable Uri getSignalBackupDirectory() {
return getUri(SIGNAL_BACKUP_DIRECTORY);
}
public @Nullable Uri getLatestSignalBackupDirectory() {
return getUri(SIGNAL_LATEST_BACKUP_DIRECTORY);
}
public void clearSignalBackupDirectory() {
putString(SIGNAL_BACKUP_DIRECTORY, null);
}
private @Nullable Uri getUri(@NonNull String key) {
String uri = getString(key, "");
if (TextUtils.isEmpty(uri)) {
return null;
@@ -73,8 +86,4 @@ public final class SettingsValues extends SignalStoreValues {
return Uri.parse(uri);
}
}
public void clearSignalBackupDirectory() {
putString(SIGNAL_BACKUP_DIRECTORY, null);
}
}