Merge pull request #339 from Gan0k/fix_jellybean_crash

Fixes Crash on Android API 16 (Jelly Bean)
This commit is contained in:
Tibor Kaputa 2017-08-27 22:54:17 +02:00 committed by GitHub
commit cb27ba4ec8
2 changed files with 10 additions and 4 deletions

View file

@ -1,6 +1,7 @@
package com.simplemobiletools.gallery.adapters package com.simplemobiletools.gallery.adapters
import android.graphics.PorterDuff import android.graphics.PorterDuff
import android.os.Build
import android.support.v7.view.ActionMode import android.support.v7.view.ActionMode
import android.support.v7.widget.RecyclerView import android.support.v7.widget.RecyclerView
import android.util.SparseArray import android.util.SparseArray
@ -430,7 +431,9 @@ class DirectoryAdapter(val activity: SimpleActivity, var dirs: MutableList<Direc
} }
fun stopLoad() { fun stopLoad() {
if (!activity.isDestroyed) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && activity.isDestroyed)
return
Glide.with(activity).clear(view.dir_thumbnail) Glide.with(activity).clear(view.dir_thumbnail)
} }
} }

View file

@ -1,6 +1,7 @@
package com.simplemobiletools.gallery.adapters package com.simplemobiletools.gallery.adapters
import android.graphics.PorterDuff import android.graphics.PorterDuff
import android.os.Build
import android.support.v7.view.ActionMode import android.support.v7.view.ActionMode
import android.support.v7.widget.RecyclerView import android.support.v7.widget.RecyclerView
import android.util.SparseArray import android.util.SparseArray
@ -347,7 +348,9 @@ class MediaAdapter(val activity: SimpleActivity, var media: MutableList<Medium>,
} }
fun stopLoad() { fun stopLoad() {
if (!activity.isDestroyed) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && activity.isDestroyed)
return
Glide.with(activity).clear(view.medium_thumbnail) Glide.with(activity).clear(view.medium_thumbnail)
} }
} }