Skip to content
Snippets Groups Projects
Verified Commit bfe4474a authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Further crash fixes

parent 824a6fb6
Branches
Tags
No related merge requests found
...@@ -40,6 +40,8 @@ abstract class SlideFragment : DaggerFragment() { ...@@ -40,6 +40,8 @@ abstract class SlideFragment : DaggerFragment() {
protected abstract fun isValid(): Boolean protected abstract fun isValid(): Boolean
private var initialized = false
val valid = object : MutableLiveData<Boolean>() { val valid = object : MutableLiveData<Boolean>() {
override fun observe(owner: LifecycleOwner, observer: Observer<in Boolean>) { override fun observe(owner: LifecycleOwner, observer: Observer<in Boolean>) {
super.observe(owner, observer) super.observe(owner, observer)
...@@ -67,6 +69,8 @@ abstract class SlideFragment : DaggerFragment() { ...@@ -67,6 +69,8 @@ abstract class SlideFragment : DaggerFragment() {
resources.getString(title) resources.getString(title)
view.findViewById<TextView>(R.id.description).setText(description) view.findViewById<TextView>(R.id.description).setText(description)
initialized = true
initData?.let(this::setData) initData?.let(this::setData)
savedInstanceState?.let(this::setData) savedInstanceState?.let(this::setData)
updateValidity() updateValidity()
...@@ -76,16 +80,25 @@ abstract class SlideFragment : DaggerFragment() { ...@@ -76,16 +80,25 @@ abstract class SlideFragment : DaggerFragment() {
override fun onSaveInstanceState(outState: Bundle) { override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState) super.onSaveInstanceState(outState)
getData(outState) if (initialized) getData(outState)
} }
override fun onViewStateRestored(savedInstanceState: Bundle?) { override fun onViewStateRestored(savedInstanceState: Bundle?) {
super.onViewStateRestored(savedInstanceState) super.onViewStateRestored(savedInstanceState)
updateValidity() if (initialized) updateValidity()
}
protected abstract fun setData(data: Bundle)
protected abstract fun getData(data: Bundle)
fun save(data: Bundle) {
if (initialized) getData(data)
}
fun load(data: Bundle) {
if (initialized) setData(data)
} }
abstract fun setData(data: Bundle)
abstract fun getData(data: Bundle)
var initData: Bundle? = null var initData: Bundle? = null
fun requestFocus() { fun requestFocus() {
......
...@@ -33,7 +33,7 @@ class SlidePagerAdapter(private val fragmentManager: FragmentManager) : ...@@ -33,7 +33,7 @@ class SlidePagerAdapter(private val fragmentManager: FragmentManager) :
val result = Bundle() val result = Bundle()
get() { get() {
(0 until retainedFragments.size()).map(retainedFragments::valueAt).forEach { (0 until retainedFragments.size()).map(retainedFragments::valueAt).forEach {
it.getData(field) it.save(field)
} }
return field return field
} }
...@@ -62,7 +62,7 @@ class SlidePagerAdapter(private val fragmentManager: FragmentManager) : ...@@ -62,7 +62,7 @@ class SlidePagerAdapter(private val fragmentManager: FragmentManager) :
} }
override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) { override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
retainedFragments.get(position)?.getData(result) retainedFragments.get(position)?.save(result)
retainedFragments.remove(position) retainedFragments.remove(position)
super.destroyItem(container, position, `object`) super.destroyItem(container, position, `object`)
} }
...@@ -97,9 +97,9 @@ class SlidePagerAdapter(private val fragmentManager: FragmentManager) : ...@@ -97,9 +97,9 @@ class SlidePagerAdapter(private val fragmentManager: FragmentManager) :
} }
fun hasChanged(index: Int, fragment: SlideFragment) { fun hasChanged(index: Int, fragment: SlideFragment) {
fragment.getData(result) fragment.save(result)
if (index > -1 && (index + 1) < totalCount) { if (index > -1 && (index + 1) < totalCount) {
getItem(index + 1).setData(result) getItem(index + 1).save(result)
} }
} }
} }
...@@ -97,18 +97,14 @@ object CrashHandler { ...@@ -97,18 +97,14 @@ object CrashHandler {
} }
Thread.setDefaultUncaughtExceptionHandler { currentThread, throwable -> Thread.setDefaultUncaughtExceptionHandler { currentThread, throwable ->
Thread {
myHandler?.invoke(currentThread, throwable) myHandler?.invoke(currentThread, throwable)
originalHandler?.uncaughtException(currentThread, throwable) originalHandler?.uncaughtException(currentThread, throwable)
}.start()
} }
val oldHandler = Thread.currentThread().uncaughtExceptionHandler val oldHandler = Thread.currentThread().uncaughtExceptionHandler
Thread.currentThread().setUncaughtExceptionHandler { currentThread, throwable -> Thread.currentThread().setUncaughtExceptionHandler { currentThread, throwable ->
Thread {
myHandler?.invoke(currentThread, throwable) myHandler?.invoke(currentThread, throwable)
oldHandler?.uncaughtException(currentThread, throwable) oldHandler?.uncaughtException(currentThread, throwable)
}.start()
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment