Merge branch 'develop' into rtl_bug

02d52c8f · Filipe de Lima Brito · GitHub · bb14411d · a0406abe · 02d52c8f
Unverified Commit 02d52c8f authored Mar 08, 2019 by Filipe de Lima Brito Committed by GitHub Mar 08, 2019
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

PreferencesFragment.kt ...chat/rocket/android/preferences/ui/PreferencesFragment.kt +5 -1

No files found.
--- a/app/src/main/java/chat/rocket/android/preferences/ui/PreferencesFragment.kt
+++ b/app/src/main/java/chat/rocket/android/preferences/ui/PreferencesFragment.kt
@@ -38,13 +38,17 @@ class PreferencesFragment : Fragment(), PreferencesView {

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)
-        setupToolbar()
        setupListeners()
        presenter.loadAnalyticsTrackingInformation()

        analyticsManager.logScreenView(ScreenViewEvent.Preferences)
    }

+    override fun onResume() {
+        setupToolbar()
+        super.onResume()
+    }
+
    override fun setupAnalyticsTrackingView(isAnalyticsTrackingEnabled: Boolean) {
        if (BuildConfig.FLAVOR == "foss") {
            switch_analytics_tracking.isChecked = false