awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

silence notification channels if needed

Browse Source
This commit is contained in:
cyBerta
2019-05-28 15:40:27 +02:00
parent 9c3aca2fb0
commit 7f6823a650
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java
+15 -9
View File
@@ -32,8 +32,8 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui
protected Context context;
protected NotificationPrivacyPreference privacy;
AbstractNotificationBuilder(Context context, NotificationPrivacyPreference privacy) {
super(context, createMsgNotificationChannel(context));
AbstractNotificationBuilder(Context context, NotificationPrivacyPreference privacy, boolean signal) {
super(context, createMsgNotificationChannel(context, signal));
this.context = context;
this.privacy = privacy;
@@ -109,7 +109,7 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui
// - the idea is that sound, led, vibrate is edited by the user
// via the ACTION_CHANNEL_NOTIFICATION_SETTINGS intent that takes the channelId
static String createMsgNotificationChannel(Context context) {
private static String createMsgNotificationChannel(Context context, boolean signal) {
String chBase = "ch_msg2_";
String chId = chBase + "unsupported";
@@ -128,6 +128,7 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui
md.update(ledColor.getBytes());
md.update(defaultVibrate ? (byte) 1 : (byte) 0);
md.update(ringtone.toString().getBytes());
md.update(signal ? (byte) 1 : (byte) 0);
hash = String.format("%X", new BigInteger(1, md.digest())).substring(0, 16);
// get channel name
@@ -173,13 +174,18 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui
channel.enableLights(false);
}
channel.enableVibration(defaultVibrate);
if (signal) {
channel.enableVibration(defaultVibrate);
if (!TextUtils.isEmpty(ringtone.toString())) {
channel.setSound(ringtone,
new AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN)
.setUsage(AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_INSTANT)
.build());
if (!TextUtils.isEmpty(ringtone.toString())) {
channel.setSound(ringtone,
new AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN)
.setUsage(AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_INSTANT)
.build());
}
} else {
channel.setSound(null, null);
channel.enableVibration(false);
}
notificationManager.createNotificationChannel(channel);
src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
+3 -3
View File
@@ -209,7 +209,7 @@ class MessageNotifier implements IMessageNotifier {
void sendNotifications(int chatId, int messageId, boolean signal) {
ApplicationDcContext dcContext = DcHelper.getContext(appContext);
if (signal = isSignalAllowed(signal)) {
lastAudibleNotification = System.currentTimeMillis();;
lastAudibleNotification = System.currentTimeMillis();
}
addMessageToNotificationState(dcContext, chatId, messageId);
@@ -245,7 +245,7 @@ class MessageNotifier implements IMessageNotifier {
return;
}
SingleRecipientNotificationBuilder builder = new SingleRecipientNotificationBuilder(context, Prefs.getNotificationPrivacy(context));
SingleRecipientNotificationBuilder builder = new SingleRecipientNotificationBuilder(context, Prefs.getNotificationPrivacy(context), signal);
List<NotificationItem> notifications = notificationState.getNotifications();
NotificationItem firstItem = notifications.get(0);
Recipient recipient = firstItem.getRecipient();
@@ -291,7 +291,7 @@ class MessageNotifier implements IMessageNotifier {
@NonNull NotificationState notificationState,
boolean signal)
{
MultipleRecipientNotificationBuilder builder = new MultipleRecipientNotificationBuilder(context, Prefs.getNotificationPrivacy(context));
MultipleRecipientNotificationBuilder builder = new MultipleRecipientNotificationBuilder(context, Prefs.getNotificationPrivacy(context), signal);
List<NotificationItem> notifications = notificationState.getNotifications();
NotificationItem firstItem = notifications.get(0);
src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
+2 -5
View File
@@ -39,14 +39,11 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
}
}
MultipleRecipientNotificationBuilder(Context context, NotificationPrivacyPreference privacy) {
super(context, privacy);
MultipleRecipientNotificationBuilder(Context context, NotificationPrivacyPreference privacy, boolean signal) {
super(context, privacy, signal);
setColor(context.getResources().getColor(R.color.delta_primary));
setSmallIcon(R.drawable.icon_notification);
if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.O) {
setChannelId(createMsgNotificationChannel(context));
}
setContentTitle(context.getString(R.string.app_name));
setContentIntent(PendingIntent.getActivity(context, 0, new Intent(context, ConversationListActivity.class), 0));
setCategory(NotificationCompat.CATEGORY_MESSAGE);
src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
+2 -5
View File
@@ -46,14 +46,11 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
private CharSequence contentTitle;
private CharSequence contentText;
SingleRecipientNotificationBuilder(@NonNull Context context, @NonNull NotificationPrivacyPreference privacy)
SingleRecipientNotificationBuilder(@NonNull Context context, @NonNull NotificationPrivacyPreference privacy, boolean signal)
{
super(context, privacy);
super(context, privacy, signal);
setSmallIcon(R.drawable.icon_notification);
if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.O) {
setChannelId(createMsgNotificationChannel(context));
}
setColor(context.getResources().getColor(R.color.delta_primary));
setPriority(Prefs.getNotificationPriority(context));
setCategory(NotificationCompat.CATEGORY_MESSAGE);