aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-09-28 23:53:40 -0700
committerGitHub <noreply@github.com>2019-09-28 23:53:40 -0700
commit73e16427879908e8b46b7c9fe1e87b0df838fa78 (patch)
treec3ae5a6890b0797110f397b99812362312c07ff6 /app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
parent58309cfd62ed26f3cf5d2b1cb933f50078937a3a (diff)
parentf5ae18fc0d824dbdce5523128f9ded86bdfa6d08 (diff)
downloadfrost-73e16427879908e8b46b7c9fe1e87b0df838fa78.tar.gz
frost-73e16427879908e8b46b7c9fe1e87b0df838fa78.tar.bz2
frost-73e16427879908e8b46b7c9fe1e87b0df838fa78.zip
Merge branch 'dev' into desktop-url-convert
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
index 7a4472b4..ea0de778 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
@@ -80,7 +80,7 @@ class FrostApp : Application() {
* Reload the image on every version update
*/
DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
- override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String) {
+ override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
val c = imageView.context
val request = GlideApp.with(c)
val old = request.load(uri).apply(RequestOptions().placeholder(placeholder))