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

Implement changes required by new Kotlin codebase

Browse Source
This commit is contained in:
Niko Diamadis
2022-12-26 19:14:14 +01:00
parent 91d191f01b
commit 7b415b6d61
11 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/github/gotify/picasso/PicassoHandler.kt
View File

@@ -46,7 +46,7 @@ class PicassoHandler(private val context: Context, private val settings: Setting
}
@Throws(IOException::class)
fun getImageFromUrl(url: String): Bitmap {
fun getImageFromUrl(url: String?): Bitmap {
return picasso.load(url).get()
}
@@ -56,7 +56,7 @@ class PicassoHandler(private val context: Context, private val settings: Setting
}
try {
return getImageFromUrl(
Utils.resolveAbsoluteUrl("${settings.url()}/", appIdToAppImage[appId])
Utils.resolveAbsoluteUrl("${settings.url}/", appIdToAppImage[appId])
)
} catch (e: IOException) {
Log.e("Could not load image for notification", e)
@@ -65,12 +65,12 @@ class PicassoHandler(private val context: Context, private val settings: Setting
}
fun updateAppIds() {
ClientFactory.clientToken(settings.url(), settings.sslSettings(), settings.token())
ClientFactory.clientToken(settings.url, settings.sslSettings(), settings.token)
.createService(ApplicationApi::class.java)
.apps
.enqueue(Callback.call({ apps ->
appIdToAppImage.clear()
appIdToAppImage.putAll(MessageImageCombiner.appIdToImage(apps))
appIdToAppImage.putAll(MessageImageCombiner.appIdToImage(apps ?: emptyList()))
}) { appIdToAppImage.clear() })
}