Move appIdToApp to WebSocketService

The PicassoHandler doesn't really need access to the full list, as it
only requires the application image.

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

@@ -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 {
+    fun getIcon(app: Application?): Bitmap {
-        if (appId == -1L) {
+        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)

app/src/main/kotlin/com/github/gotify/service/WebSocketService.kt

@@ -33,6 +33,7 @@ import com.github.gotify.messages.Extras
 import com.github.gotify.messages.MessagesActivity
 import com.github.gotify.picasso.PicassoHandler
 import io.noties.markwon.Markwon
+import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicLong
 
 internal class WebSocketService : Service() {
@@ -43,6 +44,7 @@ internal class WebSocketService : Service() {
 
     private lateinit var settings: Settings
     private var connection: WebSocketConnection? = null
+    private val appIdToApp = ConcurrentHashMap<Long, Application>()
 
     private val lastReceivedMessage = AtomicLong(NOT_LOADED)
     private lateinit var missingMessageUtil: MissedMessageUtil
@@ -113,42 +115,30 @@ internal class WebSocketService : Service() {
         val intentFilter = IntentFilter()
         intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION)
 
-        fetchAppIds(
+        fetchApps()
-            onSuccess = { apps ->
-                picassoHandler.updateApps(apps)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    createNotificationChannels(apps)
-                }
-            },
-            onError = { picassoHandler.updateApps(listOf()) }
-        )
     }
 
-    private fun fetchAppIds(
+    private fun fetchApps() {
-        onSuccess: (apps: List<Application>) -> Unit,
-        onError: () -> Unit
-    ) {
         ClientFactory.clientToken(settings.url, settings.sslSettings(), settings.token)
             .createService(ApplicationApi::class.java)
             .apps
             .enqueue(
                 Callback.call(
                     onSuccess = Callback.SuccessBody { apps ->
-                        onSuccess(apps)
+                        appIdToApp.clear()
-                    },
+                        appIdToApp.putAll(apps.associateBy { it.id })
-                    onError = { onError() }
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                )
-            )
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    private fun createNotificationChannels(apps: List<Application>) {
                             NotificationSupport.createChannels(
                                 this,
                                 (this.getSystemService(NOTIFICATION_SERVICE) as NotificationManager),
                                 apps
                             )
                         }
+                    },
+                    onError = { appIdToApp.clear() }
+                )
+            )
+    }
 
     private fun onClose() {
         showForegroundNotification(
@@ -372,7 +362,7 @@ internal class WebSocketService : Service() {
             .setDefaults(Notification.DEFAULT_ALL)
             .setWhen(System.currentTimeMillis())
             .setSmallIcon(R.drawable.ic_gotify)
-            .setLargeIcon(picassoHandler.getIcon(appId))
+            .setLargeIcon(picassoHandler.getIcon(appIdToApp[appId]))
             .setTicker("${getString(R.string.app_name)} - $title")
             .setGroup(NotificationSupport.Group.MESSAGES)
             .setContentTitle(title)