Merge pull request #199 from osociety/bug-fix-scan

Fix for scan for devices broken issue
osociety · Nov 3, 2024 · ec722aa · ec722aa
2 parents f7ba5e0 + 0b2aee0
commit ec722aa
Show file tree

Hide file tree

Showing 4 changed files with 1,351 additions and 6 deletions.
diff --git a/android/fastlane/metadata/android/en-US/changelogs/27.txt b/android/fastlane/metadata/android/en-US/changelogs/27.txt
@@ -0,0 +1 @@
+Bug fix for scan for devices not working
diff --git a/lib/pages/host_scan_page/host_scan_bloc/host_scan_bloc.dart b/lib/pages/host_scan_page/host_scan_bloc/host_scan_bloc.dart
@@ -50,18 +50,31 @@ class HostScanBloc extends Bloc<HostScanEvent, HostScanState> {
     deviceInTheNetworkList.clear();
     mDnsDevices.clear();
     emit(const HostScanState.loadInProgress());
-    ip = await NetworkInfo().getWifiIP();
-    gatewayIp = appSettings.customSubnet.isNotEmpty
-        ? appSettings.customSubnet
-        : await NetworkInfo().getWifiGatewayIP();
-    subnet = gatewayIp!.substring(0, gatewayIp!.lastIndexOf('.'));
+    await initializeWifiParameters(emit);
     if (appSettings.runScanOnStartup) {
       add(const HostScanEvent.loadScan());
     } else {
       add(const HostScanEvent.startNewScan());
     }
   }
 
+  Future<void> initializeWifiParameters(Emitter<HostScanState> emit) async {
+    final wifiGatewayIP = await NetworkInfo().getWifiGatewayIP();
+    if (appSettings.customSubnet.isNotEmpty) {
+      gatewayIp = appSettings.customSubnet;
+    } else if (wifiGatewayIP != null) {
+      gatewayIp = wifiGatewayIP;
+    } else {
+      // NetworkInfo().getWifiGatewayIP() is null on android 35, so fail-safe
+      // to NetworkInfo().getWifiIP()
+      gatewayIp = ip = await NetworkInfo().getWifiIP();
+    }
+    if (gatewayIp == null) {
+      emit(const HostScanState.error());
+    }
+    subnet = gatewayIp!.substring(0, gatewayIp!.lastIndexOf('.'));
+  }
+
   Future<void> _startNewScanBuiltInIsolate(
     StartNewScan event,
     Emitter<HostScanState> emit,