diff --git a/qksms/src/main/java/common/util/NotificationManager.kt b/qksms/src/main/java/common/util/NotificationManager.kt index 5e5658e2..14a96d9d 100644 --- a/qksms/src/main/java/common/util/NotificationManager.kt +++ b/qksms/src/main/java/common/util/NotificationManager.kt @@ -49,21 +49,18 @@ class NotificationManager @Inject constructor( ) { companion object { - val DEFAULT_CHANNEL_ID = "channel_1" + const val DEFAULT_CHANNEL_ID = "notifications_default" val VIBRATE_PATTERN = longArrayOf(0, 200, 0, 200) } - private val notificationManager = NotificationManagerCompat.from(context) + private val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager init { @SuppressLint("NewApi") if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager - - val name = "Message notifications" + val name = "Default" val importance = NotificationManager.IMPORTANCE_HIGH val channel = NotificationChannel(DEFAULT_CHANNEL_ID, name, importance).apply { - description = "Message notifications description" enableLights(true) lightColor = Color.WHITE enableVibration(true) @@ -112,7 +109,7 @@ class NotificationManager @Inject constructor( val readPI = PendingIntent.getBroadcast(context, threadId.toInt() + 30000, readIntent, PendingIntent.FLAG_UPDATE_CURRENT) val readAction = NotificationCompat.Action(R.drawable.ic_done_black_24dp, context.getString(R.string.notification_read), readPI) - val notification = NotificationCompat.Builder(context, DEFAULT_CHANNEL_ID) + val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId)) .setColor(colors.theme.blockingFirst()) .setPriority(NotificationManagerCompat.IMPORTANCE_MAX) .setSmallIcon(R.mipmap.ic_launcher) @@ -149,7 +146,7 @@ class NotificationManager @Inject constructor( taskStackBuilder.addNextIntent(contentIntent) val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt() + 40000, PendingIntent.FLAG_UPDATE_CURRENT) - val notification = NotificationCompat.Builder(context, DEFAULT_CHANNEL_ID) + val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId)) .setContentTitle(context.getString(R.string.notification_message_failed_title)) .setContentText(context.getString(R.string.notification_message_failed_text, conversation.getTitle())) .setColor(colors.theme.blockingFirst()) @@ -183,4 +180,72 @@ class NotificationManager @Inject constructor( .build() } + /** + * Creates a notification channel for the given conversation + */ + fun createNotificationChannel(threadId: Long) { + + // Only proceed if the android version supports notification channels + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return + + messageRepo.getConversation(threadId)?.let { conversation -> + val channelId = buildNotificationChannelId(threadId) + val name = conversation.getTitle() + val importance = NotificationManager.IMPORTANCE_HIGH + val channel = NotificationChannel(channelId, name, importance).apply { + enableLights(true) + lightColor = Color.WHITE + enableVibration(true) + vibrationPattern = VIBRATE_PATTERN + } + + notificationManager.createNotificationChannel(channel) + } + } + + /** + * Returns the notification channel for the given conversation, or null if it doesn't exist + */ + private fun getNotificationChannel(threadId: Long): NotificationChannel? { + val channelId = buildNotificationChannelId(threadId) + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + return notificationManager + .notificationChannels + .firstOrNull { channel -> channel.id == channelId } + } + + return null + } + + /** + * Returns the channel id that should be used for a notification based on the threadId + * + * If a notification channel for the conversation exists, use the id for that. Otherwise return + * the default channel id + */ + private fun getChannelIdForNotification(threadId: Long): String { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + val channelId = buildNotificationChannelId(threadId) + + return notificationManager + .notificationChannels + .map { channel -> channel.id } + .firstOrNull { id -> id == channelId } + ?: DEFAULT_CHANNEL_ID + } + + return DEFAULT_CHANNEL_ID + } + + /** + * Formats a notification channel id for a given thread id, whether the channel exists or not + */ + fun buildNotificationChannelId(threadId: Long): String { + return when (threadId) { + 0L -> DEFAULT_CHANNEL_ID + else -> "notifications_$threadId" + } + } + } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/common/Navigator.kt b/qksms/src/main/java/presentation/common/Navigator.kt index 23bc826b..00c6d304 100644 --- a/qksms/src/main/java/presentation/common/Navigator.kt +++ b/qksms/src/main/java/presentation/common/Navigator.kt @@ -48,7 +48,7 @@ import javax.inject.Inject import javax.inject.Singleton @Singleton -class Navigator @Inject constructor(val context: Context) { +class Navigator @Inject constructor(private val context: Context, private val notificationManager: NotificationManager) { private fun startActivity(intent: Intent) { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) @@ -134,9 +134,14 @@ class Navigator @Inject constructor(val context: Context) { } @TargetApi(Build.VERSION_CODES.O) - fun showNotificationSettings() { + fun showNotificationSettings(threadId: Long = 0) { + if (threadId != 0L) { + notificationManager.createNotificationChannel(threadId) + } + + val channelId = notificationManager.buildNotificationChannelId(threadId) val intent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS) - intent.putExtra(Settings.EXTRA_CHANNEL_ID, NotificationManager.DEFAULT_CHANNEL_ID) + intent.putExtra(Settings.EXTRA_CHANNEL_ID, channelId) intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName) startActivity(intent) } diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt index d0a73f36..29f9e6d5 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt @@ -32,6 +32,7 @@ import javax.inject.Inject class ConversationInfoActivity : QkThemedActivity(), ConversationInfoView { override val viewModelClass = ConversationInfoViewModel::class + override val notificationsIntent by lazy { notifications.clicks() } override val archiveIntent by lazy { archive.clicks() } override val deleteIntent by lazy { delete.clicks() } diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoView.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoView.kt index 0725927c..3855cb75 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoView.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoView.kt @@ -23,6 +23,7 @@ import presentation.common.base.QkView interface ConversationInfoView : QkView { + val notificationsIntent: Observable val archiveIntent: Observable val deleteIntent: Observable diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt index 60b696d4..47baf1b7 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt @@ -34,6 +34,7 @@ import interactor.MarkUnarchived import io.reactivex.Observable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom +import presentation.common.Navigator import presentation.common.base.QkViewModel import javax.inject.Inject @@ -44,6 +45,7 @@ class ConversationInfoViewModel(intent: Intent) : QkViewModel @@ -83,6 +85,12 @@ class ConversationInfoViewModel(intent: Intent) : QkViewModel conversation }) + .autoDisposable(view.scope()) + .subscribe { conversation -> navigator.showNotificationSettings(conversation.id) } + // Toggle the archived state of the conversation view.archiveIntent .withLatestFrom(conversation, { _, conversation -> conversation }) diff --git a/qksms/src/main/res/drawable/ic_notifications_black_24dp.xml b/qksms/src/main/res/drawable/ic_notifications_black_24dp.xml new file mode 100644 index 00000000..123ac29f --- /dev/null +++ b/qksms/src/main/res/drawable/ic_notifications_black_24dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/qksms/src/main/res/layout/conversation_info_activity.xml b/qksms/src/main/res/layout/conversation_info_activity.xml index b3bf9339..e0f0fef5 100644 --- a/qksms/src/main/res/layout/conversation_info_activity.xml +++ b/qksms/src/main/res/layout/conversation_info_activity.xml @@ -51,6 +51,13 @@ android:layout_marginBottom="8dp" android:layout_marginTop="8dp" /> + + Your blocked senders will appear here Details + Notifications Archive Unarchive Delete conversation