forked from upstream-mirrors/quik
#1098 - Fix notification sound when QK Reply is enabled
This commit is contained in:
@@ -25,7 +25,6 @@ import android.app.PendingIntent
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.graphics.Color
|
import android.graphics.Color
|
||||||
import android.hardware.display.DisplayManager
|
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.support.v4.app.NotificationCompat
|
import android.support.v4.app.NotificationCompat
|
||||||
@@ -33,7 +32,6 @@ import android.support.v4.app.NotificationManagerCompat
|
|||||||
import android.support.v4.app.RemoteInput
|
import android.support.v4.app.RemoteInput
|
||||||
import android.support.v4.app.TaskStackBuilder
|
import android.support.v4.app.TaskStackBuilder
|
||||||
import android.telephony.PhoneNumberUtils
|
import android.telephony.PhoneNumberUtils
|
||||||
import android.view.Display
|
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import common.util.extensions.dpToPx
|
import common.util.extensions.dpToPx
|
||||||
import feature.compose.ComposeActivity
|
import feature.compose.ComposeActivity
|
||||||
@@ -113,7 +111,7 @@ class NotificationManagerImpl @Inject constructor(
|
|||||||
val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId))
|
val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId))
|
||||||
.setCategory(NotificationCompat.CATEGORY_MESSAGE)
|
.setCategory(NotificationCompat.CATEGORY_MESSAGE)
|
||||||
.setColor(colors.themeForConversation(threadId).blockingFirst())
|
.setColor(colors.themeForConversation(threadId).blockingFirst())
|
||||||
.setPriority(NotificationManagerCompat.IMPORTANCE_MAX)
|
.setPriority(NotificationCompat.PRIORITY_MAX)
|
||||||
.setSmallIcon(R.drawable.ic_notification)
|
.setSmallIcon(R.drawable.ic_notification)
|
||||||
.setNumber(messages.size)
|
.setNumber(messages.size)
|
||||||
.setAutoCancel(true)
|
.setAutoCancel(true)
|
||||||
@@ -178,15 +176,7 @@ class NotificationManagerImpl @Inject constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (prefs.qkreply.get()) {
|
if (prefs.qkreply.get()) {
|
||||||
// If the screen is on, disable the sound and vibration so that a heads-up notification
|
notification.priority = NotificationCompat.PRIORITY_MIN
|
||||||
// doesn't appear
|
|
||||||
val displayManager = context.getSystemService(Context.DISPLAY_SERVICE) as DisplayManager
|
|
||||||
if (displayManager.displays.any { display -> display.state != Display.STATE_OFF }) {
|
|
||||||
notification.priority = NotificationManagerCompat.IMPORTANCE_MIN
|
|
||||||
notification.setCategory(null)
|
|
||||||
notification.setSound(null)
|
|
||||||
notification.setVibrate(null)
|
|
||||||
}
|
|
||||||
|
|
||||||
val intent = Intent(context, QkReplyActivity::class.java)
|
val intent = Intent(context, QkReplyActivity::class.java)
|
||||||
.putExtra("threadId", threadId)
|
.putExtra("threadId", threadId)
|
||||||
|
|||||||
Reference in New Issue
Block a user