Skip to content

Commit bf2f488

Browse files
committed
add the PendingIntent.FLAG_IMMUTABLE flag to PendingIntents
1 parent 15d6b7f commit bf2f488

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ import android.app.Notification
55
import android.app.NotificationChannel
66
import android.app.NotificationManager
77
import android.app.PendingIntent
8-
import android.content.*
8+
import android.content.ContentResolver
9+
import android.content.ContentValues
10+
import android.content.Context
11+
import android.content.Intent
912
import android.database.Cursor
1013
import android.graphics.Bitmap
1114
import android.graphics.BitmapFactory
@@ -40,8 +43,6 @@ import com.simplemobiletools.smsmessenger.receivers.DirectReplyReceiver
4043
import com.simplemobiletools.smsmessenger.receivers.MarkAsReadReceiver
4144
import me.leolin.shortcutbadger.ShortcutBadger
4245
import java.io.FileNotFoundException
43-
import java.util.*
44-
import kotlin.collections.ArrayList
4546

4647
val Context.config: Config get() = Config.newInstance(applicationContext)
4748

@@ -745,14 +746,15 @@ fun Context.showMessageNotification(address: String, body: String, threadId: Lon
745746
putExtra(THREAD_ID, threadId)
746747
}
747748

748-
val pendingIntent = PendingIntent.getActivity(this, threadId.hashCode(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
749+
val pendingIntent = PendingIntent.getActivity(this, threadId.hashCode(), intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
749750
val summaryText = getString(R.string.new_message)
750751
val markAsReadIntent = Intent(this, MarkAsReadReceiver::class.java).apply {
751752
action = MARK_AS_READ
752753
putExtra(THREAD_ID, threadId)
753754
}
754755

755-
val markAsReadPendingIntent = PendingIntent.getBroadcast(this, threadId.hashCode(), markAsReadIntent, PendingIntent.FLAG_UPDATE_CURRENT)
756+
val markAsReadPendingIntent =
757+
PendingIntent.getBroadcast(this, threadId.hashCode(), markAsReadIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
756758
var replyAction: NotificationCompat.Action? = null
757759

758760
if (isNougatPlus()) {
@@ -766,7 +768,8 @@ fun Context.showMessageNotification(address: String, body: String, threadId: Lon
766768
putExtra(THREAD_NUMBER, address)
767769
}
768770

769-
val replyPendingIntent = PendingIntent.getBroadcast(applicationContext, threadId.hashCode(), replyIntent, PendingIntent.FLAG_UPDATE_CURRENT)
771+
val replyPendingIntent =
772+
PendingIntent.getBroadcast(applicationContext, threadId.hashCode(), replyIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
770773
replyAction = NotificationCompat.Action.Builder(R.drawable.ic_send_vector, replyLabel, replyPendingIntent)
771774
.addRemoteInput(remoteInput)
772775
.build()

app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/SmsStatusSentReceiver.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class SmsStatusSentReceiver : SentReceiver() {
8787
putExtra(THREAD_ID, threadId)
8888
}
8989

90-
val pendingIntent = PendingIntent.getActivity(context, threadId.hashCode(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
90+
val pendingIntent = PendingIntent.getActivity(context, threadId.hashCode(), intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
9191
val summaryText = String.format(context.getString(R.string.message_sending_error), recipientName)
9292

9393
val largeIcon = SimpleContactsHelper(context).getContactLetterIcon(recipientName)

0 commit comments

Comments
 (0)