From 6b3c1abc03ea6b5527f47ec8ab556604583c77f2 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 16 Apr 2018 13:52:08 -0400 Subject: [PATCH] #1054 - Fix crash when QK Reply is enabled --- .../java/common/util/NotificationManagerImpl.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/presentation/src/main/java/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/common/util/NotificationManagerImpl.kt index 86ef4bb0..ef945154 100644 --- a/presentation/src/main/java/common/util/NotificationManagerImpl.kt +++ b/presentation/src/main/java/common/util/NotificationManagerImpl.kt @@ -25,15 +25,15 @@ import android.app.PendingIntent import android.content.Context import android.content.Intent import android.graphics.Color +import android.hardware.display.DisplayManager import android.net.Uri import android.os.Build -import android.os.Parcel import android.support.v4.app.NotificationCompat import android.support.v4.app.NotificationManagerCompat import android.support.v4.app.RemoteInput import android.support.v4.app.TaskStackBuilder import android.telephony.PhoneNumberUtils -import android.widget.RemoteViews +import android.view.Display import com.moez.QKSMS.R import common.util.extensions.dpToPx import feature.compose.ComposeActivity @@ -159,8 +159,15 @@ class NotificationManagerImpl @Inject constructor( } if (prefs.qkreply.get()) { - // Needed in order to disable the heads up notification - notification.setCustomHeadsUpContentView(RemoteViews(Parcel.obtain())) + // If the screen is on, disable the sound and vibration so that a heads-up notification + // 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) .putExtra("threadId", threadId)