Deprecate notification comment input. Disable on API 29+ because of h…

…ttps://issuetracker.google.com/issues/159152393. Closes #1190
ACRA · Apr 23, 2023 · 74803a0 · 74803a0
1 parent b562bd2
commit 74803a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/acra-notification/src/main/java/org/acra/config/NotificationConfiguration.kt b/acra-notification/src/main/java/org/acra/config/NotificationConfiguration.kt
@@ -137,29 +137,32 @@ class NotificationConfiguration(
 
     /**
      * in-line comment button text.
-     * No effect on pre-nougat devices.
+     * Only available on API 24 - 28.
      *
      * @see androidx.core.app.NotificationCompat.Builder.addAction
      * @since 5.0.0
+     * @deprecated not available on API 29+
      */
     val sendWithCommentButtonText: String? = null,
 
     /**
      * in-line comment button icon.
-     * No effect on pre-nougat devices.
+     * Only available on API 24 - 28.
      *
      * @see androidx.core.app.NotificationCompat.Builder.addAction
      * @since 5.0.0
+     * @deprecated not available on API 29+
      */
     @DrawableRes
     val resSendWithCommentButtonIcon: Int = android.R.drawable.ic_menu_send,
 
     /**
      * in-line comment prompt label.
-     * No effect on pre-nougat devices.
+     * Only available on API 24 - 28.
      *
      * @see androidx.core.app.RemoteInput.Builder.setLabel
      * @since 5.0.0
+     * @deprecated not available on API 29+
      */
     val commentPrompt: String? = null,
 

diff --git a/acra-notification/src/main/java/org/acra/interaction/NotificationInteraction.kt b/acra-notification/src/main/java/org/acra/interaction/NotificationInteraction.kt
@@ -74,7 +74,7 @@ class NotificationInteraction : HasConfigPlugin(NotificationConfiguration::class
         notificationConfig.color?.let { notification.color = it }
         val sendIntent = getSendIntent(context, config, reportFile)
         val discardIntent = getDiscardIntent(context)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && notificationConfig.sendWithCommentButtonText?.isNotEmpty() == true) {
+        if (Build.VERSION.SDK_INT in Build.VERSION_CODES.N..Build.VERSION_CODES.P && notificationConfig.sendWithCommentButtonText?.isNotEmpty() == true) {
             val remoteInput = RemoteInput.Builder(KEY_COMMENT)
             notificationConfig.commentPrompt?.takeIf { it.isNotBlank() }?.let { remoteInput.setLabel(it) }
             notification.addAction(