mirror of
https://github.com/mihonapp/mihon.git
synced 2025-06-25 10:37:51 +02:00
Upgrade dependencies, use new Timber's overloaded method for errors
This commit is contained in:
@ -80,10 +80,10 @@ class DownloadManager(
|
||||
if (areAllDownloadsFinished()) {
|
||||
DownloadService.stop(context)
|
||||
}
|
||||
}, { e ->
|
||||
}, { error ->
|
||||
DownloadService.stop(context)
|
||||
Timber.e(e, e.message)
|
||||
downloadNotifier.onError(e.message)
|
||||
Timber.e(error)
|
||||
downloadNotifier.onError(error.message)
|
||||
})
|
||||
|
||||
if (!isRunning) {
|
||||
@ -369,8 +369,8 @@ class DownloadManager(
|
||||
try {
|
||||
it.write(gson.toJson(pages).toByteArray())
|
||||
it.flush()
|
||||
} catch (e: Exception) {
|
||||
Timber.e(e, e.message)
|
||||
} catch (error: Exception) {
|
||||
Timber.e(error)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -121,8 +121,8 @@ class UpdateDownloaderService : IntentService(UpdateDownloaderService::class.jav
|
||||
UpdateNotificationReceiver.cancelNotificationIntent(ctx))
|
||||
}
|
||||
|
||||
} catch (e: Exception) {
|
||||
Timber.e(e, e.message)
|
||||
} catch (error: Exception) {
|
||||
Timber.e(error)
|
||||
|
||||
// Prompt the user to retry the download.
|
||||
NotificationCompat.Builder(this).update {
|
||||
|
@ -121,9 +121,9 @@ class BackupFragment : BaseRxFragment<BackupPresenter>() {
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe({
|
||||
presenter.restoreBackup(it)
|
||||
}, {
|
||||
context.toast(it.message)
|
||||
Timber.e(it, it.message)
|
||||
}, { error ->
|
||||
context.toast(error.message)
|
||||
Timber.e(error)
|
||||
})
|
||||
.apply { subscriptions.add(this) }
|
||||
|
||||
|
@ -332,7 +332,7 @@ class CatalogueFragment : BaseRxFragment<CataloguePresenter>(), FlexibleViewHold
|
||||
*/
|
||||
fun onAddPageError(error: Throwable) {
|
||||
hideProgressBar()
|
||||
Timber.e(error, error.message)
|
||||
Timber.e(error)
|
||||
|
||||
catalogue_view.snack(error.message ?: "", Snackbar.LENGTH_INDEFINITE) {
|
||||
setAction(R.string.action_retry) {
|
||||
|
@ -143,7 +143,7 @@ class CataloguePresenter : BasePresenter<CatalogueFragment>() {
|
||||
.subscribeReplay({ view, page ->
|
||||
view.onAddPage(page.page, page.mangas)
|
||||
}, { view, error ->
|
||||
Timber.e(error, error.message)
|
||||
Timber.e(error)
|
||||
})
|
||||
|
||||
// Request first page.
|
||||
@ -211,7 +211,7 @@ class CataloguePresenter : BasePresenter<CatalogueFragment>() {
|
||||
@Suppress("DEPRECATION")
|
||||
view?.onMangaInitialized(manga)
|
||||
}, { error ->
|
||||
Timber.e(error, error.message)
|
||||
Timber.e(error)
|
||||
})
|
||||
.apply { add(this) }
|
||||
}
|
||||
|
@ -35,7 +35,7 @@ class DownloadPresenter : BasePresenter<DownloadFragment>() {
|
||||
.subscribeLatestCache({ view, downloads ->
|
||||
view.onNextDownloads(downloads)
|
||||
}, { view, error ->
|
||||
Timber.e(error, error.message)
|
||||
Timber.e(error)
|
||||
})
|
||||
}
|
||||
|
||||
|
@ -427,7 +427,7 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
|
||||
}
|
||||
} catch (error: IOException) {
|
||||
context.toast(R.string.notification_manga_update_failed)
|
||||
Timber.e(error, error.message)
|
||||
Timber.e(error)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -376,7 +376,7 @@ class ChaptersFragment : BaseRxFragment<ChaptersPresenter>(), ActionMode.Callbac
|
||||
|
||||
fun onChaptersDeletedError(error: Throwable) {
|
||||
dismissDeletingDialog()
|
||||
Timber.e(error, error.message)
|
||||
Timber.e(error)
|
||||
}
|
||||
|
||||
fun dismissDeletingDialog() {
|
||||
|
@ -111,7 +111,7 @@ class ChaptersPresenter : BasePresenter<ChaptersFragment>() {
|
||||
startableLatestCache(CHAPTER_STATUS_CHANGES,
|
||||
{ getChapterStatusObservable() },
|
||||
{ view, download -> view.onChapterStatusChange(download) },
|
||||
{ view, error -> Timber.e(error.cause, error.message) })
|
||||
{ view, error -> Timber.e(error) })
|
||||
|
||||
// Find the active manga from the shared data or return.
|
||||
manga = SharedData.get(MangaEvent::class.java)?.manga ?: return
|
||||
|
@ -102,7 +102,7 @@ class MyAnimeListPresenter : BasePresenter<MyAnimeListFragment>() {
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe({ next -> },
|
||||
{ error ->
|
||||
Timber.e(error, error.message)
|
||||
Timber.e(error)
|
||||
// Restart on error to set old values
|
||||
start(GET_MANGA_SYNC)
|
||||
}))
|
||||
|
@ -42,9 +42,9 @@ class ChapterLoader(
|
||||
.repeat()
|
||||
.subscribeOn(Schedulers.io())
|
||||
.subscribe({
|
||||
}, {
|
||||
if (it !is InterruptedException) {
|
||||
Timber.e(it, it.message)
|
||||
}, { error ->
|
||||
if (error !is InterruptedException) {
|
||||
Timber.e(error)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
@ -213,7 +213,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
|
||||
}
|
||||
|
||||
fun onChapterError(error: Throwable) {
|
||||
Timber.e(error, error.message)
|
||||
Timber.e(error)
|
||||
finish()
|
||||
toast(error.message)
|
||||
}
|
||||
|
@ -253,7 +253,7 @@ class RecentChaptersFragment
|
||||
*/
|
||||
fun onChaptersDeletedError(error: Throwable) {
|
||||
dismissDeletingDialog()
|
||||
Timber.e(error, error.message)
|
||||
Timber.e(error)
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -71,7 +71,7 @@ class RecentChaptersPresenter : BasePresenter<RecentChaptersFragment>() {
|
||||
// Set chapter status
|
||||
view.onChapterStatusChange(download)
|
||||
},
|
||||
{ view, error -> Timber.e(error.cause, error.message) }
|
||||
{ view, error -> Timber.e(error) }
|
||||
)
|
||||
|
||||
if (savedState == null) {
|
||||
|
@ -115,7 +115,7 @@ class RecentlyReadPresenter : BasePresenter<RecentlyReadFragment>() {
|
||||
.subscribeFirst({ view, chapter ->
|
||||
view.onOpenNextChapter(chapter, manga)
|
||||
}, { view, error ->
|
||||
Timber.e(error, error.message)
|
||||
Timber.e(error)
|
||||
})
|
||||
}
|
||||
|
||||
|
@ -133,7 +133,7 @@ class SettingsAboutFragment : SettingsFragment() {
|
||||
}
|
||||
}
|
||||
}, { error ->
|
||||
Timber.e(error, error.message)
|
||||
Timber.e(error)
|
||||
})
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user