kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move appIdToApp to WebSocketService

Browse Source 
The PicassoHandler doesn't really need access to the full list, as it
only requires the application image.
This commit is contained in:
Jannis Mattheis
2023-02-21 13:31:48 +01:00
parent 1182f358cb
commit cfc473cce0
2 changed files with 18 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/kotlin/com/github/gotify/picasso/PicassoHandler.kt
View File

@@ -15,7 +15,6 @@ import okhttp3.Cache
import okhttp3.OkHttpClient
import java.io.File
import java.io.IOException
import java.util.concurrent.ConcurrentHashMap
internal class PicassoHandler(private val context: Context, private val settings: Settings) {
companion object {
@@ -29,7 +28,6 @@ internal class PicassoHandler(private val context: Context, private val settings
)
private val picasso = makePicasso()
private val appIdToApp = ConcurrentHashMap<Long, Application>()
private fun makePicasso(): Picasso {
val builder = OkHttpClient.Builder()
@@ -45,13 +43,13 @@ internal class PicassoHandler(private val context: Context, private val settings
@Throws(IOException::class)
fun getImageFromUrl(url: String?): Bitmap = picasso.load(url).get()
fun getIcon(appId: Long): Bitmap {
if (appId == -1L) {
fun getIcon(app: Application?): Bitmap {
if (app == null) {
return BitmapFactory.decodeResource(context.resources, R.drawable.gotify)
}
try {
return getImageFromUrl(
Utils.resolveAbsoluteUrl("${settings.url}/", appIdToApp[appId]?.image)
Utils.resolveAbsoluteUrl("${settings.url}/", app.image)
)
} catch (e: IOException) {
Log.e("Could not load image for notification", e)
@@ -59,11 +57,6 @@ internal class PicassoHandler(private val context: Context, private val settings
return BitmapFactory.decodeResource(context.resources, R.drawable.gotify)
}
fun updateApps(apps: List<Application>) {
appIdToApp.clear()
appIdToApp.putAll(apps.associateBy { it.id })
}
fun get() = picasso
@Throws(IOException::class)