Merge remote-tracking branch 'refs/remotes/origin/dev'

# Conflicts:
#	benchmark/crypt_benchmark.dart
#	benchmark/models.dart

android/app/build.gradle

@@ -40,7 +40,7 @@ android {
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdk = 24
         targetSdk = flutter.targetSdkVersion
-        versionCode = 4
+        versionCode = 5
         versionName = "1.0.3"
     }
 

benchmark/crypt_benchmark.dart

@@ -1,27 +1,43 @@
+import 'dart:convert';
 import 'dart:io';
+import 'dart:typed_data';
 
-import 'package:convert/convert.dart';
+import 'package:safe_file_sender/benchmark/models.dart';
 import 'package:safe_file_sender/crypto/crypto.dart';
 
+final _file = File("${Directory.current.path}/files/input.exe");
+late Uint8List _testKey;
+
 void main() {
-  final start = DateTime.now().millisecondsSinceEpoch;
-  final userA = AppCrypto.generateECKeyPair();
-  final userB = AppCrypto.generateECKeyPair();
-  final sharedKey =
-      AppCrypto.deriveSharedSecret(userA.privateKey, userB.publicKey);
-
-  final file = File("${Directory.current.path}/files/input.exe");
-  final endDeriveSharedKey = DateTime.now().millisecondsSinceEpoch;
-  print("Benchmark derive shared key: ${(endDeriveSharedKey - start)}ms");
-  final hmac = AppCrypto.generateHMAC(sharedKey, file.readAsBytesSync());
-  print("HMAC ${hex.encode(hmac)}");
-  final end = DateTime.now().millisecondsSinceEpoch;
-  print("Benchmark generate HMAC: ${(end - start)}ms");
-
-  ///Benchmark encryption
-  final startEnc = DateTime.now().millisecondsSinceEpoch;
-  AppCrypto.encryptAES(file.readAsBytesSync(), sharedKey);
-  final endEnc = DateTime.now().millisecondsSinceEpoch;
-
-  print("Benchmark encryption: ${(endEnc - startEnc)}ms");
+  _testKey = base64Decode(
+      AppCrypto.encodeECPublicKey(AppCrypto.generateECKeyPair().publicKey));
+  _benchmarkSharedKey();
+  _benchmarkEncryption();
+  _benchmarkHmacGeneration();
+}
+
+void _benchmarkSharedKey() {
+  final benchmark = BenchmarkTimer("share key derive");
+
+  benchmark.run(() {
+    final userA = AppCrypto.generateECKeyPair();
+    final userB = AppCrypto.generateECKeyPair();
+    AppCrypto.deriveSharedSecret(userA.privateKey, userB.publicKey);
+  });
+}
+
+void _benchmarkHmacGeneration() {
+  final benchmark = BenchmarkTimer("hmac generation");
+
+  benchmark.run(() {
+    AppCrypto.generateHMAC(_testKey, _file.readAsBytesSync());
+  });
 }
+
+void _benchmarkEncryption() {
+  final benchmark = BenchmarkTimer("file encryption");
+  benchmark.run(() {
+    AppCrypto.encryptAES(_file.readAsBytesSync(), _testKey);
+  });
+}
+

benchmark/models.dart

@@ -0,0 +1,14 @@
+class BenchmarkTimer {
+  final String _name;
+
+  int run(Function() action) {
+    final start = DateTime.now().millisecondsSinceEpoch;
+    action.call();
+    final end = DateTime.now().millisecondsSinceEpoch;
+    final result = end - start;
+    print("Benchmark for ($_name): $result ms");
+    return result;
+  }
+
+  BenchmarkTimer(this._name);
+}

lib/io/socket_client.dart

@@ -1,10 +1,11 @@
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:background_downloader/background_downloader.dart';
 import 'package:dio/dio.dart';
 import 'package:safe_file_sender/dev/logger.dart';
 import 'package:safe_file_sender/io/downloader.dart';
+import 'package:safe_file_sender/models/base/base_event_listener.dart';
+import 'package:safe_file_sender/models/event_listeners.dart';
 import 'package:safe_file_sender/utils/file_utils.dart';
 import 'package:signalr_netcore/json_hub_protocol.dart';
 import 'package:signalr_netcore/signalr_client.dart';
@@ -147,17 +148,3 @@ class ConnectionClient {
     }
   }
 }
-
-abstract class BaseEventListeners {
-  Future<void> onPublicKeyReceived(String publicKey);
-
-  Future<void> onConnected();
-}
-
-abstract class ReceiverListeners extends BaseEventListeners {
-  Future<void> onIdentifierReceived(String publicKey);
-
-  Future<void> onFileReceived(String fileId, String fileName, String hmac);
-}
-
-abstract class SenderListeners extends BaseEventListeners {}

lib/models/base/base_event_listener.dart

@@ -0,0 +1,5 @@
+abstract class BaseEventListeners {
+  Future<void> onPublicKeyReceived(String publicKey);
+
+  Future<void> onConnected();
+}

lib/models/event_listeners.dart

@@ -0,0 +1,9 @@
+import 'package:safe_file_sender/models/base/base_event_listener.dart';
+
+abstract class ReceiverListeners extends BaseEventListeners {
+  Future<void> onIdentifierReceived(String publicKey);
+
+  Future<void> onFileReceived(String fileId, String fileName, String hmac);
+}
+
+abstract class SenderListeners extends BaseEventListeners {}

lib/receive_screen.dart

@@ -6,6 +6,7 @@ import 'package:flutter/services.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:pointycastle/ecc/api.dart';
 import 'package:safe_file_sender/io/socket_client.dart';
+import 'package:safe_file_sender/models/event_listeners.dart';
 import 'package:safe_file_sender/models/state_controller.dart';
 import 'package:safe_file_sender/utils/file_utils.dart';
 import 'package:safe_file_sender/utils/string_utils.dart';

lib/send_screen.dart

@@ -11,6 +11,7 @@ import 'package:receive_sharing_intent/receive_sharing_intent.dart';
 import 'package:safe_file_sender/crypto/crypto.dart';
 import 'package:safe_file_sender/dev/logger.dart';
 import 'package:safe_file_sender/io/socket_client.dart';
+import 'package:safe_file_sender/models/event_listeners.dart';
 import 'package:safe_file_sender/models/state_controller.dart';
 import 'package:safe_file_sender/utils/file_utils.dart';
 import 'package:safe_file_sender/utils/string_utils.dart';

lib/utils/file_utils.dart

@@ -1,5 +1,7 @@
 import 'dart:io';
 
+import 'package:safe_file_sender/dev/logger.dart';
+
 class FileUtils {
   static String fileName(String path) =>
       path.split(Platform.pathSeparator).last;
@@ -9,8 +11,10 @@ extension FileExt on File {
   bool safeDelete() {
     try {
       delete();
+      logMessage("File : $path deleted!");
       return true;
     } catch (e) {
+      logMessage("Delete $path error");
       return false;
     }
   }

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.3+3
+version: 1.0.3
 
 environment:
   sdk: '>=3.4.0 <4.0.0'