diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt index 9dc697e2..70ba68b9 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt @@ -138,14 +138,13 @@ class SettingsPreferenceFragment : PreferenceFragmentCompat() { .filter { try { it.isUp && !it.isLoopback && it.interfaceAddresses.isNotEmpty() - } catch (e: SocketException) { - Timber.d(e) + } catch (_: SocketException) { false } } .map { it.name }.sorted().toList().toTypedArray() } catch (e: SocketException) { - Timber.d(e) + Timber.w(e) emptyArray() }) setTargetFragment(this@SettingsPreferenceFragment, 0) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt index f1b0d783..fbc1504a 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt @@ -50,7 +50,7 @@ class RepeaterManager(private val parent: TetheringFragment) : Manager(), Servic val addresses: CharSequence @Bindable get() { return try { NetworkInterface.getByName(p2pInterface ?: return "")?.formatAddresses() ?: "" - } catch (e: SocketException) { + } catch (_: SocketException) { "" } } diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt index ec392310..8092d93a 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt @@ -54,7 +54,7 @@ class TetheringFragment : Fragment(), ServiceConnection { ifaceLookup = try { NetworkInterface.getNetworkInterfaces().asSequence().associateBy { it.name } } catch (e: SocketException) { - Timber.d(e) + Timber.w(e) emptyMap() } this@TetheringFragment.enabledTypes = diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt index 4b1ded8f..8015d9b1 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt @@ -57,9 +57,7 @@ data class IpNeighbour(val ip: InetAddress, val dev: String, val lladdr: String, val iface = NetworkInterface.getByIndex(index) if (iface == null) Timber.w("Failed to find network interface #$index") else return listOf(IpNeighbour(ip, iface.name, lladdr, state), result) - } catch (e: SocketException) { - Timber.d(e) - } + } catch (_: SocketException) { } listOf(result) } catch (e: Exception) { Timber.w(IllegalArgumentException("Unable to parse line: $line", e)) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt b/mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt index 391f3faf..d127bf8d 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt @@ -50,8 +50,7 @@ fun NetworkInterface.formatAddresses() = .toList() + listOfNotNull(try { hardwareAddress?.joinToString(":") { "%02x".format(it) } - } catch (e: SocketException) { - Timber.w(e) + } catch (_: SocketException) { null })) .joinToString("\n")