From 66173686aef5c5ea567ab79398eb63f3a84f236d Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Mon, 29 Apr 2019 22:09:46 +0200
Subject: [PATCH] Further state saving fixes
---
.../util/ui/settings/ServiceBoundSettingsActivity.kt | 4 +++-
.../kuschku/quasseldroid/util/ui/settings/SettingsActivity.kt | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/ServiceBoundSettingsActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/ServiceBoundSettingsActivity.kt
index af6a225b0..83ff2456d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/ServiceBoundSettingsActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/ServiceBoundSettingsActivity.kt
@@ -48,7 +48,9 @@ abstract class ServiceBoundSettingsActivity(private val fragment: Fragment? = nu
setSupportActionBar(toolbar)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
- val fragment = this.fragment ?: this.fragment()
+ val fragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
+ ?: this.fragment
+ ?: this.fragment()
if (fragment != null) {
val transaction = supportFragmentManager.beginTransaction()
fragment.arguments = arguments
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/SettingsActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/SettingsActivity.kt
index a9ec61804..8ed888d19 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/SettingsActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/SettingsActivity.kt
@@ -47,7 +47,9 @@ abstract class SettingsActivity(protected val fragment: Fragment? = null) : Them
setSupportActionBar(toolbar)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
- val fragment = this.fragment ?: this.fragment()
+ val fragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
+ ?: this.fragment
+ ?: this.fragment()
if (fragment != null) {
val transaction = supportFragmentManager.beginTransaction()
fragment.arguments = arguments
--
GitLab