Further state saving fixes

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

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