Fix pending intent

app/src/main/java/com/kunzisoft/keepass/activities/AutofillLauncherActivity.kt

@@ -23,7 +23,6 @@ import android.app.Activity
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.content.IntentSender
 import android.os.Build
 import android.view.inputmethod.InlineSuggestionsRequest
 import android.widget.Toast
@@ -210,31 +209,39 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
                                          searchInfo: SearchInfo? = null,
                                          inlineSuggestionsRequest: InlineSuggestionsRequest? = null): PendingIntent {
             return PendingIntent.getActivity(context, 0,
-                    // Doesn't work with Parcelable (don't know why?)
-                    Intent(context, AutofillLauncherActivity::class.java).apply {
-                        searchInfo?.let {
-                            putExtra(KEY_SEARCH_APPLICATION_ID, it.applicationId)
-                            putExtra(KEY_SEARCH_DOMAIN, it.webDomain)
-                            putExtra(KEY_SEARCH_SCHEME, it.webScheme)
-                            putExtra(KEY_MANUAL_SELECTION, it.manualSelection)
+                // Doesn't work with Parcelable (don't know why?)
+                Intent(context, AutofillLauncherActivity::class.java).apply {
+                    searchInfo?.let {
+                        putExtra(KEY_SEARCH_APPLICATION_ID, it.applicationId)
+                        putExtra(KEY_SEARCH_DOMAIN, it.webDomain)
+                        putExtra(KEY_SEARCH_SCHEME, it.webScheme)
+                        putExtra(KEY_MANUAL_SELECTION, it.manualSelection)
+                    }
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                        inlineSuggestionsRequest?.let {
+                            putExtra(EXTRA_INLINE_SUGGESTIONS_REQUEST, it)
                         }
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                            inlineSuggestionsRequest?.let {
-                                putExtra(EXTRA_INLINE_SUGGESTIONS_REQUEST, it)
-                            }
-                        }
-                    },
-                    PendingIntent.FLAG_CANCEL_CURRENT)
+                    }
+                },
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
+                } else {
+                    PendingIntent.FLAG_CANCEL_CURRENT
+                })
         }
 
         fun getPendingIntentForRegistration(context: Context,
                                             registerInfo: RegisterInfo): PendingIntent {
             return PendingIntent.getActivity(context, 0,
-                    Intent(context, AutofillLauncherActivity::class.java).apply {
-                        EntrySelectionHelper.addSpecialModeInIntent(this, SpecialMode.REGISTRATION)
-                        putExtra(KEY_REGISTER_INFO, registerInfo)
-                    },
-                    PendingIntent.FLAG_CANCEL_CURRENT)
+                Intent(context, AutofillLauncherActivity::class.java).apply {
+                    EntrySelectionHelper.addSpecialModeInIntent(this, SpecialMode.REGISTRATION)
+                    putExtra(KEY_REGISTER_INFO, registerInfo)
+                },
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
+                } else {
+                    PendingIntent.FLAG_CANCEL_CURRENT
+                })
         }
 
         fun launchForRegistration(context: Context,

app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt

@@ -25,7 +25,6 @@ import android.app.PendingIntent
 import android.app.assist.AssistStructure
 import android.content.Context
 import android.content.Intent
-import android.content.IntentSender
 import android.graphics.BlendMode
 import android.graphics.drawable.Icon
 import android.os.Build
@@ -253,9 +252,13 @@ object AutofillHelper {
 
             // Build the content for IME UI
             val pendingIntent = PendingIntent.getActivity(context,
-                    0,
-                    Intent(context, AutofillSettingsActivity::class.java),
-                    0)
+                0,
+                Intent(context, AutofillSettingsActivity::class.java),
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    PendingIntent.FLAG_IMMUTABLE
+                } else {
+                    0
+                })
             return InlinePresentation(
                     InlineSuggestionUi.newContentBuilder(pendingIntent).apply {
                         setContentDescription(context.getString(R.string.autofill_sign_in_prompt))

app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt

@@ -262,9 +262,13 @@ class KeeAutofillService : AutofillService() {
                                 inlinePresentation = InlinePresentation(
                                         InlineSuggestionUi.newContentBuilder(
                                                 PendingIntent.getActivity(this,
-                                                        0,
-                                                        Intent(this, AutofillSettingsActivity::class.java),
-                                                        0)
+                                                    0,
+                                                    Intent(this, AutofillSettingsActivity::class.java),
+                                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                                                        PendingIntent.FLAG_IMMUTABLE
+                                                    } else {
+                                                        0
+                                                    })
                                         ).apply {
                                             setContentDescription(getString(R.string.autofill_sign_in_prompt))
                                             setTitle(getString(R.string.autofill_sign_in_prompt))

app/src/main/java/com/kunzisoft/keepass/services/AdvancedUnlockNotificationService.kt

@@ -5,6 +5,7 @@ import android.app.PendingIntent
 import android.content.*
 import android.net.Uri
 import android.os.Binder
+import android.os.Build
 import android.os.IBinder
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.app.database.CipherDatabaseEntity
@@ -58,7 +59,13 @@ class AdvancedUnlockNotificationService : NotificationService() {
         super.onBind(intent)
 
         val pendingDeleteIntent = PendingIntent.getBroadcast(this,
-                4577, Intent(REMOVE_ADVANCED_UNLOCK_KEY_ACTION), 0)
+            4577,
+            Intent(REMOVE_ADVANCED_UNLOCK_KEY_ACTION),
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                PendingIntent.FLAG_IMMUTABLE
+            } else {
+                0
+            })
         val biometricUnlockEnabled = PreferencesUtil.isBiometricUnlockEnable(this)
         val notificationBuilder = buildNewNotification().apply {
             setSmallIcon(if (biometricUnlockEnabled) {

app/src/main/java/com/kunzisoft/keepass/services/AttachmentFileNotificationService.kt

@@ -24,6 +24,7 @@ import android.content.ContentResolver
 import android.content.Intent
 import android.net.Uri
 import android.os.Binder
+import android.os.Build
 import android.os.IBinder
 import android.util.Log
 import com.kunzisoft.keepass.R
@@ -188,20 +189,30 @@ class AttachmentFileNotificationService: LockNotificationService() {
     private fun newNotification(attachmentNotification: AttachmentNotification) {
 
         val pendingContentIntent = PendingIntent.getActivity(this,
-                0,
-                Intent().apply {
-                    action = Intent.ACTION_VIEW
-                    setDataAndType(attachmentNotification.uri,
-                            contentResolver.getType(attachmentNotification.uri))
-                    addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                }, PendingIntent.FLAG_CANCEL_CURRENT)
+            0,
+            Intent().apply {
+                action = Intent.ACTION_VIEW
+                setDataAndType(attachmentNotification.uri,
+                        contentResolver.getType(attachmentNotification.uri))
+                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            }, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
+            } else {
+                PendingIntent.FLAG_CANCEL_CURRENT
+            }
+        )
 
         val pendingDeleteIntent =  PendingIntent.getService(this,
                 0,
                 Intent(this, AttachmentFileNotificationService::class.java).apply {
                     // No action to delete the service
                     putExtra(FILE_URI_KEY, attachmentNotification.uri)
-                }, PendingIntent.FLAG_CANCEL_CURRENT)
+                }, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
+            } else {
+                PendingIntent.FLAG_CANCEL_CURRENT
+            }
+        )
 
         val fileName = UriUtil.getFileData(this, attachmentNotification.uri)?.name
                 ?: attachmentNotification.uri.path

app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt

@@ -416,7 +416,13 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
                     )
                     val pendingDeleteIntent = PendingIntent.getBroadcast(
                         this,
-                        4576, Intent(LOCK_ACTION), 0
+                        4576,
+                        Intent(LOCK_ACTION),
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                            PendingIntent.FLAG_IMMUTABLE
+                        } else {
+                            0
+                        }
                     )
                     // Add actions in notifications
                     notificationBuilder.apply {
@@ -428,7 +434,8 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
                             R.drawable.ic_lock_database_white_32dp, getString(R.string.lock),
                             pendingDeleteIntent
                         )
-                        setStyle(NotificationCompat.MediaStyle()
+                        setStyle(
+                            NotificationCompat.MediaStyle()
                             .setShowActionsInCompactView(0)
                         )
                     }

app/src/main/java/com/kunzisoft/keepass/timeout/TimeoutHelper.kt

@@ -43,9 +43,14 @@ object TimeoutHelper {
 
     private fun getLockPendingIntent(context: Context): PendingIntent {
         return PendingIntent.getBroadcast(context.applicationContext,
-                REQUEST_ID,
-                Intent(LOCK_ACTION),
-                PendingIntent.FLAG_CANCEL_CURRENT)
+            REQUEST_ID,
+            Intent(LOCK_ACTION),
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
+            } else {
+                PendingIntent.FLAG_CANCEL_CURRENT
+            }
+        )
     }
 
     /**

app/src/main/java/com/kunzisoft/keepass/utils/BroadcastAction.kt

@@ -60,11 +60,16 @@ class LockReceiver(var lockAction: () -> Unit) : BroadcastReceiver() {
                     Intent.ACTION_SCREEN_OFF -> {
                         if (PreferencesUtil.isLockDatabaseWhenScreenShutOffEnable(context)) {
                             mLockPendingIntent = PendingIntent.getBroadcast(context,
-                                    4575,
-                                    Intent(intent).apply {
-                                        action = LOCK_ACTION
-                                    },
-                                    0)
+                                4575,
+                                Intent(intent).apply {
+                                    action = LOCK_ACTION
+                                },
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                                    PendingIntent.FLAG_IMMUTABLE
+                                } else {
+                                    0
+                                }
+                            )
                             // Launch the effective action after a small time
                             val first: Long = System.currentTimeMillis() + context.getString(R.string.timeout_screen_off).toLong()
                             val alarmManager = context.getSystemService(ALARM_SERVICE) as AlarmManager?