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

Use require* from support lib

Browse Source
This commit is contained in:
Mygod
2018-03-07 23:22:38 -08:00
parent 063bf49bdd
commit a139632d04
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt
View File

@@ -51,7 +51,7 @@ class RepeaterFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClickL
when (binder?.service?.status) { when (binder?.service?.status) {
RepeaterService.Status.IDLE -> RepeaterService.Status.IDLE ->
if (value) { if (value) {
val context = context!! val context = requireContext()
ContextCompat.startForegroundService(context, Intent(context, RepeaterService::class.java)) ContextCompat.startForegroundService(context, Intent(context, RepeaterService::class.java))
} }
RepeaterService.Status.ACTIVE -> if (!value) binder.shutdown() RepeaterService.Status.ACTIVE -> if (!value) binder.shutdown()
@@ -182,14 +182,14 @@ class RepeaterFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClickL
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
val context = context!! val context = requireContext()
context.bindService(Intent(context, RepeaterService::class.java), this, Context.BIND_AUTO_CREATE) context.bindService(Intent(context, RepeaterService::class.java), this, Context.BIND_AUTO_CREATE)
IpNeighbourMonitor.registerCallback(this) IpNeighbourMonitor.registerCallback(this)
context.registerReceiver(receiver, intentFilter(ConnectivityManagerHelper.ACTION_TETHER_STATE_CHANGED)) context.registerReceiver(receiver, intentFilter(ConnectivityManagerHelper.ACTION_TETHER_STATE_CHANGED))
} }
override fun onStop() { override fun onStop() {
val context = context!! val context = requireContext()
context.unregisterReceiver(receiver) context.unregisterReceiver(receiver)
IpNeighbourMonitor.unregisterCallback(this) IpNeighbourMonitor.unregisterCallback(this)
onServiceDisconnected(null) onServiceDisconnected(null)
@@ -202,20 +202,20 @@ class RepeaterFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClickL
binder.data = data binder.data = data
this.binder = binder this.binder = binder
data.onStatusChanged() data.onStatusChanged()
LocalBroadcastManager.getInstance(context!!) LocalBroadcastManager.getInstance(requireContext())
.registerReceiver(data.statusListener, intentFilter(RepeaterService.ACTION_STATUS_CHANGED)) .registerReceiver(data.statusListener, intentFilter(RepeaterService.ACTION_STATUS_CHANGED))
} }
override fun onServiceDisconnected(name: ComponentName?) { override fun onServiceDisconnected(name: ComponentName?) {
binder?.data = null binder?.data = null
binder = null binder = null
LocalBroadcastManager.getInstance(context!!).unregisterReceiver(data.statusListener) LocalBroadcastManager.getInstance(requireContext()).unregisterReceiver(data.statusListener)
data.onStatusChanged() data.onStatusChanged()
} }
override fun onMenuItemClick(item: MenuItem) = when (item.itemId) { override fun onMenuItemClick(item: MenuItem) = when (item.itemId) {
R.id.wps -> if (binder?.active == true) { R.id.wps -> if (binder?.active == true) {
val dialog = AlertDialog.Builder(context!!) val dialog = AlertDialog.Builder(requireContext())
.setTitle(R.string.repeater_wps_dialog_title) .setTitle(R.string.repeater_wps_dialog_title)
.setView(R.layout.dialog_wps) .setView(R.layout.dialog_wps)
.setPositiveButton(android.R.string.ok, { dialog, _ -> binder?.startWps((dialog as AppCompatDialog) .setPositiveButton(android.R.string.ok, { dialog, _ -> binder?.startWps((dialog as AppCompatDialog)
@@ -228,7 +228,7 @@ class RepeaterFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClickL
true true
} else false } else false
R.id.resetGroup -> { R.id.resetGroup -> {
AlertDialog.Builder(context!!) AlertDialog.Builder(requireContext())
.setTitle(R.string.repeater_reset_credentials) .setTitle(R.string.repeater_reset_credentials)
.setMessage(getString(R.string.repeater_reset_credentials_dialog_message)) .setMessage(getString(R.string.repeater_reset_credentials_dialog_message))
.setPositiveButton(R.string.repeater_reset_credentials_dialog_reset, .setPositiveButton(R.string.repeater_reset_credentials_dialog_reset,

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

@@ -17,19 +17,24 @@ import java.io.PrintWriter
class SettingsPreferenceFragment : PreferenceFragmentCompatDividers() { class SettingsPreferenceFragment : PreferenceFragmentCompatDividers() {
private val customTabsIntent by lazy { 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?) { override fun onCreatePreferencesFix(savedInstanceState: Bundle?, rootKey: String?) {
addPreferencesFromResource(R.xml.pref_settings) addPreferencesFromResource(R.xml.pref_settings)
findPreference("service.clean").setOnPreferenceClickListener { findPreference("service.clean").setOnPreferenceClickListener {
if (Routing.clean() == null) Toast.makeText(context!!, R.string.root_unavailable, Toast.LENGTH_SHORT).show() if (Routing.clean() == null) {
else LocalBroadcastManager.getInstance(context!!).sendBroadcastSync(Intent(App.ACTION_CLEAN_ROUTINGS)) Toast.makeText(requireContext(), R.string.root_unavailable, Toast.LENGTH_SHORT).show()
} else {
LocalBroadcastManager.getInstance(requireContext()).sendBroadcastSync(Intent(App.ACTION_CLEAN_ROUTINGS))
}
true true
} }
findPreference("misc.logcat").setOnPreferenceClickListener { findPreference("misc.logcat").setOnPreferenceClickListener {
val activity = activity!! val context = requireContext()
val logDir = File(activity.cacheDir, "log") val logDir = File(context.cacheDir, "log")
logDir.mkdir() logDir.mkdir()
val logFile = File.createTempFile("vpnhotspot-", ".log", logDir) val logFile = File.createTempFile("vpnhotspot-", ".log", logDir)
logFile.outputStream().use { out -> logFile.outputStream().use { out ->
@@ -55,7 +60,7 @@ class SettingsPreferenceFragment : PreferenceFragmentCompatDividers() {
.setType("text/x-log") .setType("text/x-log")
.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
.putExtra(Intent.EXTRA_STREAM, .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))) getString(R.string.abc_shareactionprovider_share_with)))
true true
} }

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

@@ -129,13 +129,13 @@ class TetheringFragment : Fragment(), ServiceConnection {
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
val context = context!! val context = requireContext()
context.registerReceiver(receiver, intentFilter(ConnectivityManagerHelper.ACTION_TETHER_STATE_CHANGED)) context.registerReceiver(receiver, intentFilter(ConnectivityManagerHelper.ACTION_TETHER_STATE_CHANGED))
context.bindService(Intent(context, TetheringService::class.java), this, Context.BIND_AUTO_CREATE) context.bindService(Intent(context, TetheringService::class.java), this, Context.BIND_AUTO_CREATE)
} }
override fun onStop() { override fun onStop() {
val context = context!! val context = requireContext()
context.unbindService(this) context.unbindService(this)
context.unregisterReceiver(receiver) context.unregisterReceiver(receiver)
super.onStop() super.onStop()