From 7be7af36c99c81a1641fd7c49b611568d6cbb9aa Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Tue, 1 Jan 2019 12:46:07 +0800
Subject: [PATCH] Handle nullable fragmentManager

---
 .../java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt    | 3 ++-
 .../main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt   | 4 ++--
 .../main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt   | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
index 5f6cfcc6..6e72dfc5 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
@@ -124,7 +124,8 @@ class SettingsPreferenceFragment : PreferenceFragmentCompat() {
             true
         }
         findPreference("misc.donate").setOnPreferenceClickListener {
-            EBegFragment().apply { setStyle(DialogFragment.STYLE_NO_TITLE, 0) }.show(fragmentManager, "EBegFragment")
+            EBegFragment().apply { setStyle(DialogFragment.STYLE_NO_TITLE, 0) }
+                    .show(fragmentManager ?: return@setOnPreferenceClickListener false, "EBegFragment")
             true
         }
     }
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt
index 0ff5b681..2c9abb27 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt
@@ -125,7 +125,7 @@ class ClientsFragment : Fragment() {
                     NicknameDialogFragment().apply {
                         arguments = bundleOf(Pair(NicknameDialogFragment.KEY_MAC, client.mac),
                                 Pair(NicknameDialogFragment.KEY_NICKNAME, client.record.nickname))
-                    }.show(fragmentManager, "NicknameDialogFragment")
+                    }.show(fragmentManager ?: return false, "NicknameDialogFragment")
                     true
                 }
                 R.id.block, R.id.unblock -> {
@@ -146,7 +146,7 @@ class ClientsFragment : Fragment() {
                         arguments = bundleOf(Pair(StatsDialogFragment.KEY_TITLE, client.title),
                                 Pair(StatsDialogFragment.KEY_STATS,
                                         AppDatabase.instance.trafficRecordDao.queryStats(client.mac.macToLong())))
-                    }.show(fragmentManager, "StatsDialogFragment")
+                    }.show(fragmentManager ?: return false, "StatsDialogFragment")
                     true
                 }
                 else -> false
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt
index c654f817..9e72edc9 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt
@@ -87,7 +87,7 @@ class RepeaterManager(private val parent: TetheringFragment) : Manager(), Servic
         fun wps() {
             if (binder?.active == true) WpsDialogFragment().run {
                 setTargetFragment(parent, TetheringFragment.REPEATER_WPS)
-                show(parent.fragmentManager, "WpsDialogFragment")
+                show(parent.fragmentManager ?: return, "WpsDialogFragment")
             }
         }
 
@@ -102,7 +102,7 @@ class RepeaterManager(private val parent: TetheringFragment) : Manager(), Servic
                         preSharedKey = config.psk
                     }))
                     setTargetFragment(parent, TetheringFragment.REPEATER_EDIT_CONFIGURATION)
-                }.show(parent.fragmentManager, WifiP2pDialogFragment.TAG)
+                }.show(parent.fragmentManager ?: return, WifiP2pDialogFragment.TAG)
                 return
             } catch (e: RuntimeException) {
                 Timber.w(e)