empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update notification megaphone behavior.

Browse source 
Detect when they've blocked the channel group, and also don't snooze the
megaphone unless they hit 'not now'.
This commit is contained in:
Greyson Parrelli 2021-03-02 10:08:02 -05:00 • committed by GitHub
parent d5afcc4aec
commit 8c90c3ad81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
View file

@ -281,14 +281,14 @@ public final class Megaphones {
.setBody(R.string.NotificationsMegaphone_never_miss_a_message)
.setImage(R.drawable.megaphone_notifications_64)
.setActionButton(R.string.NotificationsMegaphone_turn_on, (megaphone, controller) -> {
controller.onMegaphoneSnooze(Event.NOTIFICATIONS);
if (Build.VERSION.SDK_INT >= 26 && !NotificationChannels.isMessageChannelEnabled(context)) {
Intent intent = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS);
intent.putExtra(Settings.EXTRA_CHANNEL_ID, NotificationChannels.getMessagesChannel(context));
intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.getPackageName());
controller.onMegaphoneNavigationRequested(intent);
} else if (Build.VERSION.SDK_INT >= 26 && !NotificationChannels.areNotificationsEnabled(context)) {
} else if (Build.VERSION.SDK_INT >= 26 &&
(!NotificationChannels.areNotificationsEnabled(context) || !NotificationChannels.isMessagesChannelGroupEnabled(context)))
{
Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.getPackageName());
controller.onMegaphoneNavigationRequested(intent);
@ -328,8 +328,9 @@ public final class Megaphones {
}
private static boolean shouldShowNotificationsMegaphone(@NonNull Context context) {
boolean shouldShow = !TextSecurePreferences.isNotificationsEnabled(context) ||
!NotificationChannels.isMessageChannelEnabled(context) ||
boolean shouldShow = !TextSecurePreferences.isNotificationsEnabled(context) ||
!NotificationChannels.isMessageChannelEnabled(context) ||
!NotificationChannels.isMessagesChannelGroupEnabled(context) ||
!NotificationChannels.areNotificationsEnabled(context);
if (shouldShow) {
Locale locale = DynamicLanguageContextWrapper.getUsersSelectedLocale(context);

21
app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java
View file

@ -382,7 +382,9 @@ public class NotificationChannels {
* lower importance.
*
* This could also return true if the specific channnel is enabled, but notifications *overall*
* are disabled. Check {@link #areNotificationsEnabled(Context)} to be safe.
* are disabled, or the messages category is disabled. Check
* {@link #areNotificationsEnabled(Context)} and {@link #isMessagesChannelGroupEnabled(Context)}
* to be safe.
*/
public static synchronized boolean isMessageChannelEnabled(@NonNull Context context) {
if (!supported()) {
@ -395,6 +397,23 @@ public class NotificationChannels {
return channel != null && channel.getImportance() != NotificationManager.IMPORTANCE_NONE;
}
/**
* Whether or not the notification category for messages is enabled. Note that even if it is,
* a user could have blocked the specific channel, or notifications overall, and it'd still be
* true. See {@link #isMessageChannelEnabled(Context)} and {@link #areNotificationsEnabled(Context)}.
*/
public static synchronized boolean isMessagesChannelGroupEnabled(@NonNull Context context) {
if (Build.VERSION.SDK_INT < 28) {
return true;
}
NotificationManager notificationManager = ServiceUtil.getNotificationManager(context);
NotificationChannelGroup group = notificationManager.getNotificationChannelGroup(CATEGORY_MESSAGES);
return group != null && !group.isBlocked();
}
/**
* Whether or not notifications for the entire app are enabled.
*/