From 7e5e14163c75af860157d9aa05f5e2d6b49ea04a Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Thu, 18 Apr 2019 15:51:02 +0200
Subject: [PATCH] Fixed titles not setting to activity toolbar

---
 .../main/java/com/topjohnwu/magisk/ui/MainActivity.kt    | 8 ++++++++
 .../java/com/topjohnwu/magisk/ui/home/MagiskFragment.kt  | 5 +++++
 .../topjohnwu/magisk/ui/settings/SettingsFragment.java   | 9 +++++++--
 .../topjohnwu/magisk/ui/superuser/SuperuserFragment.kt   | 2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
index 237ee46d3..fa144e0ec 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
@@ -56,6 +56,14 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
 
     }
 
+    override fun setTitle(title: CharSequence?) {
+        supportActionBar?.title = title
+    }
+
+    override fun setTitle(titleId: Int) {
+        supportActionBar?.setTitle(titleId)
+    }
+
     override fun onBackPressed() {
         if (binding.drawerLayout.isDrawerOpen(binding.navView)) {
             binding.drawerLayout.closeDrawer(binding.navView)
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.kt
index 839ff7d29..01c203296 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.kt
@@ -46,6 +46,11 @@ class MagiskFragment : NewMagiskFragment<HomeViewModel, FragmentMagiskBinding>()
         setHasOptionsMenu(true)
     }
 
+    override fun onStart() {
+        super.onStart()
+        requireActivity().setTitle(R.string.magisk)
+    }
+
     private fun installMagisk() {
         // Show Manager update first
         if (Config.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.java b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.java
index 4ea7162d1..bfadd491e 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.java
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.java
@@ -40,11 +40,16 @@ public class SettingsFragment extends BasePreferenceFragment {
     private ListPreference updateChannel, autoRes, suNotification,
             requestTimeout, rootConfig, multiuserConfig, nsConfig;
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        requireActivity().setTitle(R.string.settings);
+    }
+
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         getPreferenceManager().setStorageDeviceProtected();
         setPreferencesFromResource(R.xml.app_settings, rootKey);
-        requireActivity().setTitle(R.string.settings);
 
         boolean showSuperuser = Utils.showSuperUser();
         app.getPrefs().edit()
@@ -100,7 +105,7 @@ public class SettingsFragment extends BasePreferenceFragment {
                         .setTitle(R.string.settings_update_custom)
                         .setView(v)
                         .setPositiveButton(R.string.ok, (d, i) ->
-                               Config.set(Config.Key.CUSTOM_CHANNEL, url.getText().toString()))
+                                Config.set(Config.Key.CUSTOM_CHANNEL, url.getText().toString()))
                         .setNegativeButton(R.string.close, (d, i) ->
                                 Config.set(Config.Key.UPDATE_CHANNEL, prev))
                         .setOnCancelListener(d ->
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
index db545db56..7c197115c 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.kt
@@ -13,7 +13,7 @@ class SuperuserFragment :
 
     override fun onStart() {
         super.onStart()
-        magiskActivity.supportActionBar?.title = getString(R.string.superuser)
+        requireActivity().setTitle(R.string.superuser)
     }
 
     override fun onResume() {