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

Decrease intentFilter

Browse Source
This commit is contained in:
Mygod
2018-05-09 16:00:56 -07:00
parent a5fa9d8801
commit 99d6090ee4
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package be.mygod.vpnhotspot package be.mygod.vpnhotspot
import android.content.Intent import android.content.Intent
import android.content.IntentFilter
import android.net.wifi.WifiManager import android.net.wifi.WifiManager
import android.os.Binder import android.os.Binder
import android.support.annotation.RequiresApi import android.support.annotation.RequiresApi
@@ -10,7 +11,6 @@ import be.mygod.vpnhotspot.net.IpNeighbourMonitor
import be.mygod.vpnhotspot.net.TetheringManager import be.mygod.vpnhotspot.net.TetheringManager
import be.mygod.vpnhotspot.util.broadcastReceiver import be.mygod.vpnhotspot.util.broadcastReceiver
import be.mygod.vpnhotspot.util.debugLog import be.mygod.vpnhotspot.util.debugLog
import be.mygod.vpnhotspot.util.intentFilter
@RequiresApi(26) @RequiresApi(26)
class LocalOnlyHotspotService : IpNeighbourMonitoringService() { class LocalOnlyHotspotService : IpNeighbourMonitoringService() {
@@ -65,7 +65,7 @@ class LocalOnlyHotspotService : IpNeighbourMonitoringService() {
if (reservation == null) onFailed(-2) else { if (reservation == null) onFailed(-2) else {
this@LocalOnlyHotspotService.reservation = reservation this@LocalOnlyHotspotService.reservation = reservation
if (!receiverRegistered) { if (!receiverRegistered) {
registerReceiver(receiver, intentFilter(TetheringManager.ACTION_TETHER_STATE_CHANGED)) registerReceiver(receiver, IntentFilter(TetheringManager.ACTION_TETHER_STATE_CHANGED))
receiverRegistered = true receiverRegistered = true
} }
} }

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

@@ -33,7 +33,6 @@ import be.mygod.vpnhotspot.net.wifi.P2pSupplicantConfiguration
import be.mygod.vpnhotspot.net.wifi.WifiP2pDialog import be.mygod.vpnhotspot.net.wifi.WifiP2pDialog
import be.mygod.vpnhotspot.util.broadcastReceiver import be.mygod.vpnhotspot.util.broadcastReceiver
import be.mygod.vpnhotspot.util.formatAddresses import be.mygod.vpnhotspot.util.formatAddresses
import be.mygod.vpnhotspot.util.intentFilter
import java.net.NetworkInterface import java.net.NetworkInterface
import java.net.SocketException import java.net.SocketException
import java.util.* import java.util.*
@@ -186,7 +185,7 @@ class RepeaterFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClickL
val context = requireContext() 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(TetheringManager.ACTION_TETHER_STATE_CHANGED)) context.registerReceiver(receiver, IntentFilter(TetheringManager.ACTION_TETHER_STATE_CHANGED))
} }
override fun onStop() { override fun onStop() {

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

@@ -36,7 +36,6 @@ import be.mygod.vpnhotspot.net.TetheringManager
import be.mygod.vpnhotspot.net.wifi.WifiApManager import be.mygod.vpnhotspot.net.wifi.WifiApManager
import be.mygod.vpnhotspot.util.broadcastReceiver import be.mygod.vpnhotspot.util.broadcastReceiver
import be.mygod.vpnhotspot.util.formatAddresses import be.mygod.vpnhotspot.util.formatAddresses
import be.mygod.vpnhotspot.util.intentFilter
import java.lang.reflect.InvocationTargetException import java.lang.reflect.InvocationTargetException
import java.net.NetworkInterface import java.net.NetworkInterface
import java.net.SocketException import java.net.SocketException
@@ -369,7 +368,7 @@ class TetheringFragment : Fragment(), ServiceConnection {
is TetheringService.TetheringBinder -> { is TetheringService.TetheringBinder -> {
tetheringBinder = service tetheringBinder = service
service.fragment = this service.fragment = this
requireContext().registerReceiver(receiver, intentFilter(TetheringManager.ACTION_TETHER_STATE_CHANGED)) requireContext().registerReceiver(receiver, IntentFilter(TetheringManager.ACTION_TETHER_STATE_CHANGED))
while (false) { } while (false) { }
} }
is LocalOnlyHotspotService.HotspotBinder -> @TargetApi(26) { is LocalOnlyHotspotService.HotspotBinder -> @TargetApi(26) {

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

@@ -1,6 +1,7 @@
package be.mygod.vpnhotspot package be.mygod.vpnhotspot
import android.content.Intent import android.content.Intent
import android.content.IntentFilter
import android.os.Binder import android.os.Binder
import android.widget.Toast import android.widget.Toast
import be.mygod.vpnhotspot.App.Companion.app import be.mygod.vpnhotspot.App.Companion.app
@@ -9,7 +10,6 @@ import be.mygod.vpnhotspot.net.Routing
import be.mygod.vpnhotspot.net.TetheringManager import be.mygod.vpnhotspot.net.TetheringManager
import be.mygod.vpnhotspot.net.VpnMonitor import be.mygod.vpnhotspot.net.VpnMonitor
import be.mygod.vpnhotspot.util.broadcastReceiver import be.mygod.vpnhotspot.util.broadcastReceiver
import be.mygod.vpnhotspot.util.intentFilter
import java.net.InetAddress import java.net.InetAddress
import java.net.SocketException import java.net.SocketException
@@ -58,7 +58,7 @@ class TetheringService : IpNeighbourMonitoringService(), VpnMonitor.Callback {
} }
if (failed) Toast.makeText(this, getText(R.string.noisy_su_failure), Toast.LENGTH_SHORT).show() if (failed) Toast.makeText(this, getText(R.string.noisy_su_failure), Toast.LENGTH_SHORT).show()
} else if (!receiverRegistered) { } else if (!receiverRegistered) {
registerReceiver(receiver, intentFilter(TetheringManager.ACTION_TETHER_STATE_CHANGED)) registerReceiver(receiver, IntentFilter(TetheringManager.ACTION_TETHER_STATE_CHANGED))
app.cleanRoutings[this] = { app.cleanRoutings[this] = {
synchronized(routings) { synchronized(routings) {
for (iface in routings.keys) routings[iface] = null for (iface in routings.keys) routings[iface] = null