Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +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/recipients/ui/notifications/CustomNotificationsDialogFragment.java
View File

@@ -27,6 +27,7 @@ import com.annimon.stream.function.Consumer;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.database.RecipientDatabase;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.notifications.NotificationChannels;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.util.RingtoneUtil;
@@ -255,8 +256,8 @@ public class CustomNotificationsDialogFragment extends DialogFragment {
private Uri defaultSound(boolean calls) {
Uri defaultValue;
if (calls) defaultValue = TextSecurePreferences.getCallNotificationRingtone(requireContext());
else defaultValue = TextSecurePreferences.getNotificationRingtone(requireContext());
if (calls) defaultValue = SignalStore.settings().getCallRingtone();
else defaultValue = SignalStore.settings().getMessageNotificationSound();
return defaultValue;
}

5
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/notifications/CustomNotificationsRepository.java
View File

@@ -10,6 +10,7 @@ import androidx.annotation.WorkerThread;
import org.signal.core.util.concurrent.SignalExecutors;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.RecipientDatabase;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.notifications.NotificationChannels;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -67,7 +68,7 @@ class CustomNotificationsRepository {
void setMessageSound(@Nullable Uri sound) {
SignalExecutors.SERIAL.execute(() -> {
Recipient recipient = getRecipient();
Uri defaultValue = TextSecurePreferences.getNotificationRingtone(context);
Uri defaultValue = SignalStore.settings().getMessageNotificationSound();
Uri newValue;
if (defaultValue.equals(sound)) newValue = null;
@@ -81,7 +82,7 @@ class CustomNotificationsRepository {
void setCallSound(@Nullable Uri sound) {
SignalExecutors.SERIAL.execute(() -> {
Uri defaultValue = TextSecurePreferences.getCallNotificationRingtone(context);
Uri defaultValue = SignalStore.settings().getCallRingtone();
Uri newValue;
if (defaultValue.equals(sound)) newValue = null;

3
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/notifications/CustomNotificationsViewModel.java
View File

@@ -12,6 +12,7 @@ import androidx.lifecycle.ViewModelProvider;
import org.thoughtcrime.securesms.database.RecipientDatabase;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.notifications.NotificationChannels;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -43,7 +44,7 @@ public final class CustomNotificationsViewModel extends ViewModel {
switch (vibrateState) {
case DISABLED: return false;
case ENABLED : return true;
case DEFAULT : return TextSecurePreferences.isNotificationVibrateEnabled(ApplicationDependencies.getApplication());
case DEFAULT : return SignalStore.settings().isMessageVibrateEnabled();
default : throw new AssertionError();
}
});