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

Refine finding default Wi-Fi interface

Browse Source
This commit is contained in:
Mygod
2018-01-05 00:53:55 +08:00
parent dc2db049c7
commit 7e30ddf26d
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,8 +3,11 @@ package be.mygod.vpnhotspot
import android.app.Application import android.app.Application
import android.app.NotificationChannel import android.app.NotificationChannel
import android.app.NotificationManager import android.app.NotificationManager
import android.content.SharedPreferences
import android.content.res.Resources
import android.os.Build import android.os.Build
import android.preference.PreferenceManager import android.preference.PreferenceManager
import java.net.NetworkInterface
class App : Application() { class App : Application() {
companion object { companion object {
@@ -17,7 +20,19 @@ class App : Application() {
if (Build.VERSION.SDK_INT >= 26) getSystemService(NotificationManager::class.java) if (Build.VERSION.SDK_INT >= 26) getSystemService(NotificationManager::class.java)
.createNotificationChannel(NotificationChannel(HotspotService.CHANNEL, .createNotificationChannel(NotificationChannel(HotspotService.CHANNEL,
"Hotspot Service", NotificationManager.IMPORTANCE_LOW)) "Hotspot Service", NotificationManager.IMPORTANCE_LOW))
pref = PreferenceManager.getDefaultSharedPreferences(this)
val wifiRegexes = resources.getStringArray(Resources.getSystem()
.getIdentifier("config_tether_wifi_regexs", "array", "android"))
.map { it.toPattern() }
wifiInterfaces = NetworkInterface.getNetworkInterfaces().asSequence()
.map { it.name }
.filter { ifname -> wifiRegexes.any { it.matcher(ifname).matches() } }
.sorted().toList().toTypedArray()
val wifiInterface = wifiInterfaces.singleOrNull()
if (wifiInterface != null && pref.getString(HotspotService.KEY_WIFI, null) == null)
pref.edit().putString(HotspotService.KEY_WIFI, wifiInterface).apply()
} }
val pref by lazy { PreferenceManager.getDefaultSharedPreferences(this) } lateinit var pref: SharedPreferences
lateinit var wifiInterfaces: Array<String>
} }

8
mobile/src/main/java/be/mygod/vpnhotspot/SettingsFragment.kt
View File

@@ -11,6 +11,7 @@ import android.support.customtabs.CustomTabsIntent
import android.support.v4.content.ContextCompat import android.support.v4.content.ContextCompat
import android.support.v4.content.LocalBroadcastManager import android.support.v4.content.LocalBroadcastManager
import android.support.v7.preference.Preference import android.support.v7.preference.Preference
import be.mygod.vpnhotspot.App.Companion.app
import be.mygod.vpnhotspot.preference.AlwaysAutoCompleteEditTextPreferenceDialogFragmentCompat import be.mygod.vpnhotspot.preference.AlwaysAutoCompleteEditTextPreferenceDialogFragmentCompat
import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompatDividers import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompatDividers
import java.net.NetworkInterface import java.net.NetworkInterface
@@ -56,11 +57,8 @@ class SettingsFragment : PreferenceFragmentCompatDividers(), ServiceConnection {
.filter { it.isUp && !it.isLoopback && it.interfaceAddresses.isNotEmpty() } .filter { it.isUp && !it.isLoopback && it.interfaceAddresses.isNotEmpty() }
.map { it.name }.sorted().toList().toTypedArray())) .map { it.name }.sorted().toList().toTypedArray()))
HotspotService.KEY_WIFI -> displayPreferenceDialog( HotspotService.KEY_WIFI -> displayPreferenceDialog(
AlwaysAutoCompleteEditTextPreferenceDialogFragmentCompat(), HotspotService.KEY_WIFI, AlwaysAutoCompleteEditTextPreferenceDialogFragmentCompat(), HotspotService.KEY_WIFI, Bundle()
Bundle().put(AlwaysAutoCompleteEditTextPreferenceDialogFragmentCompat.KEY_SUGGESTIONS, .put(AlwaysAutoCompleteEditTextPreferenceDialogFragmentCompat.KEY_SUGGESTIONS, app.wifiInterfaces))
NetworkInterface.getNetworkInterfaces().asSequence()
.filter { !it.isLoopback } // wlan0 is down in airplane mode
.map { it.name }.sorted().toList().toTypedArray()))
else -> super.onDisplayPreferenceDialog(preference) else -> super.onDisplayPreferenceDialog(preference)
} }