Flutter Version Upgrade. Code Fix but Testing Pending

osociety · Aug 8, 2022 · 1a50a40 · 1a50a40
1 parent 43b2ab3
commit 1a50a40
Show file tree

Hide file tree

Showing 19 changed files with 179 additions and 56 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -57,12 +57,18 @@ android {
     buildTypes {
         release {
             signingConfig signingConfigs.release
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
     flavorDimensions "deploy"
 
     productFlavors { 
+        dev {
+            dimension "deploy"
+            signingConfig signingConfigs.debug
+        }
         fdroid {
             dimension "deploy"
             signingConfig signingConfigs.release

diff --git a/android/build.gradle b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.0-rc01'
+        classpath 'com.android.tools.build:gradle:7.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart
@@ -4,6 +4,7 @@
 
 // ignore_for_file: directives_ordering
 // ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: depend_on_referenced_packages
 
 import 'package:network_info_plus_web/network_info_plus_web.dart';
 import 'package:package_info_plus_web/package_info_plus_web.dart';

diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart
@@ -10,8 +10,8 @@ import 'package:vernet/models/wifi_info.dart';
 import 'package:vernet/pages/dns/dns_page.dart';
 import 'package:vernet/pages/dns/reverse_dns_page.dart';
 import 'package:vernet/pages/host_scan_page/host_scan_page.dart';
-import 'package:vernet/pages/network_troubleshoot/ping_page.dart';
-import 'package:vernet/pages/network_troubleshoot/port_scan_page.dart';
+import 'package:vernet/pages/ping_page/ping_page.dart';
+import 'package:vernet/pages/port_scan_page/port_scan_page.dart';
 import 'package:vernet/ui/custom_tile.dart';
 
 class HomePage extends StatefulWidget {
@@ -133,7 +133,7 @@ class _WifiDetailState extends State<HomePage> {
                           Navigator.push(
                             context,
                             MaterialPageRoute(
-                              builder: (context) => const PortScanPage(),
+                              builder: (context) => PortScanPage(),
                             ),
                           );
                         },

diff --git a/lib/pages/host_scan_page/device_in_the_network.dart b/lib/pages/host_scan_page/device_in_the_network.dart
@@ -9,7 +9,7 @@ import 'package:network_tools/network_tools.dart';
 class DeviceInTheNetwork {
   /// Create basic device with default (not the correct) icon
   DeviceInTheNetwork({
-    required this.ip,
+    required this.internetAddress,
     required this.make,
     required this.pingData,
     this.iconData = Icons.devices,
@@ -23,9 +23,9 @@ class DeviceInTheNetwork {
     required String gatewayIp,
   }) {
     return DeviceInTheNetwork.createWithAllNecessaryFields(
-      ip: activeHost.ip,
+      internetAddress: activeHost.internetAddress,
       hostId: activeHost.hostId,
-      make: activeHost.make,
+      make: activeHost.hostName,
       pingData: activeHost.pingData,
       currentDeviceIp: currentDeviceIp,
       gatewayIp: gatewayIp,
@@ -34,28 +34,28 @@ class DeviceInTheNetwork {
 
   /// Create the object with the correct field and icon
   factory DeviceInTheNetwork.createWithAllNecessaryFields({
-    required String ip,
-    required int hostId,
-    required String make,
+    required InternetAddress internetAddress,
+    required String hostId,
+    required Future<String?> make,
     required PingData pingData,
     required String currentDeviceIp,
     required String gatewayIp,
   }) {
     final IconData iconData = getHostIcon(
       currentDeviceIp: currentDeviceIp,
-      hostIp: ip,
+      hostIp: internetAddress.address,
       gatewayIp: gatewayIp,
     );
 
-    final String deviceMake = getDeviceMake(
+    final Future<String?> deviceMake = getDeviceMake(
       currentDeviceIp: currentDeviceIp,
-      hostIp: ip,
+      hostIp: internetAddress.address,
       gatewayIp: gatewayIp,
       hostMake: make,
     );
 
     return DeviceInTheNetwork(
-      ip: ip,
+      internetAddress: internetAddress,
       make: deviceMake,
       pingData: pingData,
       hostId: hostId,
@@ -64,22 +64,22 @@ class DeviceInTheNetwork {
   }
 
   /// Ip of the device
-  final String ip;
-  final String make;
+  final InternetAddress internetAddress;
+  final Future<String?> make;
   final PingData pingData;
   final IconData iconData;
-  int? hostId;
+  String? hostId;
 
-  static String getDeviceMake({
+  static Future<String?> getDeviceMake({
     required String currentDeviceIp,
     required String hostIp,
     required String gatewayIp,
-    required String hostMake,
+    required Future<String?> hostMake,
   }) {
     if (currentDeviceIp == hostIp) {
-      return 'This device';
+      return Future.value('This device');
     } else if (gatewayIp == hostIp) {
-      return 'Router/Gateway';
+      return Future.value('Router/Gateway');
     }
     return hostMake;
   }

diff --git a/lib/pages/host_scan_page/host_scna_bloc/host_scan_bloc.dart b/lib/pages/host_scan_page/host_scna_bloc/host_scan_bloc.dart
@@ -75,10 +75,10 @@ class HostScanBloc extends Bloc<HostScanEvent, HostScanState> {
 
             activeHostList.add(tempDeviceInTheNetwork);
             activeHostList.sort((a, b) {
-              final int aIp =
-                  int.parse(a.ip.substring(a.ip.lastIndexOf('.') + 1));
-              final int bIp =
-                  int.parse(b.ip.substring(b.ip.lastIndexOf('.') + 1));
+              final int aIp = int.parse(a.internetAddress.address
+                  .substring(a.internetAddress.address.lastIndexOf('.') + 1));
+              final int bIp = int.parse(b.internetAddress.address
+                  .substring(b.internetAddress.address.lastIndexOf('.') + 1));
               return aIp.compareTo(bIp);
             });
             emit(const HostScanState.loadInProgress());
@@ -114,7 +114,8 @@ class HostScanBloc extends Bloc<HostScanEvent, HostScanState> {
 
       /// Will contain all the hosts that got discovered in the network, will
       /// be use inorder to cancel on dispose of the page.
-      final Stream<ActiveHost> hostsDiscoveredInNetwork = HostScanner.discover(
+      final Stream<ActiveHost> hostsDiscoveredInNetwork =
+          HostScanner.getAllPingableDevices(
         subnetIsolate,
         firstSubnet: firstSubnetIsolate,
         lastSubnet: lastSubnetIsolate,

diff --git a/lib/pages/host_scan_page/widgets/host_scan_widget.dart b/lib/pages/host_scan_page/widgets/host_scan_widget.dart
@@ -3,7 +3,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:vernet/pages/host_scan_page/device_in_the_network.dart';
 import 'package:vernet/pages/host_scan_page/host_scna_bloc/host_scan_bloc.dart';
-import 'package:vernet/pages/network_troubleshoot/port_scan_page.dart';
+import 'package:vernet/pages/port_scan_page/port_scan_page.dart';
 
 class HostScanWidget extends StatelessWidget {
   @override
@@ -48,23 +48,29 @@ class HostScanWidget extends StatelessWidget {
                       final DeviceInTheNetwork host = activeHostList[index];
                       return ListTile(
                         leading: Icon(host.iconData),
-                        title: Text(host.make),
-                        subtitle: Text(host.ip),
+                        title: FutureBuilder(
+                          future: host.make,
+                          builder: (context, AsyncSnapshot<String?> snapshot) {
+                            return Text(snapshot.data ?? '');
+                          },
+                        ),
+                        subtitle: Text(host.internetAddress.address),
                         trailing: IconButton(
                           tooltip: 'Scan open ports for this target',
                           icon: const Icon(Icons.radar),
                           onPressed: () {
                             Navigator.push(
                               context,
                               MaterialPageRoute(
-                                builder: (context) =>
-                                    PortScanPage(target: host.ip),
+                                builder: (context) => PortScanPage(
+                                    target: host.internetAddress.address),
                               ),
                             );
                           },
                         ),
                         onLongPress: () {
-                          Clipboard.setData(ClipboardData(text: host.ip));
+                          Clipboard.setData(ClipboardData(
+                              text: host.internetAddress.address));
                           ScaffoldMessenger.of(context).showSnackBar(
                             const SnackBar(
                               content: Text('IP copied to clipboard'),

diff --git a/lib/pages/network_troubleshoot/port_scan_page.dart b/lib/pages/network_troubleshoot/port_scan_page.dart
@@ -9,8 +9,8 @@ import 'package:vernet/models/port.dart';
 import 'package:vernet/ui/custom_tile.dart';
 import 'package:vernet/ui/popular_chip.dart';
 
-class PortScanPage extends StatefulWidget {
-  const PortScanPage({Key? key, this.target = ''}) : super(key: key);
+class _PortScanPage extends StatefulWidget {
+  const _PortScanPage({Key? key, this.target = ''}) : super(key: key);
 
   final String target;
 
@@ -20,11 +20,12 @@ class PortScanPage extends StatefulWidget {
 
 enum ScanType { single, top, range }
 
-class _PortScanPageState extends State<PortScanPage>
+class _PortScanPageState extends State<_PortScanPage>
     with SingleTickerProviderStateMixin {
   final Set<OpenPort> _openPorts = {};
   final Map<String, Port> _allPorts = {};
   double _progress = 0;
+
   final TextEditingController _targetIPEditingController =
       TextEditingController();
   final TextEditingController _singlePortEditingController =
@@ -55,12 +56,10 @@ class _PortScanPageState extends State<PortScanPage>
     }
   }
 
-  void _handleEvent(OpenPort port) {
-    if (port.isOpen) {
-      setState(() {
-        _openPorts.add(port);
-      });
-    }
+  void _handleEvent(ActiveHost? host) {
+    setState(() {
+      _openPorts.addAll(host!.openPort);
+    });
   }
 
   void _handleOnDone() {
@@ -70,7 +69,7 @@ class _PortScanPageState extends State<PortScanPage>
     if (_completed && _openPorts.isEmpty) _showSnackBar('No open ports found');
   }
 
-  StreamSubscription<OpenPort>? _streamSubscription;
+  StreamSubscription<ActiveHost>? _streamSubscription;
   bool _completed = true;
   void _startScanning() {
     setState(() {
@@ -92,7 +91,8 @@ class _PortScanPageState extends State<PortScanPage>
         progressCallback: _handleProgress,
       ).listen(_handleEvent, onDone: _handleOnDone);
     } else {
-      _streamSubscription = PortScanner.discover(
+      //TODO: uncomment
+      _streamSubscription = PortScanner.scanPortsForSingleDevice(
         _targetIPEditingController.text,
         startPort: int.parse(_startPortEditingController.text),
         endPort: int.parse(_endPortEditingController.text),

diff --git a/lib/pages/ping_page/bloc/ping_bloc.dart b/lib/pages/ping_page/bloc/ping_bloc.dart
@@ -0,0 +1,17 @@
+import 'package:bloc/bloc.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'ping_event.dart';
+part 'ping_state.dart';
+part 'ping_bloc.freezed.dart';
+
+class PingBloc extends Bloc<PingEvent, PingState> {
+  PingBloc() : super(PingState.initial()) {
+    on<StartPing>(_startPing);
+    on<StopPing>(_stopPing);
+  }
+
+  _startPing(StartPing event, Emitter<PingState> emit) {}
+
+  _stopPing(StopPing event, Emitter<PingState> emit) {}
+}
diff --git a/lib/pages/ping_page/bloc/ping_event.dart b/lib/pages/ping_page/bloc/ping_event.dart
@@ -0,0 +1,7 @@
+part of 'ping_bloc.dart';
+
+@freezed
+class PingEvent with _$PingEvent {
+  const factory PingEvent.startPing() = StartPing;
+  const factory PingEvent.stopPing() = StopPing;
+}
diff --git a/lib/pages/ping_page/bloc/ping_state.dart b/lib/pages/ping_page/bloc/ping_state.dart
@@ -0,0 +1,9 @@
+part of 'ping_bloc.dart';
+
+@freezed
+class PingState with _$PingState {
+  const factory PingState.initial() = _Initial;
+  const factory PingState.pingRunning() = _PingRunning;
+  const factory PingState.pingStopped() = _PingStopped;
+  const factory PingState.pingCompleted() = _PingCompleted;
+}
diff --git a/...pages/network_troubleshoot/ping_page.dart → lib/pages/ping_page/ping_page.dart b/...pages/network_troubleshoot/ping_page.dart → lib/pages/ping_page/ping_page.dart
diff --git a/lib/pages/port_scan_page/port_scan_bloc/port_scan_bloc.dart b/lib/pages/port_scan_page/port_scan_bloc/port_scan_bloc.dart
@@ -0,0 +1,30 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:injectable/injectable.dart';
+import 'package:network_tools/network_tools.dart';
+
+part 'port_scan_bloc.freezed.dart';
+part 'port_scan_event.dart';
+part 'port_scan_state.dart';
+
+@injectable
+class PortScanBloc extends Bloc<PortScanEvent, PortScanState> {
+  PortScanBloc() : super(PortScanState.initial()) {
+    on<Initialized>(_initialized);
+    on<StartNewScan>(_startNewScan);
+    on<StopScan>(_stopScan);
+  }
+
+  Future<void> _initialized(Initialized event, Emitter<PortScanState> emit) {
+    emit(const PortScanState.loadInProgress());
+    return Future.delayed(Duration(microseconds: 1));
+  }
+
+  Future<void> _startNewScan(StartNewScan event, Emitter<PortScanState> emit) {
+    return Future.delayed(Duration(microseconds: 1));
+  }
+
+  Future<void> _stopScan(StopScan event, Emitter<PortScanState> emit) {
+    return Future.delayed(Duration(microseconds: 1));
+  }
+}
diff --git a/lib/pages/port_scan_page/port_scan_bloc/port_scan_event.dart b/lib/pages/port_scan_page/port_scan_bloc/port_scan_event.dart
@@ -0,0 +1,8 @@
+part of 'port_scan_bloc.dart';
+
+@freezed
+class PortScanEvent with _$PortScanEvent {
+  const factory PortScanEvent.initialized() = Initialized;
+  const factory PortScanEvent.startNewScan() = StartNewScan;
+  const factory PortScanEvent.stopScan() = StopScan;
+}
diff --git a/lib/pages/port_scan_page/port_scan_bloc/port_scan_state.dart b/lib/pages/port_scan_page/port_scan_bloc/port_scan_state.dart
@@ -0,0 +1,12 @@
+part of 'port_scan_bloc.dart';
+
+@freezed
+class PortScanState with _$PortScanState {
+  factory PortScanState.initial() = _Initial;
+  const factory PortScanState.loadInProgress() = _LoadInProgress;
+  const factory PortScanState.foundOpenPort(List<OpenPort> openPortList) =
+      FoundOpenPort;
+  const factory PortScanState.loadFailure() = _LoadFailure;
+  const factory PortScanState.noPortFound() = _NoPortFound;
+  const factory PortScanState.error() = Error;
+}
diff --git a/lib/pages/port_scan_page/port_scan_page.dart b/lib/pages/port_scan_page/port_scan_page.dart
@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+
+class PortScanPage extends StatefulWidget {
+  final String target;
+  const PortScanPage({Key? key, this.target = ''}) : super(key: key);
+
+  @override
+  State<PortScanPage> createState() => _PortScanPageState();
+}
+
+class _PortScanPageState extends State<PortScanPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Open Port Scanner'),
+      ),
+      body: Center(
+        child: Text('Hi'),
+      ),
+    );
+  }
+}