alteropen/streamyfin
1
0
Fork 0
mirror of https://github.com/streamyfin/streamyfin.git synced 2026-07-16 01:13:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Addressing PR comments

Browse Source 
Signed-off-by: Lance Chant <13349722+lancechant@users.noreply.github.com>
This commit is contained in:
Lance Chant
2026-07-15 08:29:18 +02:00
parent 64b9224b7a
commit c4b6390a5e
4 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/wifi-ssid/android/src/main/java/expo/modules/wifissid/WifiSsidModule.kt
View File

@@ -55,13 +55,13 @@ class WifiSsidModule : Module() {
* location-sensitive).
*/
private fun readWifi(): Pair<String?, Boolean> {
val appContext = context.applicationContext
val androidContext = context.applicationContext
var connectedToWifi = false
var ssid: String? = null
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
try {
val cm = appContext.getSystemService(Context.CONNECTIVITY_SERVICE) as? ConnectivityManager
val cm = androidContext.getSystemService(Context.CONNECTIVITY_SERVICE) as? ConnectivityManager
val caps = cm?.let { manager ->
manager.activeNetwork?.let { net -> manager.getNetworkCapabilities(net) }
}
@@ -72,11 +72,23 @@ class WifiSsidModule : Module() {
} catch (e: Exception) {
Log.e(TAG, "Error reading Wi-Fi via ConnectivityManager", e)
}
} else {
// Pre-Q (API 26–28): NetworkCapabilities/transportInfo aren't available, so
// detect a Wi-Fi connection via the legacy active-network API. Without this,
// connectedToWifi stays false on Android 8/9 even when connected, so the
// "connected but SSID hidden" state never surfaces there.
try {
val cm = androidContext.getSystemService(Context.CONNECTIVITY_SERVICE) as? ConnectivityManager
@Suppress("DEPRECATION")
connectedToWifi = cm?.activeNetworkInfo?.type == ConnectivityManager.TYPE_WIFI
} catch (e: Exception) {
Log.e(TAG, "Error reading Wi-Fi via ConnectivityManager (legacy)", e)
}
}
if (ssid == null && hasFineLocationPermission()) {
try {
val wm = appContext.getSystemService(Context.WIFI_SERVICE) as? WifiManager
val wm = androidContext.getSystemService(Context.WIFI_SERVICE) as? WifiManager
@Suppress("DEPRECATION")
ssid = wm?.connectionInfo?.ssid?.sanitize()
} catch (e: Exception) {

4
modules/wifi-ssid/ios/WifiSsidModule.swift
View File

@@ -41,6 +41,10 @@ public class WifiSsidModule: Module {
}
pathMonitor.start(queue: monitorQueue)
}
deinit {
pathMonitor.cancel()
}
#endif
public func definition() -> ModuleDefinition {