Dev -> Main

.github/workflows/flutter_release.yml

@@ -159,7 +159,6 @@ jobs:
           type: 'zip'
           filename: ${{ env.MACOS_ZIP }}
           directory: ${{ env.MACOS_BUILD_PATH }}
-          path: vernet.app
 
       - name: Install Node 18
         uses: actions/setup-node@v4
@@ -210,7 +209,6 @@ jobs:
           type: 'zip'
           filename: ${{ env.WINDOWS_ZIP }}
           directory: ${{  env.WINDOWS_BUILD_PATH }}
-          path: vernet.exe
 
       - name: Publish Windows Release
         uses: softprops/action-gh-release@v1

.github/workflows/flutter_test.yml

@@ -19,15 +19,20 @@ jobs:
       pull-requests: read
     # Set job outputs to values from filter step
     outputs:
-      lib: ${{ steps.filter.outputs.lib }}
-      test: ${{ steps.filter.outputs.test }}
-      android: ${{ steps.filter.outputs.android }}
-      linux: ${{ steps.filter.outputs.linux }}
-      macos: ${{ steps.filter.outputs.macos }}
-      yaml: ${{ steps.filter.outputs.yaml }}
-      windows: ${{ steps.filter.outputs.windows }}
+      lib: ${{ steps.filter.outputs.lib == 'true' }}
+      test: ${{ steps.filter.outputs.test == 'true' }}
+      android: ${{ steps.filter.outputs.android == 'true' }}
+      linux: ${{ steps.filter.outputs.linux == 'true' }}
+      macos: ${{ steps.filter.outputs.macos == 'true' }}
+      yaml: ${{ steps.filter.outputs.yaml == 'true' }}
+      windows: ${{ steps.filter.outputs.windows == 'true' }}
+      branch: ${{steps.extract_branch.outputs.branch}}
     steps:
     # For pull requests it's not necessary to checkout the code
+    - name: Extract branch name
+      shell: bash
+      run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+      id: extract_branch
     - uses: dorny/paths-filter@v3
       id: filter
       with:
@@ -49,16 +54,15 @@ jobs:
 
   flutter-test:
     name: 'Flutter Analyze + Test'
+    strategy:
+      matrix:
+        os: [macos, ubuntu, windows]
     needs: changes
-    if: ${{ needs.changes.outputs.lib == 'true' || needs.changes.outputs.test == 'true' || needs.changes.outputs.yaml == 'true' || needs.changes.outputs.android == 'true' || needs.changes.outputs.linux == 'true' || needs.changes.outputs.macos == 'true' || needs.changes.outputs.windows == 'true' }}
-    runs-on: macos-latest
+    if: ${{ needs.changes.outputs.lib  || needs.changes.outputs.test  || needs.changes.outputs.yaml  || needs.changes.outputs.android  || needs.changes.outputs.linux  || needs.changes.outputs.macos  || needs.changes.outputs.windows  }}
+    runs-on: ${{ matrix.os }}-latest
     steps:
       - name: Checkout
         uses: actions/[email protected]
-      - name: Extract branch name
-        shell: bash
-        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
-        id: extract_branch
       - name: Setup Java JDK
         uses: actions/[email protected]
         with:
@@ -97,21 +101,27 @@ jobs:
         run: flutter pub global activate coverage
       - name: Run tests
         run: flutter test
+      - name: Install Linux dependencies
+        if: ${{ (matrix.os == 'ubuntu') && (needs.changes.outputs.branch == 'dev')  && (needs.changes.outputs.lib  || needs.changes.outputs.test  || needs.changes.outputs.linux  || needs.changes.outputs.yaml ) }}
+        run: sudo apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev
       - name: Run integration tests
-        if: ${{ steps.extract_branch.outputs.branch == 'dev' }}
-        run: flutter test integration_test --coverage -d macos
+        if: needs.changes.outputs.branch == 'dev'
+        run: flutter test integration_test --coverage -d ${{ matrix.os == 'ubuntu' && 'linux' || matrix.os }} 
       - name: Upload Coverage to CodeCov
-        if: ${{ steps.extract_branch.outputs.branch == 'dev' }}
+        if: needs.changes.outputs.branch == 'dev'
         uses: codecov/codecov-action@v3
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           file: coverage/lcov.info
 
-  android-linux-build:
-    name: 'Build Android + Linux'
+  flutter_build:
+    name: 'Build flutter'
+    strategy:
+      matrix:
+        os: [macos, windows, ubuntu]
     needs: [changes, flutter-test]
-    if: ${{ needs.changes.outputs.lib == 'true' || needs.changes.outputs.test == 'true' || needs.changes.outputs.android == 'true' || needs.changes.outputs.linux == 'true' || needs.changes.outputs.yaml == 'true' }}
-    runs-on: ubuntu-latest
+    if: ${{ (needs.changes.outputs.lib  || needs.changes.outputs.test  || needs.changes.outputs.android  || needs.changes.outputs.linux  || needs.changes.outputs.macos  || needs.changes.outputs.windows  || needs.changes.outputs.yaml ) && (needs.changes.outputs.branch == 'dev') }}
+    runs-on: ${{ matrix.os }}-latest 
     steps:
       - name: Checkout
         uses: actions/[email protected]
@@ -141,53 +151,8 @@ jobs:
           restore-keys: |
             build-runner-${{ hashFiles('**/asset_graph.json', '**/*.dart', '**/pubspec.lock', '**/outputs.json') }}
             build-runner-
-      - name: Download pub dependencies
-        run: flutter pub get
-      - name: Run build_runner
-        run: flutter pub run build_runner build
-      - name: Build Android
-        if: ${{ needs.changes.outputs.lib == 'true' || needs.changes.outputs.test == 'true' || needs.changes.outputs.android == 'true' || needs.changes.outputs.yaml == 'true' }}
-        run: |
-          flutter build apk --debug --flavor dev
-
-      # Run only if test, lib, and linux folder is changed
-      - name: Install Linux dependencies
-        if: ${{ needs.changes.outputs.lib == 'true' || needs.changes.outputs.test == 'true' || needs.changes.outputs.linux == 'true' || needs.changes.outputs.yaml == 'true' }}
-        run: sudo apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev
-      - name: Build Linux 
-        if: ${{ needs.changes.outputs.lib == 'true' || needs.changes.outputs.test == 'true' || needs.changes.outputs.linux == 'true' || needs.changes.outputs.yaml == 'true' }}
-        run: flutter build linux
-
-  macos-build:
-    name: 'Build Macos'
-    needs: [changes, flutter-test]
-    if: ${{ needs.changes.outputs.lib == 'true' || needs.changes.outputs.test == 'true' || needs.changes.outputs.macos == 'true' || needs.changes.outputs.yaml == 'true' }}
-    runs-on: macos-latest
-    steps:
-      - name: Checkout
-        uses: actions/[email protected]
-      - name: Flutter action
-        uses: subosito/[email protected]
-        with:
-          channel: stable
-          cache: true
-          cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
-          cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
-          pub-cache-key: "flutter-pub-:os:-:channel:-:version:-:arch:-:hash:"
-          pub-cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
-      - name: Cache build runner
-        uses: actions/[email protected]
-        with:
-          path: |
-            **/.dart_tool
-            **/*.g.dart
-            **/*.mocks.dart
-            **/*.config.dart
-          key: build-runner-${{ hashFiles('**/asset_graph.json', '**/*.dart', '**/pubspec.lock', '**/outputs.json') }}
-          restore-keys: |
-            build-runner-${{ hashFiles('**/asset_graph.json', '**/*.dart', '**/pubspec.lock', '**/outputs.json') }}
-            build-runner-
       - name: Cache pods
+        if: ${{ (matrix.os == 'macos') && (needs.changes.outputs.branch == 'dev') && (needs.changes.outputs.lib  || needs.changes.outputs.test  || needs.changes.outputs.macos  || needs.changes.outputs.yaml  ) }}
         uses: actions/cache@v3
         with:
           path: macos/Pods
@@ -199,41 +164,15 @@ jobs:
         run: flutter pub get
       - name: Run build_runner
         run: flutter pub run build_runner build
-      - name: Build macos
-        run: flutter build macos
-
-  windows-build:
-    name: 'Build Windows'
-    needs: [changes, flutter-test]
-    if: ${{ needs.changes.outputs.lib == 'true' || needs.changes.outputs.test == 'true' || needs.changes.outputs.windows == 'true' || needs.changes.outputs.yaml == 'true' }}
-    runs-on: windows-latest
-    steps:
-      - name: Checkout
-        uses: actions/[email protected]
-      - name: Flutter action
-        uses: subosito/[email protected]
-        with:
-          channel: stable
-          cache: true
-          cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
-          cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
-          pub-cache-key: "flutter-pub-:os:-:channel:-:version:-:arch:-:hash:"
-          pub-cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
-      - name: Cache build runner
-        uses: actions/[email protected]
-        with:
-          path: |
-            **/.dart_tool
-            **/*.g.dart
-            **/*.mocks.dart
-            **/*.config.dart
-          key: build-runner-${{ hashFiles('**/asset_graph.json', '**/*.dart', '**/pubspec.lock', '**/outputs.json') }}
-          restore-keys: |
-            build-runner-${{ hashFiles('**/asset_graph.json', '**/*.dart', '**/pubspec.lock', '**/outputs.json') }}
-            build-runner-
-      - name: Download pub dependencies
-        run: flutter pub get
-      - name: Run build_runner
-        run: flutter pub run build_runner build
-      - name: Build windows
-        run: flutter build windows
+      - name: Build Android
+        if: ${{ (matrix.os == 'ubuntu') && (needs.changes.outputs.branch == 'dev')  && (needs.changes.outputs.lib  || needs.changes.outputs.test  || needs.changes.outputs.android  || needs.changes.outputs.yaml  )}}
+        run: |
+          flutter build apk --debug --flavor dev
+
+      # Run only if test, lib, and linux folder is changed
+      - name: Install Linux dependencies
+        if: ${{ (matrix.os == 'ubuntu') && (needs.changes.outputs.branch == 'dev')  && (needs.changes.outputs.lib  || needs.changes.outputs.test  || needs.changes.outputs.linux  || needs.changes.outputs.yaml ) }}
+        run: sudo apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev
+      - name: Build Linux 
+        if: ${{ (needs.changes.outputs.branch == 'dev') && (needs.changes.outputs.lib  || needs.changes.outputs.test  || needs.changes.outputs.linux  || needs.changes.outputs.macos  || needs.changes.outputs.windows  || needs.changes.outputs.yaml ) }}
+        run: flutter build ${{ matrix.os == 'ubuntu' && 'linux' || matrix.os }}

README.md

@@ -52,12 +52,19 @@ Note: macOS build hasn't been notarized yet.
 4. Extract downloaded zip file.
 5. Go to bundle folder and double click vernet file.
 
+### Instruction for Windows
+1. Star this repository.
+2. Download vernet-windows.zip from [releases](https://github.com/git-elliot/vernet/releases/latest)
+3. Extract downloaded zip file.
+4. Run vernet.exe
+5. Click on more info, tap on 'Run anyway'.
+5. Give permission if asked.
+
 ## Contributors Required
 
-1. Linux/Windows Tester
-2. Documenter
+1. Technical writer
 
-Drop mail at [email protected]
+Write us at [email protected]
 
 ## Publishing to F-droid
 You can follow this guide to publish your app to f-droid - https://op3nsoc13ty.blogspot.com/2021/06/publish-your-first-flutter-app-to-fdroid.html

android/fastlane/Fastfile

@@ -23,6 +23,18 @@ platform :android do
 
   desc "Submit a new Beta Build to Crashlytics Beta"
   lane :beta do
+    upload_to_play_store(skip_upload_metadata: true,
+    skip_upload_changelogs: true,
+    skip_upload_images: true,
+    skip_upload_screenshots: true,
+    track: 'beta', aab: '../build/app/outputs/bundle/storeRelease/app-store-release.aab')
+
+    # sh "your_script.sh"
+    # You can also use other beta testing services here
+  end
+
+  desc "Submit a new Beta Build to Crashlytics Beta"
+  lane :beta_full do
     upload_to_play_store(track: 'beta', aab: '../build/app/outputs/bundle/storeRelease/app-store-release.aab')
 
     # sh "your_script.sh"

android/fastlane/metadata/android/en-US/changelogs/30.txt

@@ -0,0 +1 @@
+Fixed dll files missing when running app on Windows

android/fastlane/metadata/android/en-US/changelogs/31.txt

@@ -0,0 +1,2 @@
+Compatibility issues fixed for windows
+Scan slowness improved

android/fastlane/metadata/android/en-US/changelogs/32.txt

@@ -0,0 +1,2 @@
+Compatibility issues fixed for windows
+Scan slowness improved

integration_test/app_test.dart

@@ -53,7 +53,7 @@ void main() {
       await tester.tap(devicesButton);
       await tester.pump();
       expect(find.byType(AdaptiveListTile), findsAny);
-      await tester.pumpAndSettle();
+      await tester.pumpAndSettle(const Duration(seconds: 20));
       await tester.pump();
       expect(find.byType(AdaptiveListTile), findsAtLeast(2));
 

lib/models/wifi_info.dart

@@ -22,15 +22,15 @@ class WifiInfo {
   static const String noWifiName = 'Wi-Fi';
 
   String get name {
-    if (_name == null || _name!.isEmpty) return noWifiName;
-    if (_name!.startsWith('"') && _name!.endsWith('"')) {
-      final array = _name!.split('"');
+    if (_name == null || _name.isEmpty) return noWifiName;
+    if (_name.startsWith('"') && _name.endsWith('"')) {
+      final array = _name.split('"');
       if (array.length > 1) {
         final wifiName = array[1];
         return wifiName.isEmpty ? noWifiName : wifiName;
       }
     }
-    return _name!;
+    return _name;
   }
 
   String get bssid => _bssid ?? defaultBSSID.first;

lib/pages/home_page.dart

@@ -45,9 +45,15 @@ class _WifiDetailState extends State<HomePage> {
     final wifiIP = await NetworkInfo().getWifiIP();
     final wifiBSSID = await NetworkInfo().getWifiBSSID();
     final wifiName = await NetworkInfo().getWifiName();
+    String? wifiGatewayIP;
+    try {
+      wifiGatewayIP = await NetworkInfo().getWifiGatewayIP();
+    } catch (e) {
+      debugPrint('Unimplemented error $e');
+    }
     final gatewayIp = appSettings.customSubnet.isNotEmpty
         ? appSettings.customSubnet
-        : await NetworkInfo().getWifiGatewayIP() ?? '';
+        : (wifiGatewayIP ?? wifiIP) ?? '';
     final bool isLocationOn = (Platform.isAndroid || Platform.isIOS) &&
         await Permission.location.serviceStatus.isEnabled;
     _wifiInfo = WifiInfo(

lib/pages/host_scan_page/host_scan_bloc/host_scan_bloc.dart

@@ -46,33 +46,51 @@ class HostScanBloc extends Bloc<HostScanEvent, HostScanState> {
     Initialized event,
     Emitter<HostScanState> emit,
   ) async {
+    final info = NetworkInfo();
     devicesSet.clear();
     mDnsDevices.clear();
     emit(const HostScanState.loadInProgress());
-    await initializeWifiParameters(emit);
-    if (appSettings.runScanOnStartup) {
-      add(const HostScanEvent.loadScan());
-    } else {
-      add(const HostScanEvent.startNewScan());
+    String? wifiGatewayIP;
+    try {
+      wifiGatewayIP = await info.getWifiGatewayIP();
+    } catch (e) {
+      debugPrint('Unimplemented error $e');
     }
-  }
-
-  Future<void> initializeWifiParameters(Emitter<HostScanState> emit) async {
-    final wifiGatewayIP = await NetworkInfo().getWifiGatewayIP();
-    ip = await NetworkInfo().getWifiIP();
+    ip = await info.getWifiIP();
+    final interface = await NetInterface.localInterface();
     if (appSettings.customSubnet.isNotEmpty) {
       gatewayIp = appSettings.customSubnet;
+      debugPrint('Taking gatewayIp from appSettings: $gatewayIp');
     } else if (wifiGatewayIP != null) {
       gatewayIp = wifiGatewayIP;
-    } else {
+      debugPrint(
+        'Taking gatewayIp from NetworkInfo().getWifiGatewayIP(): $gatewayIp',
+      );
+    } else if (ip != null) {
       // NetworkInfo().getWifiGatewayIP() is null on android 35, so fail-safe
       // to NetworkInfo().getWifiIP()
       gatewayIp = ip;
+      debugPrint('Taking gatewayIp from NetworkInfo().getWifiIP(): $gatewayIp');
+    } else if (interface != null) {
+      gatewayIp = interface.ipAddress;
+      debugPrint(
+        'Taking gatewayIp from NetInterface.localInterface(): $gatewayIp',
+      );
     }
     if (gatewayIp == null) {
       emit(const HostScanState.error());
+      return Future.error('Can not get wifi details');
     }
     subnet = gatewayIp!.substring(0, gatewayIp!.lastIndexOf('.'));
+    if (subnet == null) {
+      emit(const HostScanState.error());
+      return Future.error('Can not get wifi details');
+    }
+    if (appSettings.runScanOnStartup) {
+      add(const HostScanEvent.loadScan());
+    } else {
+      add(const HostScanEvent.startNewScan());
+    }
   }
 
   Future<void> _startNewScanBuiltInIsolate(