Merge branch 'fix/toast-crash' into 'master'

fmasa · fmasa · commit 661c04add5fd · 2020-09-13T15:51:03.000Z
Prevent crash when trying to show Toast from detached fragment

See merge request fmasa/wfrp-master!111
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/common/utils.kt b/app/src/main/java/cz/muni/fi/rpg/ui/common/utils.kt
@@ -51,10 +51,10 @@ fun Activity.toast(@StringRes message: Int, duration: Int = Toast.LENGTH_SHORT)
 
 @UiThread
 fun Fragment.toast(message: String, duration: Int = Toast.LENGTH_SHORT) {
-    Toast.makeText(requireContext(), message, duration).show()
+    context?.let { Toast.makeText(it, message, duration).show() }
 }
 
 @UiThread
 fun Fragment.toast(@StringRes message: Int, duration: Int = Toast.LENGTH_SHORT) {
-    Toast.makeText(requireContext(), message, duration).show()
+    context?.let { Toast.makeText(it, message, duration).show() }
 }

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,10 @@ fun Activity.toast(@StringRes message: Int, duration: Int = Toast.LENGTH_SHORT)`
`51`	`51`
`52`	`52`	`@UiThread`
`53`	`53`	`fun Fragment.toast(message: String, duration: Int = Toast.LENGTH_SHORT) {`
`54`		`- Toast.makeText(requireContext(), message, duration).show()`
	`54`	`+ context?.let { Toast.makeText(it, message, duration).show() }`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@UiThread`
`58`	`58`	`fun Fragment.toast(@StringRes message: Int, duration: Int = Toast.LENGTH_SHORT) {`
`59`		`- Toast.makeText(requireContext(), message, duration).show()`
	`59`	`+ context?.let { Toast.makeText(it, message, duration).show() }`
`60`	`60`	`}`