Skip to content
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

Support showing all frames of animated gif image in Android 14+ #4284

Merged
merged 4 commits into from
Mar 23, 2024
Merged

Support showing all frames of animated gif image in Android 14+ #4284

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a6bfcd
Support showing all frames of animated gif when sent as image in Andr…
NickM-27 Mar 20, 2024
d53efe0
Use unique image names and delete existing files that are no longer n…
NickM-27 Mar 21, 2024
a549ad5
Fix lint
NickM-27 Mar 21, 2024
48de484
update behavior to keep 2 days of images
NickM-27 Mar 22, 2024
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
52 changes: 50 additions & 2 deletions app/src/main/java/io/homeassistant/companion/android/notifications/MessagingManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import android.content.Intent
import android.content.pm.PackageManager
import android.graphics.Bitmap
import android.graphics.BitmapFactory
import android.graphics.drawable.Icon
import android.media.AudioManager
import android.media.MediaMetadataRetriever
import android.media.RingtoneManager
Expand All @@ -38,6 +39,7 @@ import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat
import androidx.core.app.RemoteInput
import androidx.core.content.ContextCompat
import androidx.core.content.FileProvider
import androidx.core.content.getSystemService
import androidx.core.text.isDigitsOnly
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
Expand Down Expand Up @@ -85,6 +87,9 @@ import java.io.File
import java.io.FileOutputStream
import java.net.URL
import java.net.URLDecoder
import java.time.Instant
import java.time.LocalDateTime
import java.time.ZoneId
import javax.inject.Inject
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Deferred
Expand Down Expand Up @@ -1199,8 +1204,15 @@ class MessagingManager @Inject constructor(
builder
.setLargeIcon(bitmap)
.setStyle(
NotificationCompat.BigPictureStyle()
.bigPicture(bitmap)
NotificationCompat.BigPictureStyle().also { style ->
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
saveTempAnimatedImage(serverId, url, !UrlUtil.isAbsoluteUrl(dataImage))?.let { filePath ->
style.bigPicture(Icon.createWithContentUri(filePath))
} ?: { style.bigPicture(bitmap) }
} else {
style.bigPicture(bitmap)
}
}
.bigLargeIcon(null as Bitmap?)
)
}
Expand Down Expand Up @@ -1233,6 +1245,42 @@ class MessagingManager @Inject constructor(
return@withContext image
}

@RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
private suspend fun saveTempAnimatedImage(serverId: Int, url: URL?, requiresAuth: Boolean = false): Uri? =
withContext(
Dispatchers.IO
) {
if (url == null || url.path.endsWith("gif").not()) {
return@withContext null
}

// delete previous images that are no longer needed
val imageCutoff = LocalDateTime.now().minusDays(2)
context.externalCacheDir?.listFiles()?.filter { file ->
file.absolutePath.endsWith("_animated_notification.gif") &&
imageCutoff.isAfter(LocalDateTime.ofInstant(Instant.ofEpochMilli(file.lastModified()), ZoneId.systemDefault()))
}?.forEach { expired -> expired.delete() }

val file = File(context.externalCacheDir, "${System.currentTimeMillis()}_animated_notification.gif")
try {
val request = Request.Builder().apply {
url(url)
if (requiresAuth) {
addHeader("Authorization", serverManager.authenticationRepository(serverId).buildBearerToken())
}
}.build()

val response = okHttpClient.newCall(request).execute()
val bytes = response.body?.bytes() ?: return@withContext null
file.writeBytes(bytes)

response.close()
} catch (e: Exception) {
Log.e(TAG, "Couldn't download image for notification", e)
}
return@withContext FileProvider.getUriForFile(context, "${context.packageName}.provider", file)
}

private suspend fun handleVideo(
builder: NotificationCompat.Builder,
data: Map<String, String>
Expand Down