Show sender profile picture on notification

Signed-off-by: Jens Zalzala <jens@shakingearthdigital.com>

Author: anakin78z

app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt

@@ -30,6 +30,9 @@ import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.Person
+import androidx.core.content.pm.ShortcutInfoCompat
+import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.graphics.drawable.IconCompat
 import androidx.core.app.RemoteInput
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
@@ -76,7 +79,6 @@ import com.nextcloud.talk.utils.NotificationUtils.cancelAllNotificationsForAccou
 import com.nextcloud.talk.utils.NotificationUtils.cancelNotification
 import com.nextcloud.talk.utils.NotificationUtils.findNotificationForRoom
 import com.nextcloud.talk.utils.NotificationUtils.getCallRingtoneUri
-import com.nextcloud.talk.utils.NotificationUtils.loadAvatarSync
 import com.nextcloud.talk.utils.ParticipantPermissions
 import com.nextcloud.talk.utils.PushUtils
 import com.nextcloud.talk.utils.bundle.BundleKeys
@@ -660,6 +662,7 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
                 }
                 addReplyAction(notificationBuilder, systemNotificationId)
                 addMarkAsReadAction(notificationBuilder, systemNotificationId)
+                pushConversationShortcut(notificationBuilder)
             }
         }
 
@@ -766,17 +769,38 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
         val senderName = notificationUser?.name ?: ""
         val conversationTitle = pushMessage.subject.ifEmpty { senderName }
 
+        val avatarBitmap = loadSenderAvatar(notificationUser)
+        if (avatarBitmap != null) {
+            notificationBuilder.setLargeIcon(avatarBitmap)
+        }
+
         val bitmap = loadImageBitmapSync(imagePreviewUrl!!)
         if (bitmap != null) {
-            notificationBuilder
-                .setLargeIcon(bitmap)
-                .setStyle(
-                    NotificationCompat.BigPictureStyle()
-                        .bigPicture(bitmap)
-                        .bigLargeIcon(null as Bitmap?)
-                        .setBigContentTitle(conversationTitle)
-                )
+            notificationBuilder.setStyle(
+                NotificationCompat.BigPictureStyle()
+                    .bigPicture(bitmap)
+                    .bigLargeIcon(avatarBitmap)
+                    .setBigContentTitle(conversationTitle)
+            )
+        }
+    }
+
+    private fun loadSenderAvatar(notificationUser: NotificationUser?): Bitmap? {
+        val userType = notificationUser?.type
+        if (userType != "user" && userType != "guest") return null
+
+        val baseUrl = signatureVerification.user!!.baseUrl
+        val avatarUrl = if ("user" == userType) {
+            ApiUtils.getUrlForAvatar(
+                baseUrl!!,
+                notificationUser.id,
+                false,
+                darkMode = DisplayUtils.isDarkModeOn(context!!)
+            )
+        } else {
+            ApiUtils.getUrlForGuestAvatar(baseUrl!!, notificationUser.name, false)
         }
+        return NotificationUtils.loadAvatarBitmapSync(avatarUrl, context!!)
     }
 
     private fun loadImageBitmapSync(imageUrl: String): Bitmap? {
@@ -824,7 +848,11 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
             } else {
                 ApiUtils.getUrlForGuestAvatar(baseUrl!!, notificationUser.name, false)
             }
-            person.setIcon(loadAvatarSync(avatarUrl, context!!))
+            val avatarBitmap = NotificationUtils.loadAvatarBitmapSync(avatarUrl, context!!)
+            if (avatarBitmap != null) {
+                person.setIcon(IconCompat.createWithBitmap(avatarBitmap))
+                notificationBuilder.setLargeIcon(avatarBitmap)
+            }
         }
         val deviceUser = Person.Builder()
             .setKey(signatureVerification.user!!.id.toString() + "@" + signatureVerification.user!!.userId)
@@ -833,6 +861,38 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
         notificationBuilder.setStyle(getStyle(deviceUser, person.build(), style))
     }
 
+    private fun pushConversationShortcut(notificationBuilder: NotificationCompat.Builder) {
+        val notificationUser = pushMessage.notificationUser ?: return
+        val roomToken = pushMessage.id ?: return
+
+        val shortcutId = "conversation_${signatureVerification.user!!.id}_$roomToken"
+
+        val personBuilder = Person.Builder()
+            .setKey(signatureVerification.user!!.id.toString() + "@" + notificationUser.id)
+            .setName(EmojiCompat.get().process(notificationUser.name!!))
+
+        val avatarBitmap = loadSenderAvatar(notificationUser)
+        if (avatarBitmap != null) {
+            personBuilder.setIcon(IconCompat.createWithBitmap(avatarBitmap))
+        }
+
+        val intent = Intent(context, MainActivity::class.java).apply {
+            action = Intent.ACTION_VIEW
+            putExtra(KEY_ROOM_TOKEN, roomToken)
+            putExtra(KEY_INTERNAL_USER_ID, signatureVerification.user!!.id)
+        }
+
+        val shortcut = ShortcutInfoCompat.Builder(context!!, shortcutId)
+            .setShortLabel(pushMessage.subject.ifEmpty { notificationUser.name ?: "Chat" })
+            .setLongLived(true)
+            .setIntent(intent)
+            .setPerson(personBuilder.build())
+            .build()
+
+        ShortcutManagerCompat.pushDynamicShortcut(context!!, shortcut)
+        notificationBuilder.setShortcutId(shortcutId)
+    }
+
     private fun buildIntentForAction(
         cls: Class<*>,
         systemNotificationId: Int,

app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt

@@ -11,6 +11,7 @@ import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
+import android.graphics.Bitmap
 import android.graphics.drawable.BitmapDrawable
 import android.media.AudioAttributes
 import android.net.Uri
@@ -316,21 +317,24 @@ object NotificationUtils {
         )
 
     fun loadAvatarSync(avatarUrl: String, context: Context): IconCompat? {
-        var avatarIcon: IconCompat? = null
+        val bitmap = loadAvatarBitmapSync(avatarUrl, context)
+        return bitmap?.let { IconCompat.createWithBitmap(it) }
+    }
+
+    fun loadAvatarBitmapSync(avatarUrl: String, context: Context): Bitmap? {
+        var avatarBitmap: Bitmap? = null
 
         val request = ImageRequest.Builder(context)
             .data(avatarUrl)
             .transformations(CircleCropTransformation())
             .placeholder(R.drawable.account_circle_96dp)
             .target(
                 onSuccess = { result ->
-                    val bitmap = (result as BitmapDrawable).bitmap
-                    avatarIcon = IconCompat.createWithBitmap(bitmap)
+                    avatarBitmap = (result as BitmapDrawable).bitmap
                 },
                 onError = { error ->
                     error?.let {
-                        val bitmap = (error as BitmapDrawable).bitmap
-                        avatarIcon = IconCompat.createWithBitmap(bitmap)
+                        avatarBitmap = (error as BitmapDrawable).bitmap
                     }
                     Log.w(TAG, "Can't load avatar for URL: $avatarUrl")
                 }
@@ -339,7 +343,7 @@ object NotificationUtils {
 
         context.imageLoader.executeBlocking(request)
 
-        return avatarIcon
+        return avatarBitmap
     }
 
     private data class Channel(val id: String, val name: String, val description: String, val isImportant: Boolean)