Add support back for Android Auto.

app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt

@@ -164,11 +164,7 @@ sealed class NotificationBuilder(protected val context: Context) {
 
   companion object {
     fun create(context: Context): NotificationBuilder {
-      return if (Build.VERSION.SDK_INT >= 28) {
-        NotificationBuilderOS(context)
-      } else {
-        NotificationBuilderCompat(context)
-      }
+      return NotificationBuilderCompat(context)
     }
   }
 
@@ -182,6 +178,7 @@ sealed class NotificationBuilder(protected val context: Context) {
       val markAsRead: PendingIntent = conversation.getMarkAsReadIntent(context)
       val markAsReadAction: NotificationCompat.Action = NotificationCompat.Action.Builder(R.drawable.check, context.getString(R.string.MessageNotifier_mark_read), markAsRead)
         .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ)
+        .setShowsUserInterface(false)
         .build()
 
       val extender: NotificationCompat.WearableExtender = NotificationCompat.WearableExtender()
@@ -199,6 +196,7 @@ sealed class NotificationBuilder(protected val context: Context) {
           NotificationCompat.Action.Builder(R.drawable.ic_reply_white_36dp, actionName, remoteReply)
             .addRemoteInput(RemoteInput.Builder(DefaultMessageNotifier.EXTRA_REMOTE_REPLY).setLabel(label).build())
             .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY)
+            .setShowsUserInterface(false)
             .build()
         } else {
           NotificationCompat.Action(R.drawable.ic_reply_white_36dp, actionName, quickReply)
@@ -232,21 +230,24 @@ sealed class NotificationBuilder(protected val context: Context) {
     }
 
     override fun addMessagesActual(conversation: NotificationConversation, includeShortcut: Boolean) {
-      val bigPictureUri: Uri? = conversation.getSlideBigPictureUri(context)
-      if (bigPictureUri != null) {
-        builder.setStyle(
-          NotificationCompat.BigPictureStyle()
-            .bigPicture(bigPictureUri.toBitmap(context, BIG_PICTURE_DIMEN))
-            .setSummaryText(conversation.getContentText(context))
-            .bigLargeIcon(null)
-        )
-        return
+      if (Build.VERSION.SDK_INT < 24) {
+        val bigPictureUri: Uri? = conversation.getSlideBigPictureUri(context)
+        if (bigPictureUri != null) {
+          builder.setStyle(
+            NotificationCompat.BigPictureStyle()
+              .bigPicture(bigPictureUri.toBitmap(context, BIG_PICTURE_DIMEN))
+              .setSummaryText(conversation.getContentText(context))
+              .bigLargeIcon(null)
+          )
+          return
+        }
       }
 
       val self: PersonCompat = PersonCompat.Builder()
         .setBot(false)
         .setName(if (includeShortcut) Recipient.self().getDisplayName(context) else context.getString(R.string.SingleRecipientNotificationBuilder_you))
         .setIcon(if (includeShortcut) Recipient.self().getContactDrawable(context).toLargeBitmap(context).toIconCompat() else null)
+        .setKey(ConversationUtil.getShortcutId(Recipient.self().id))
         .build()
 
       val messagingStyle: NotificationCompat.MessagingStyle = NotificationCompat.MessagingStyle(self)
@@ -313,10 +314,33 @@ sealed class NotificationBuilder(protected val context: Context) {
     }
 
     override fun setBubbleMetadataActual(conversation: NotificationConversation, bubbleState: BubbleUtil.BubbleState) {
-      // Intentionally left blank
+      if (Build.VERSION.SDK_INT < ConversationUtil.CONVERSATION_SUPPORT_VERSION) {
+        return
+      }
+
+      val intent = PendingIntent.getActivity(
+        context,
+        0,
+        ConversationIntents.createBubbleIntent(context, conversation.recipient.id, conversation.threadId),
+        0
+      )
+
+      val bubbleMetadata = NotificationCompat.BubbleMetadata.Builder()
+        .setIntent(intent)
+        .setIcon(AvatarUtil.getIconCompatForShortcut(context, conversation.recipient))
+        .setAutoExpandBubble(bubbleState === BubbleUtil.BubbleState.SHOWN)
+        .setDesiredHeight(600)
+        .setSuppressNotification(bubbleState === BubbleUtil.BubbleState.SHOWN)
+        .build()
+
+      builder.bubbleMetadata = bubbleMetadata
     }
 
     override fun setLights(@ColorInt color: Int, onTime: Int, offTime: Int) {
+      if (NotificationChannels.supported()) {
+        return
+      }
+
       builder.setLights(color, onTime, offTime)
     }
 
@@ -492,6 +516,7 @@ sealed class NotificationBuilder(protected val context: Context) {
         .setBot(false)
         .setName(if (includeShortcut) Recipient.self().getDisplayName(context) else context.getString(R.string.SingleRecipientNotificationBuilder_you))
         .setIcon(if (includeShortcut) Recipient.self().getContactDrawable(context).toLargeBitmap(context).toIcon() else null)
+        .setKey(ConversationUtil.getShortcutId(Recipient.self().id))
         .build()
 
       val messagingStyle: Notification.MessagingStyle = Notification.MessagingStyle(self)

app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationConversation.kt

@@ -148,12 +148,13 @@ data class NotificationConversation(
   }
 
   fun getMarkAsReadIntent(context: Context): PendingIntent {
-    val intent = Intent(context, MarkReadReceiver::class.java).setAction(MarkReadReceiver.CLEAR_ACTION)
+    val intent = Intent(context, MarkReadReceiver::class.java)
+      .setAction(MarkReadReceiver.CLEAR_ACTION)
       .putExtra(MarkReadReceiver.THREAD_IDS_EXTRA, longArrayOf(mostRecentNotification.threadId))
       .putExtra(MarkReadReceiver.NOTIFICATION_ID_EXTRA, notificationId)
       .makeUniqueToPreventMerging()
 
-    return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+    return PendingIntent.getBroadcast(context, (threadId * 2).toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
   }
 
   fun getQuickReplyIntent(context: Context): PendingIntent {
@@ -161,7 +162,7 @@ data class NotificationConversation(
       .build()
       .makeUniqueToPreventMerging()
 
-    return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+    return PendingIntent.getActivity(context, (threadId * 2).toInt() + 1, intent, PendingIntent.FLAG_UPDATE_CURRENT)
   }
 
   fun getRemoteReplyIntent(context: Context, replyMethod: ReplyMethod): PendingIntent {
@@ -170,10 +171,9 @@ data class NotificationConversation(
       .putExtra(RemoteReplyReceiver.RECIPIENT_EXTRA, recipient.id)
       .putExtra(RemoteReplyReceiver.REPLY_METHOD, replyMethod)
       .putExtra(RemoteReplyReceiver.EARLIEST_TIMESTAMP, notificationItems.first().timestamp)
-      .setPackage(context.packageName)
       .makeUniqueToPreventMerging()
 
-    return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+    return PendingIntent.getBroadcast(context, (threadId * 2).toInt() + 1, intent, PendingIntent.FLAG_UPDATE_CURRENT)
   }
 
   fun getTurnOffJoinedNotificationsIntent(context: Context): PendingIntent {

app/src/main/res/xml/automotive_app_desc.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <automotiveApp>
-   <uses name="notification"/>
+   <uses name="notification" />
 </automotiveApp>