Replace with new custom notifications page.

This commit is contained in:
Alex Hart
2021-08-04 13:21:26 -03:00
parent 3585667fb9
commit fe9b8a9f47
10 changed files with 371 additions and 768 deletions

View File

@@ -1,272 +0,0 @@
package org.thoughtcrime.securesms.recipients.ui.notifications;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.media.Ringtone;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CompoundButton;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.SwitchCompat;
import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.DialogFragment;
import androidx.lifecycle.ViewModelProviders;
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;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import java.util.Objects;
public class CustomNotificationsDialogFragment extends DialogFragment {
private static final String TAG = Log.tag(CustomNotificationsDialogFragment.class);
private static final short MESSAGE_RINGTONE_PICKER_REQUEST_CODE = 13562;
private static final short CALL_RINGTONE_PICKER_REQUEST_CODE = 23621;
private static final String ARG_RECIPIENT_ID = "recipient_id";
private View customNotificationsRow;
private SwitchCompat customNotificationsSwitch;
private View soundRow;
private View soundLabel;
private TextView soundSelector;
private View messageVibrateRow;
private View messageVibrateLabel;
private TextView messageVibrateSelector;
private SwitchCompat messageVibrateSwitch;
private View callHeading;
private View ringtoneRow;
private TextView ringtoneSelector;
private View callVibrateRow;
private TextView callVibrateSelector;
private CustomNotificationsViewModel viewModel;
public static DialogFragment create(@NonNull RecipientId recipientId) {
DialogFragment fragment = new CustomNotificationsDialogFragment();
Bundle args = new Bundle();
args.putParcelable(ARG_RECIPIENT_ID, recipientId);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setStyle(STYLE_NO_FRAME, R.style.Signal_DayNight_Dialog_Animated);
}
@Override
public @Nullable View onCreateView(@NonNull LayoutInflater inflater,
@Nullable ViewGroup container,
@Nullable Bundle savedInstanceState)
{
return inflater.inflate(R.layout.custom_notifications_dialog_fragment, container, false);
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
initializeViewModel();
initializeViews(view);
}
@Override
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
if (resultCode == Activity.RESULT_OK && data != null) {
Uri uri = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
if (requestCode == MESSAGE_RINGTONE_PICKER_REQUEST_CODE) {
viewModel.setMessageSound(uri);
} else if (requestCode == CALL_RINGTONE_PICKER_REQUEST_CODE) {
viewModel.setCallSound(uri);
}
}
}
private void initializeViewModel() {
Bundle arguments = requireArguments();
RecipientId recipientId = Objects.requireNonNull(arguments.getParcelable(ARG_RECIPIENT_ID));
CustomNotificationsRepository repository = new CustomNotificationsRepository(requireContext(), recipientId);
CustomNotificationsViewModel.Factory factory = new CustomNotificationsViewModel.Factory(recipientId, repository);
viewModel = ViewModelProviders.of(this, factory).get(CustomNotificationsViewModel.class);
}
private void initializeViews(@NonNull View view) {
customNotificationsRow = view.findViewById(R.id.custom_notifications_row);
customNotificationsSwitch = view.findViewById(R.id.custom_notifications_enable_switch);
soundRow = view.findViewById(R.id.custom_notifications_sound_row);
soundLabel = view.findViewById(R.id.custom_notifications_sound_label);
soundSelector = view.findViewById(R.id.custom_notifications_sound_selection);
messageVibrateSwitch = view.findViewById(R.id.custom_notifications_vibrate_switch);
messageVibrateRow = view.findViewById(R.id.custom_notifications_message_vibrate_row);
messageVibrateLabel = view.findViewById(R.id.custom_notifications_message_vibrate_label);
messageVibrateSelector = view.findViewById(R.id.custom_notifications_message_vibrate_selector);
callHeading = view.findViewById(R.id.custom_notifications_call_settings_section_header);
ringtoneRow = view.findViewById(R.id.custom_notifications_ringtone_row);
ringtoneSelector = view.findViewById(R.id.custom_notifications_ringtone_selection);
callVibrateRow = view.findViewById(R.id.custom_notifications_call_vibrate_row);
callVibrateSelector = view.findViewById(R.id.custom_notifications_call_vibrate_selectior);
Toolbar toolbar = view.findViewById(R.id.custom_notifications_toolbar);
toolbar.setNavigationOnClickListener(v -> dismissAllowingStateLoss());
CompoundButton.OnCheckedChangeListener onCustomNotificationsSwitchCheckChangedListener = (buttonView, isChecked) -> {
viewModel.setHasCustomNotifications(isChecked);
};
viewModel.isInitialLoadComplete().observe(getViewLifecycleOwner(), customNotificationsSwitch::setEnabled);
if (NotificationChannels.supported()) {
viewModel.hasCustomNotifications().observe(getViewLifecycleOwner(), hasCustomNotifications -> {
if (customNotificationsSwitch.isChecked() != hasCustomNotifications) {
customNotificationsSwitch.setOnCheckedChangeListener(null);
customNotificationsSwitch.setChecked(hasCustomNotifications);
}
customNotificationsSwitch.setOnCheckedChangeListener(onCustomNotificationsSwitchCheckChangedListener);
customNotificationsRow.setOnClickListener(v -> customNotificationsSwitch.toggle());
soundRow.setEnabled(hasCustomNotifications);
soundLabel.setEnabled(hasCustomNotifications);
messageVibrateRow.setEnabled(hasCustomNotifications);
messageVibrateLabel.setEnabled(hasCustomNotifications);
soundSelector.setVisibility(hasCustomNotifications ? View.VISIBLE : View.GONE);
messageVibrateSwitch.setVisibility(hasCustomNotifications ? View.VISIBLE : View.GONE);
});
messageVibrateSelector.setVisibility(View.GONE);
messageVibrateSwitch.setVisibility(View.VISIBLE);
messageVibrateRow.setOnClickListener(v -> messageVibrateSwitch.toggle());
CompoundButton.OnCheckedChangeListener onVibrateSwitchCheckChangedListener = (buttonView, isChecked) -> viewModel.setMessageVibrate(RecipientDatabase.VibrateState.fromBoolean(isChecked));
viewModel.getMessageVibrateToggle().observe(getViewLifecycleOwner(), vibrateEnabled -> {
if (messageVibrateSwitch.isChecked() != vibrateEnabled) {
messageVibrateSwitch.setOnCheckedChangeListener(null);
messageVibrateSwitch.setChecked(vibrateEnabled);
}
messageVibrateSwitch.setOnCheckedChangeListener(onVibrateSwitchCheckChangedListener);
});
} else {
customNotificationsRow.setVisibility(View.GONE);
messageVibrateSwitch.setVisibility(View.GONE);
messageVibrateSelector.setVisibility(View.VISIBLE);
soundRow.setEnabled(true);
soundLabel.setEnabled(true);
messageVibrateRow.setEnabled(true);
messageVibrateLabel.setEnabled(true);
soundSelector.setVisibility(View.VISIBLE);
viewModel.getMessageVibrateState().observe(getViewLifecycleOwner(), vibrateState -> presentVibrateState(vibrateState, this.messageVibrateRow, this.messageVibrateSelector, (w) -> viewModel.setMessageVibrate(w)));
}
viewModel.getNotificationSound().observe(getViewLifecycleOwner(), sound -> {
soundSelector.setText(getRingtoneSummary(requireContext(), sound, Settings.System.DEFAULT_NOTIFICATION_URI));
soundSelector.setTag(sound);
soundRow.setOnClickListener(v -> launchSoundSelector(sound, false));
});
viewModel.getShowCallingOptions().observe(getViewLifecycleOwner(), showCalling -> {
callHeading.setVisibility(showCalling ? View.VISIBLE : View.GONE);
ringtoneRow.setVisibility(showCalling ? View.VISIBLE : View.GONE);
callVibrateRow.setVisibility(showCalling ? View.VISIBLE : View.GONE);
});
viewModel.getRingtone().observe(getViewLifecycleOwner(), sound -> {
ringtoneSelector.setText(getRingtoneSummary(requireContext(), sound, Settings.System.DEFAULT_RINGTONE_URI));
ringtoneSelector.setTag(sound);
ringtoneRow.setOnClickListener(v -> launchSoundSelector(sound, true));
});
viewModel.getCallingVibrateState().observe(getViewLifecycleOwner(), vibrateState -> presentVibrateState(vibrateState, this.callVibrateRow, this.callVibrateSelector, (w) -> viewModel.setCallingVibrate(w)));
}
private void presentVibrateState(@NonNull RecipientDatabase.VibrateState vibrateState,
@NonNull View vibrateRow,
@NonNull TextView vibrateSelector,
@NonNull Consumer<RecipientDatabase.VibrateState> onSelect)
{
vibrateSelector.setText(getVibrateSummary(requireContext(), vibrateState));
vibrateRow.setOnClickListener(v -> new AlertDialog.Builder(requireContext())
.setTitle(R.string.CustomNotificationsDialogFragment__vibrate)
.setSingleChoiceItems(R.array.recipient_vibrate_entries, vibrateState.ordinal(), ((dialog, which) -> {
onSelect.accept(RecipientDatabase.VibrateState.fromId(which));
dialog.dismiss();
}))
.setNegativeButton(android.R.string.cancel, null)
.show());
}
private @NonNull String getRingtoneSummary(@NonNull Context context, @Nullable Uri ringtone, @Nullable Uri defaultNotificationUri) {
if (ringtone == null || ringtone.equals(defaultNotificationUri)) {
return context.getString(R.string.CustomNotificationsDialogFragment__default);
} else if (ringtone.toString().isEmpty()) {
return context.getString(R.string.preferences__silent);
} else {
Ringtone tone = RingtoneUtil.getRingtone(requireContext(), ringtone);
if (tone != null) {
return tone.getTitle(context);
}
}
return context.getString(R.string.CustomNotificationsDialogFragment__default);
}
private void launchSoundSelector(@Nullable Uri current, boolean calls) {
Intent intent = new Intent(RingtoneManager.ACTION_RINGTONE_PICKER);
if (current == null) current = calls ? Settings.System.DEFAULT_RINGTONE_URI : Settings.System.DEFAULT_NOTIFICATION_URI;
else if (current.toString().isEmpty()) current = null;
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, calls ? RingtoneManager.TYPE_RINGTONE : RingtoneManager.TYPE_NOTIFICATION);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, current);
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI, defaultSound(calls));
startActivityForResult(intent, calls ? CALL_RINGTONE_PICKER_REQUEST_CODE : MESSAGE_RINGTONE_PICKER_REQUEST_CODE);
}
private Uri defaultSound(boolean calls) {
Uri defaultValue;
if (calls) defaultValue = SignalStore.settings().getCallRingtone();
else defaultValue = SignalStore.settings().getMessageNotificationSound();
return defaultValue;
}
private static @NonNull String getVibrateSummary(@NonNull Context context, @NonNull RecipientDatabase.VibrateState vibrateState) {
switch (vibrateState) {
case DEFAULT : return context.getString(R.string.CustomNotificationsDialogFragment__default);
case ENABLED : return context.getString(R.string.CustomNotificationsDialogFragment__enabled);
case DISABLED : return context.getString(R.string.CustomNotificationsDialogFragment__disabled);
default : throw new AssertionError();
}
}
}

View File

@@ -1,116 +0,0 @@
package org.thoughtcrime.securesms.recipients.ui.notifications;
import android.content.Context;
import android.net.Uri;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
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;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
class CustomNotificationsRepository {
private final Context context;
private final RecipientId recipientId;
CustomNotificationsRepository(@NonNull Context context, @NonNull RecipientId recipientId) {
this.context = context;
this.recipientId = recipientId;
}
void onLoad(@NonNull Runnable onLoaded) {
SignalExecutors.SERIAL.execute(() -> {
Recipient recipient = getRecipient();
RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
if (NotificationChannels.supported() && recipient.getNotificationChannel() != null) {
recipientDatabase.setMessageRingtone(recipient.getId(), NotificationChannels.getMessageRingtone(context, recipient));
recipientDatabase.setMessageVibrate(recipient.getId(), RecipientDatabase.VibrateState.fromBoolean(NotificationChannels.getMessageVibrate(context, recipient)));
NotificationChannels.ensureCustomChannelConsistency(context);
}
onLoaded.run();
});
}
void setHasCustomNotifications(final boolean hasCustomNotifications) {
SignalExecutors.SERIAL.execute(() -> {
if (hasCustomNotifications) {
createCustomNotificationChannel();
} else {
deleteCustomNotificationChannel();
}
});
}
void setMessageVibrate(final RecipientDatabase.VibrateState vibrateState) {
SignalExecutors.SERIAL.execute(() -> {
Recipient recipient = getRecipient();
DatabaseFactory.getRecipientDatabase(context).setMessageVibrate(recipient.getId(), vibrateState);
NotificationChannels.updateMessageVibrate(context, recipient, vibrateState);
});
}
void setCallingVibrate(final RecipientDatabase.VibrateState vibrateState) {
SignalExecutors.SERIAL.execute(() -> DatabaseFactory.getRecipientDatabase(context).setCallVibrate(recipientId, vibrateState));
}
void setMessageSound(@Nullable Uri sound) {
SignalExecutors.SERIAL.execute(() -> {
Recipient recipient = getRecipient();
Uri defaultValue = SignalStore.settings().getMessageNotificationSound();
Uri newValue;
if (defaultValue.equals(sound)) newValue = null;
else if (sound == null) newValue = Uri.EMPTY;
else newValue = sound;
DatabaseFactory.getRecipientDatabase(context).setMessageRingtone(recipient.getId(), newValue);
NotificationChannels.updateMessageRingtone(context, recipient, newValue);
});
}
void setCallSound(@Nullable Uri sound) {
SignalExecutors.SERIAL.execute(() -> {
Uri defaultValue = SignalStore.settings().getCallRingtone();
Uri newValue;
if (defaultValue.equals(sound)) newValue = null;
else if (sound == null) newValue = Uri.EMPTY;
else newValue = sound;
DatabaseFactory.getRecipientDatabase(context).setCallRingtone(recipientId, newValue);
});
}
@WorkerThread
private void createCustomNotificationChannel() {
Recipient recipient = getRecipient();
String channelId = NotificationChannels.createChannelFor(context, recipient);
DatabaseFactory.getRecipientDatabase(context).setNotificationChannel(recipient.getId(), channelId);
}
@WorkerThread
private void deleteCustomNotificationChannel() {
Recipient recipient = getRecipient();
DatabaseFactory.getRecipientDatabase(context).setNotificationChannel(recipient.getId(), null);
NotificationChannels.deleteChannelFor(context, recipient);
}
@WorkerThread
private @NonNull Recipient getRecipient() {
return Recipient.resolved(recipientId);
}
}

View File

@@ -1,123 +0,0 @@
package org.thoughtcrime.securesms.recipients.ui.notifications;
import android.net.Uri;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.Transformations;
import androidx.lifecycle.ViewModel;
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;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
public final class CustomNotificationsViewModel extends ViewModel {
private final LiveData<Boolean> hasCustomNotifications;
private final LiveData<RecipientDatabase.VibrateState> messageVibrateState;
private final LiveData<Uri> notificationSound;
private final CustomNotificationsRepository repository;
private final MutableLiveData<Boolean> isInitialLoadComplete = new MutableLiveData<>();
private final LiveData<Boolean> showCallingOptions;
private final LiveData<Uri> ringtone;
private final LiveData<RecipientDatabase.VibrateState> callingVibrateState;
private final LiveData<Boolean> messageVibrateToggle;
private CustomNotificationsViewModel(@NonNull RecipientId recipientId, @NonNull CustomNotificationsRepository repository) {
LiveData<Recipient> recipient = Recipient.live(recipientId).getLiveData();
this.repository = repository;
this.hasCustomNotifications = Transformations.map(recipient, r -> r.getNotificationChannel() != null || !NotificationChannels.supported());
this.callingVibrateState = Transformations.map(recipient, Recipient::getCallVibrate);
this.messageVibrateState = Transformations.map(recipient, Recipient::getMessageVibrate);
this.notificationSound = Transformations.map(recipient, Recipient::getMessageRingtone);
this.showCallingOptions = Transformations.map(recipient, r -> !r.isGroup() && r.isRegistered());
this.ringtone = Transformations.map(recipient, Recipient::getCallRingtone);
this.messageVibrateToggle = Transformations.map(messageVibrateState, vibrateState -> {
switch (vibrateState) {
case DISABLED: return false;
case ENABLED : return true;
case DEFAULT : return SignalStore.settings().isMessageVibrateEnabled();
default : throw new AssertionError();
}
});
repository.onLoad(() -> isInitialLoadComplete.postValue(true));
}
LiveData<Boolean> isInitialLoadComplete() {
return isInitialLoadComplete;
}
LiveData<Boolean> hasCustomNotifications() {
return hasCustomNotifications;
}
LiveData<Uri> getNotificationSound() {
return notificationSound;
}
LiveData<RecipientDatabase.VibrateState> getMessageVibrateState() {
return messageVibrateState;
}
LiveData<Boolean> getMessageVibrateToggle() {
return messageVibrateToggle;
}
void setHasCustomNotifications(boolean hasCustomNotifications) {
repository.setHasCustomNotifications(hasCustomNotifications);
}
void setMessageVibrate(@NonNull RecipientDatabase.VibrateState vibrateState) {
repository.setMessageVibrate(vibrateState);
}
void setMessageSound(@Nullable Uri sound) {
repository.setMessageSound(sound);
}
void setCallSound(@Nullable Uri sound) {
repository.setCallSound(sound);
}
LiveData<Boolean> getShowCallingOptions() {
return showCallingOptions;
}
LiveData<Uri> getRingtone() {
return ringtone;
}
LiveData<RecipientDatabase.VibrateState> getCallingVibrateState() {
return callingVibrateState;
}
void setCallingVibrate(@NonNull RecipientDatabase.VibrateState vibrateState) {
repository.setCallingVibrate(vibrateState);
}
public static final class Factory implements ViewModelProvider.Factory {
private final RecipientId recipientId;
private final CustomNotificationsRepository repository;
public Factory(@NonNull RecipientId recipientId, @NonNull CustomNotificationsRepository repository) {
this.recipientId = recipientId;
this.repository = repository;
}
@Override
public @NonNull <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
//noinspection ConstantConditions
return modelClass.cast(new CustomNotificationsViewModel(recipientId, repository));
}
}
}