Skip to content

Commit

Permalink
NF: simplify catchingLifecycleScope
Browse files Browse the repository at this point in the history
My understanding is that this method will often be called either on fragments,
and using the fragment's activity. So it seems to make sense to simplify it,
ensuring that we avoid a parameter that will probably never change.

Actually, since activities are also LifecycleOwner, it may be possible to ensure
this method is even simpler, by defining it on activities instead of defining it
on LifecycleOwner. Unless we have a reason to use an activity distinct from the
LifecycleOwner.

Also cleaning from function I viewed at the same time
  • Loading branch information
Arthur-Milchior committed Aug 13, 2022
1 parent f554994 commit f440484
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion AnkiDroid/src/main/java/com/ichi2/anki/Statistics.kt
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ class Statistics : NavigationDrawerActivity(), DeckSelectionListener, SubtitleLi

private fun createStatisticOverview() {
val handler = (requireActivity() as Statistics).taskHandler
statisticsJob = catchingLifecycleScope(requireActivity(), "createStatisticOverview failed with error") {
statisticsJob = catchingLifecycleScope("createStatisticOverview failed with error") {
handler.createStatisticsOverview(mWebView, mProgressBar)
}
}
Expand Down
4 changes: 2 additions & 2 deletions AnkiDroid/src/main/java/com/ichi2/anki/UIUtils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ object UIUtils {
}

@JvmStatic
fun getDismissibleSnackbar(activity: Activity?, mainText: String, length: Int, dismissTextResource: Int, root: View): Snackbar {
fun getDismissibleSnackbar(context: Context, mainText: String, length: Int, dismissTextResource: Int, root: View): Snackbar {
val sb = Snackbar.make(root, mainText, length)
sb.setAction(dismissTextResource) {
sb.dismiss()
Expand All @@ -152,7 +152,7 @@ object UIUtils {
val action = view.findViewById<TextView>(com.google.android.material.R.id.snackbar_action)
if (tv != null && action != null) {
tv.setTextColor(Color.WHITE)
action.setTextColor(ContextCompat.getColor(activity!!, R.color.material_light_blue_500))
action.setTextColor(ContextCompat.getColor(context, R.color.material_light_blue_500))
tv.maxLines = 2 // prevent tablets from truncating to 1 line
}
return sb
Expand Down
11 changes: 10 additions & 1 deletion AnkiDroid/src/main/java/com/ichi2/async/CoroutineHelpers.kt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package com.ichi2.async

import android.app.Activity
import androidx.fragment.app.Fragment
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.coroutineScope
import com.ichi2.anki.CrashReportService
Expand All @@ -31,7 +32,7 @@ import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
import timber.log.Timber

/*
/**
* Launch a job that catches any uncaught errors, informs the user and prints it to Log.
* Errors from the backend contain localized text that is often suitable to show to the user as-is.
* Other errors should ideally be handled in the block.
Expand All @@ -52,3 +53,11 @@ fun LifecycleOwner.catchingLifecycleScope(
CrashReportService.sendExceptionReport(e, activity::class.java.simpleName)
}
}

/**
* @see [LifecycleOwner.catchingLifecycleScope]
*/
fun Fragment.catchingLifecycleScope(
errorMessage: String? = null,
block: suspend CoroutineScope.() -> Unit
) = (this as LifecycleOwner).catchingLifecycleScope(requireActivity(), errorMessage, block)

0 comments on commit f440484

Please sign in to comment.