From a139632d041b7d79203597c718497e8dbd8324e4 Mon Sep 17 00:00:00 2001 From: Mygod Date: Wed, 7 Mar 2018 23:22:38 -0800 Subject: [PATCH] Use require* from support lib --- .../be/mygod/vpnhotspot/RepeaterFragment.kt | 14 +++++++------- .../vpnhotspot/SettingsPreferenceFragment.kt | 17 +++++++++++------ .../be/mygod/vpnhotspot/TetheringFragment.kt | 4 ++-- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt index d071c008..bdf22b01 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt @@ -51,7 +51,7 @@ class RepeaterFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClickL when (binder?.service?.status) { RepeaterService.Status.IDLE -> if (value) { - val context = context!! + val context = requireContext() ContextCompat.startForegroundService(context, Intent(context, RepeaterService::class.java)) } RepeaterService.Status.ACTIVE -> if (!value) binder.shutdown() @@ -182,14 +182,14 @@ class RepeaterFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClickL override fun onStart() { super.onStart() - val context = context!! + val context = requireContext() context.bindService(Intent(context, RepeaterService::class.java), this, Context.BIND_AUTO_CREATE) IpNeighbourMonitor.registerCallback(this) context.registerReceiver(receiver, intentFilter(ConnectivityManagerHelper.ACTION_TETHER_STATE_CHANGED)) } override fun onStop() { - val context = context!! + val context = requireContext() context.unregisterReceiver(receiver) IpNeighbourMonitor.unregisterCallback(this) onServiceDisconnected(null) @@ -202,20 +202,20 @@ class RepeaterFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClickL binder.data = data this.binder = binder data.onStatusChanged() - LocalBroadcastManager.getInstance(context!!) + LocalBroadcastManager.getInstance(requireContext()) .registerReceiver(data.statusListener, intentFilter(RepeaterService.ACTION_STATUS_CHANGED)) } override fun onServiceDisconnected(name: ComponentName?) { binder?.data = null binder = null - LocalBroadcastManager.getInstance(context!!).unregisterReceiver(data.statusListener) + LocalBroadcastManager.getInstance(requireContext()).unregisterReceiver(data.statusListener) data.onStatusChanged() } override fun onMenuItemClick(item: MenuItem) = when (item.itemId) { R.id.wps -> if (binder?.active == true) { - val dialog = AlertDialog.Builder(context!!) + val dialog = AlertDialog.Builder(requireContext()) .setTitle(R.string.repeater_wps_dialog_title) .setView(R.layout.dialog_wps) .setPositiveButton(android.R.string.ok, { dialog, _ -> binder?.startWps((dialog as AppCompatDialog) @@ -228,7 +228,7 @@ class RepeaterFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClickL true } else false R.id.resetGroup -> { - AlertDialog.Builder(context!!) + AlertDialog.Builder(requireContext()) .setTitle(R.string.repeater_reset_credentials) .setMessage(getString(R.string.repeater_reset_credentials_dialog_message)) .setPositiveButton(R.string.repeater_reset_credentials_dialog_reset, diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt index 4966007a..16296ccd 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt @@ -17,19 +17,24 @@ import java.io.PrintWriter class SettingsPreferenceFragment : PreferenceFragmentCompatDividers() { private val customTabsIntent by lazy { - CustomTabsIntent.Builder().setToolbarColor(ContextCompat.getColor(activity!!, R.color.colorPrimary)).build() + CustomTabsIntent.Builder() + .setToolbarColor(ContextCompat.getColor(requireContext(), R.color.colorPrimary)) + .build() } override fun onCreatePreferencesFix(savedInstanceState: Bundle?, rootKey: String?) { addPreferencesFromResource(R.xml.pref_settings) findPreference("service.clean").setOnPreferenceClickListener { - if (Routing.clean() == null) Toast.makeText(context!!, R.string.root_unavailable, Toast.LENGTH_SHORT).show() - else LocalBroadcastManager.getInstance(context!!).sendBroadcastSync(Intent(App.ACTION_CLEAN_ROUTINGS)) + if (Routing.clean() == null) { + Toast.makeText(requireContext(), R.string.root_unavailable, Toast.LENGTH_SHORT).show() + } else { + LocalBroadcastManager.getInstance(requireContext()).sendBroadcastSync(Intent(App.ACTION_CLEAN_ROUTINGS)) + } true } findPreference("misc.logcat").setOnPreferenceClickListener { - val activity = activity!! - val logDir = File(activity.cacheDir, "log") + val context = requireContext() + val logDir = File(context.cacheDir, "log") logDir.mkdir() val logFile = File.createTempFile("vpnhotspot-", ".log", logDir) logFile.outputStream().use { out -> @@ -55,7 +60,7 @@ class SettingsPreferenceFragment : PreferenceFragmentCompatDividers() { .setType("text/x-log") .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) .putExtra(Intent.EXTRA_STREAM, - FileProvider.getUriForFile(activity, "be.mygod.vpnhotspot.log", logFile)), + FileProvider.getUriForFile(context, "be.mygod.vpnhotspot.log", logFile)), getString(R.string.abc_shareactionprovider_share_with))) true } diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/TetheringFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/TetheringFragment.kt index a9b21f32..c483a2a8 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/TetheringFragment.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/TetheringFragment.kt @@ -129,13 +129,13 @@ class TetheringFragment : Fragment(), ServiceConnection { override fun onStart() { super.onStart() - val context = context!! + val context = requireContext() context.registerReceiver(receiver, intentFilter(ConnectivityManagerHelper.ACTION_TETHER_STATE_CHANGED)) context.bindService(Intent(context, TetheringService::class.java), this, Context.BIND_AUTO_CREATE) } override fun onStop() { - val context = context!! + val context = requireContext() context.unbindService(this) context.unregisterReceiver(receiver) super.onStop()