From 62ff9096f1905aa0bed573199543a79ba98cae89 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Tue, 21 Jan 2020 06:24:15 +0800
Subject: [PATCH] Remove unusable interfaces from suggestions

---
 .../vpnhotspot/SettingsPreferenceFragment.kt  | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
index ea4757fe..cdb93683 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt
@@ -30,8 +30,6 @@ import timber.log.Timber
 import java.io.File
 import java.io.IOException
 import java.io.PrintWriter
-import java.net.NetworkInterface
-import java.net.SocketException
 import kotlin.system.exitProcess
 
 class SettingsPreferenceFragment : PreferenceFragmentCompat() {
@@ -178,20 +176,9 @@ class SettingsPreferenceFragment : PreferenceFragmentCompat() {
         when (preference.key) {
             UpstreamMonitor.KEY, FallbackUpstreamMonitor.KEY ->
                 AlwaysAutoCompleteEditTextPreferenceDialogFragment().apply {
-                    setArguments(preference.key, try {
-                        NetworkInterface.getNetworkInterfaces().asSequence()
-                                .filter {
-                                    try {
-                                        it.isUp && !it.isLoopback && it.interfaceAddresses.isNotEmpty()
-                                    } catch (_: SocketException) {
-                                        false
-                                    }
-                                }
-                                .map { it.name }.sorted().toList().toTypedArray()
-                    } catch (e: SocketException) {
-                        Timber.d(e)
-                        emptyArray<String>()
-                    })
+                    setArguments(preference.key, app.connectivity.allNetworks.mapNotNull {
+                        app.connectivity.getLinkProperties(it)?.interfaceName
+                    }.toTypedArray())
                     setTargetFragment(this@SettingsPreferenceFragment, 0)
                 }.show(parentFragmentManager, preference.key)
             else -> super.onDisplayPreferenceDialog(preference)