Merge pull request #1337 from divyanshub024/screen-orientation

[BUG] SaveInstanceState on orientation change

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

@@ -52,6 +52,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupp
     private var expanded = false
     private lateinit var googleApiClient: GoogleApiClient
     private val headerLayout by lazy { view_navigation.getHeaderView(0) }
+    private val CURRENT_STATE = "current_state"
 
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)
@@ -268,4 +269,14 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupp
             }
         }
     }
+
+    override fun onSaveInstanceState(outState: Bundle?) {
+        super.onSaveInstanceState(outState)
+        outState?.putBoolean(CURRENT_STATE,isFragmentAdded)
+    }
+
+    override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
+        super.onRestoreInstanceState(savedInstanceState)
+        isFragmentAdded = savedInstanceState?.getBoolean(CURRENT_STATE) ?: false
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt

@@ -4,6 +4,7 @@ import DrawableHelper
 import android.os.Build
 import android.os.Bundle
 import android.support.v4.app.Fragment
+import android.support.v7.app.AppCompatActivity
 import android.support.v7.view.ActionMode
 import android.view.*
 import chat.rocket.android.R
@@ -14,7 +15,6 @@ import chat.rocket.android.util.extensions.*
 import dagger.android.support.AndroidSupportInjection
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.Observables
-import kotlinx.android.synthetic.main.app_bar.*
 import kotlinx.android.synthetic.main.avatar_profile.*
 import kotlinx.android.synthetic.main.fragment_profile.*
 import javax.inject.Inject
@@ -135,7 +135,7 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
     }
 
     private fun setupToolbar() {
-        (activity as MainActivity).toolbar.title = getString(R.string.title_profile)
+        (activity as AppCompatActivity?)?.supportActionBar?.title = getString(R.string.title_profile)
     }
 
     private fun tintEditTextDrawableStart() {

app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt

@@ -9,12 +9,10 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import chat.rocket.android.R
-import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.settings.about.ui.AboutActivity
 import chat.rocket.android.settings.password.ui.PasswordActivity
 import chat.rocket.android.settings.presentation.SettingsView
 import chat.rocket.android.util.extensions.inflate
-import kotlinx.android.synthetic.main.app_bar.*
 import kotlinx.android.synthetic.main.fragment_settings.*
 import kotlin.reflect.KClass
 
@@ -47,7 +45,7 @@ class SettingsFragment: Fragment(), SettingsView, AdapterView.OnItemClickListene
     }
 
     private fun setupToolbar() {
-        (activity as MainActivity).toolbar.title = getString(R.string.title_settings)
+        (activity as AppCompatActivity?)?.supportActionBar?.title = getString(R.string.title_settings)
     }
 
     private fun startNewActivity(classType: KClass<out AppCompatActivity>) {