mirror of
https://github.com/mihonapp/mihon.git
synced 2024-11-21 20:47:03 -05:00
Fix #517 and a few more crashes
This commit is contained in:
parent
453f742732
commit
2dc8159d96
3 changed files with 7 additions and 11 deletions
|
@ -5,7 +5,6 @@ import android.app.Service
|
|||
import android.content.BroadcastReceiver
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.graphics.Bitmap
|
||||
import android.graphics.BitmapFactory
|
||||
import android.os.IBinder
|
||||
import android.os.PowerManager
|
||||
|
@ -73,7 +72,9 @@ class LibraryUpdateService : Service() {
|
|||
private val notificationId: Int
|
||||
get() = Constants.NOTIFICATION_LIBRARY_ID
|
||||
|
||||
private var notificationBitmap: Bitmap? = null
|
||||
private val notificationBitmap by lazy {
|
||||
BitmapFactory.decodeResource(resources, R.mipmap.ic_launcher)
|
||||
}
|
||||
|
||||
companion object {
|
||||
|
||||
|
@ -141,8 +142,6 @@ class LibraryUpdateService : Service() {
|
|||
*/
|
||||
override fun onDestroy() {
|
||||
subscription?.unsubscribe()
|
||||
notificationBitmap?.recycle()
|
||||
notificationBitmap = null
|
||||
destroyWakeLock()
|
||||
super.onDestroy()
|
||||
}
|
||||
|
@ -171,10 +170,6 @@ class LibraryUpdateService : Service() {
|
|||
// Update favorite manga. Destroy service when completed or in case of an error.
|
||||
subscription = Observable
|
||||
.defer {
|
||||
if (notificationBitmap == null) {
|
||||
notificationBitmap = BitmapFactory.decodeResource(resources, R.mipmap.ic_launcher)
|
||||
}
|
||||
|
||||
val mangaList = getMangaToUpdate(intent)
|
||||
|
||||
// Update either chapter list or manga details.
|
||||
|
@ -267,7 +262,6 @@ class LibraryUpdateService : Service() {
|
|||
} else {
|
||||
showResultNotification(newUpdates, failedUpdates)
|
||||
}
|
||||
LibraryUpdateJob.setupTask()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -9,6 +9,7 @@ import android.util.AttributeSet
|
|||
import com.afollestad.materialdialogs.MaterialDialog
|
||||
import eu.kanade.tachiyomi.BuildConfig
|
||||
import eu.kanade.tachiyomi.R
|
||||
import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
|
||||
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
|
||||
import eu.kanade.tachiyomi.data.preference.getOrDefault
|
||||
import eu.kanade.tachiyomi.data.updater.UpdateCheckerJob
|
||||
|
@ -23,9 +24,10 @@ class ChangelogDialogFragment : DialogFragment() {
|
|||
preferences.lastVersionCode().set(BuildConfig.VERSION_CODE)
|
||||
ChangelogDialogFragment().show(fragmentManager, "changelog")
|
||||
|
||||
// FIXME Ugly check to restore auto updates setting. Remove me in a few months :D
|
||||
// FIXME Ugly check to restore jobs. Remove me in a few months :D
|
||||
if (oldVersion < 14 && BuildConfig.INCLUDE_UPDATER && preferences.automaticUpdates()) {
|
||||
UpdateCheckerJob.setupTask()
|
||||
LibraryUpdateJob.setupTask()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -71,7 +71,7 @@ class SettingsAdvancedFragment : SettingsFragment() {
|
|||
private fun clearChapterCache() {
|
||||
val deletedFiles = AtomicInteger()
|
||||
|
||||
val files = chapterCache.cacheDir.listFiles()
|
||||
val files = chapterCache.cacheDir.listFiles() ?: return
|
||||
|
||||
val dialog = MaterialDialog.Builder(activity)
|
||||
.title(R.string.deleting)
|
||||
|
|
Loading…
Reference in a new issue