From 188440d551e1281cf48b3addbfa328bb1f8b48dc Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 28 Dec 2021 20:54:15 -0800 Subject: Fix crash issue --- .../google/java/org/traccar/manager/ManagerMessagingService.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/google/java/org/traccar/manager/ManagerMessagingService.kt b/app/src/google/java/org/traccar/manager/ManagerMessagingService.kt index 165de63..a298591 100644 --- a/app/src/google/java/org/traccar/manager/ManagerMessagingService.kt +++ b/app/src/google/java/org/traccar/manager/ManagerMessagingService.kt @@ -19,6 +19,7 @@ import android.annotation.SuppressLint import android.app.NotificationManager import android.app.PendingIntent import android.content.Intent +import android.os.Build import androidx.core.app.NotificationCompat import com.google.firebase.messaging.FirebaseMessagingService import com.google.firebase.messaging.RemoteMessage @@ -28,7 +29,12 @@ class ManagerMessagingService : FirebaseMessagingService() { @SuppressLint("UnspecifiedImmutableFlag") override fun onMessageReceived(remoteMessage: RemoteMessage) { super.onMessageReceived(remoteMessage) - val pendingIntent = PendingIntent.getActivity(this, 0, Intent(this, MainActivity::class.java), PendingIntent.FLAG_ONE_SHOT) + val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE + } else { + PendingIntent.FLAG_ONE_SHOT + } + val pendingIntent = PendingIntent.getActivity(this, 0, Intent(this, MainActivity::class.java), flags) val builder = NotificationCompat.Builder(this, getString(R.string.notification_channel_id)) .setSmallIcon(R.drawable.ic_stat_notify) .setContentTitle(getString(R.string.app_name)) -- cgit v1.2.3