brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle nullable fragmentManager

Browse Source
This commit is contained in:
Mygod
2019-01-01 12:46:07 +08:00
parent 24c1d810d5
commit 7be7af36c9
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
View File

@@ -124,7 +124,8 @@ class SettingsPreferenceFragment : PreferenceFragmentCompat() {
true true
} }
findPreference("misc.donate").setOnPreferenceClickListener { 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 true
} }
} }

4
mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt
View File

@@ -125,7 +125,7 @@ class ClientsFragment : Fragment() {
NicknameDialogFragment().apply { NicknameDialogFragment().apply {
arguments = bundleOf(Pair(NicknameDialogFragment.KEY_MAC, client.mac), arguments = bundleOf(Pair(NicknameDialogFragment.KEY_MAC, client.mac),
Pair(NicknameDialogFragment.KEY_NICKNAME, client.record.nickname)) Pair(NicknameDialogFragment.KEY_NICKNAME, client.record.nickname))
}.show(fragmentManager, "NicknameDialogFragment") }.show(fragmentManager ?: return false, "NicknameDialogFragment")
true true
} }
R.id.block, R.id.unblock -> { R.id.block, R.id.unblock -> {
@@ -146,7 +146,7 @@ class ClientsFragment : Fragment() {
arguments = bundleOf(Pair(StatsDialogFragment.KEY_TITLE, client.title), arguments = bundleOf(Pair(StatsDialogFragment.KEY_TITLE, client.title),
Pair(StatsDialogFragment.KEY_STATS, Pair(StatsDialogFragment.KEY_STATS,
AppDatabase.instance.trafficRecordDao.queryStats(client.mac.macToLong()))) AppDatabase.instance.trafficRecordDao.queryStats(client.mac.macToLong())))
}.show(fragmentManager, "StatsDialogFragment") }.show(fragmentManager ?: return false, "StatsDialogFragment")
true true
} }
else -> false else -> false

4
mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt
View File

@@ -87,7 +87,7 @@ class RepeaterManager(private val parent: TetheringFragment) : Manager(), Servic
fun wps() { fun wps() {
if (binder?.active == true) WpsDialogFragment().run { if (binder?.active == true) WpsDialogFragment().run {
setTargetFragment(parent, TetheringFragment.REPEATER_WPS) 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 preSharedKey = config.psk
})) }))
setTargetFragment(parent, TetheringFragment.REPEATER_EDIT_CONFIGURATION) setTargetFragment(parent, TetheringFragment.REPEATER_EDIT_CONFIGURATION)
}.show(parent.fragmentManager, WifiP2pDialogFragment.TAG) }.show(parent.fragmentManager ?: return, WifiP2pDialogFragment.TAG)
return return
} catch (e: RuntimeException) { } catch (e: RuntimeException) {
Timber.w(e) Timber.w(e)