Skip to content

feat: Add support for conversation shortcuts on Android 11+ #1741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat: Add support for conversation shortcuts on Android 11+ #1741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 56 additions & 1 deletion app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,18 @@ import android.app.PendingIntent
import android.content.ContentResolver
import android.content.Context
import android.content.Intent
import android.content.pm.ShortcutInfo
import android.graphics.Color
import android.media.AudioAttributes
import android.media.RingtoneManager
import android.os.Build
import androidx.annotation.RequiresApi
import androidx.core.app.NotificationCompat
import androidx.core.app.Person
import androidx.core.content.LocusIdCompat
import androidx.core.content.pm.ShortcutInfoCompat
import androidx.core.content.pm.ShortcutManagerCompat
import androidx.core.graphics.drawable.IconCompat
import androidx.core.net.toUri
import com.geeksville.mesh.MainActivity
import com.geeksville.mesh.R
Expand Down Expand Up @@ -314,11 +319,15 @@ class MeshServiceNotifications(
)
}

fun updateMessageNotification(contactKey: String, name: String, message: String) =
fun updateMessageNotification(contactKey: String, name: String, message: String) {
notificationManager.notify(
contactKey.hashCode(), // show unique notifications,
createMessageNotification(contactKey, name, message)
)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
updateConversationShortcuts(contactKey, name)
}
}

fun showAlertNotification(contactKey: String, name: String, alert: String) {
notificationManager.notify(
Expand Down Expand Up @@ -426,6 +435,45 @@ class MeshServiceNotifications(
return serviceNotificationBuilder.build()
}

@RequiresApi(Build.VERSION_CODES.Q)
private fun updateConversationShortcuts(
contactKey: String,
name: String,
) {
val shortcutInfo = createShortcutInfo(context, contactKey, name)
ShortcutManagerCompat.pushDynamicShortcut(context, shortcutInfo)
}

@RequiresApi(Build.VERSION_CODES.Q)
private fun createShortcutInfo(
context: Context,
contactKey: String,
name: String,
): ShortcutInfoCompat {
val shortcutIntent = Intent(context, MainActivity::class.java).apply {
action = OPEN_MESSAGE_ACTION
putExtra(OPEN_MESSAGE_EXTRA_CONTACT_KEY, contactKey)
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
}
val shortcutId = "conv_$contactKey"
return ShortcutInfoCompat.Builder(context, "conv_$contactKey")
.setShortLabel(name)
.setLongLabel("Chat with $name")
.setIcon(
IconCompat.createWithResource(
context,
R.drawable.app_icon
)
) // Replace with contact icon if available
.setIntent(shortcutIntent)
.setCategories(setOf(ShortcutInfo.SHORTCUT_CATEGORY_CONVERSATION))
.setPerson(Person.Builder().setName(name).build())
.setLongLived(true)
.setLocusId(LocusIdCompat(shortcutId))
.build()
}

// Modify updateMessageNotification to create the shortcut
lateinit var messageNotificationBuilder: NotificationCompat.Builder
private fun createMessageNotification(
contactKey: String,
Expand All @@ -435,12 +483,19 @@ class MeshServiceNotifications(
if (!::messageNotificationBuilder.isInitialized) {
messageNotificationBuilder = commonBuilder(messageChannelId)
}
val shortcutId = "conv_$contactKey"
val person = Person.Builder().setName(name).build()
with(messageNotificationBuilder) {
setContentIntent(openMessageIntent(contactKey))
priority = NotificationCompat.PRIORITY_DEFAULT
setCategory(Notification.CATEGORY_MESSAGE)
setAutoCancel(true)
setShortcutId(shortcutId)
setLocusId(LocusIdCompat(shortcutId))
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
val shortcutInfo = createShortcutInfo(context, contactKey, name)
setShortcutInfo(shortcutInfo)
}
setStyle(
NotificationCompat.MessagingStyle(person)
.addMessage(message, System.currentTimeMillis(), person)
Expand Down
7 changes: 6 additions & 1 deletion app/src/main/java/com/geeksville/mesh/ui/message/Message.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package com.geeksville.mesh.ui.message

import android.content.LocusId
import android.os.Build
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
Expand Down Expand Up @@ -137,7 +139,10 @@ class MessagesFragment : Fragment(), Logging {
): View {
val contactKey = arguments?.getString("contactKey").toString()
val message = arguments?.getString("message").toString()

val shortcutId = "conv_$contactKey"
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
requireActivity().setLocusContext(LocusId(shortcutId), null)
}
return ComposeView(requireContext()).apply {
setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
setContent {
Expand Down