Migrate lib to null safety

example/pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.8.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -28,7 +28,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -87,7 +87,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
@@ -113,7 +113,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
@@ -148,7 +148,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
+    version: "0.4.2"
   typed_data:
     dependency: transitive
     description:

lib/virgil_e3kit.dart

@@ -1,24 +1,28 @@
 import 'dart:async';
-import 'dart:math';
 import 'dart:convert';
+import 'dart:math';
+
 import 'package:flutter/services.dart';
 
 typedef GetJWTCallback = Future<dynamic> Function();
-final MethodChannel globalChannel = MethodChannel('com.virgilsecurity/ethree');
+final MethodChannel globalChannel =
+    const MethodChannel('com.virgilsecurity/ethree');
 
 class Ethree {
   final MethodChannel _channel;
   final GetJWTCallback tokenCallback;
   final String identity;
 
   Ethree(this.identity, this.tokenCallback, this._channel) {
-    this._channel.setMethodCallHandler(this.handleMethodCall);
+    _channel.setMethodCallHandler(_handleMethodCall);
   }
 
-  static Future<Ethree> init(
-      String identity, GetJWTCallback tokenCallback) async {
+  static Future<Ethree?> init(
+    String identity,
+    GetJWTCallback tokenCallback,
+  ) async {
     final String channelID = getRandString(32);
-    bool result = await globalChannel
+    bool? result = await globalChannel
         .invokeMethod('init', {'channelID': channelID, 'identity': identity});
     if (result == false) {
       return null;
@@ -30,93 +34,108 @@ class Ethree {
     return ethree;
   }
 
-  Future<String> getIdentity() async {
+  Future<String?> getIdentity() {
     return _channel.invokeMethod('getIdentity');
   }
 
-  Future<bool> register() async {
+  Future<bool?> register() {
     return _channel.invokeMethod('register');
   }
 
-  Future<bool> unregister() async {
-    return _channel.invokeMethod("unregister");
+  Future<bool?> unregister() {
+    return _channel.invokeMethod('unregister');
   }
 
-  Future<bool> backupPrivateKey(String password) async {
-    return _channel.invokeMethod("backupPrivateKey", {"password": password});
+  Future<bool?> backupPrivateKey(String password) {
+    return _channel.invokeMethod('backupPrivateKey', {'password': password});
   }
 
-  Future<bool> changePassword(String oldPassword, String newPassword) async {
-    return _channel.invokeMethod("changePassword",
-        {"oldPassword": oldPassword, "newPassword": newPassword});
+  Future<bool?> changePassword(String oldPassword, String newPassword) {
+    return _channel.invokeMethod('changePassword', {
+      'oldPassword': oldPassword,
+      'newPassword': newPassword,
+    });
   }
 
-  Future<bool> resetPrivateKeyBackup() async {
-    return _channel.invokeMethod("resetPrivateKeyBackup");
+  Future<bool?> resetPrivateKeyBackup() {
+    return _channel.invokeMethod('resetPrivateKeyBackup');
   }
 
-  Future<bool> restorePrivateKey(String password) async {
-    return _channel.invokeMethod("restorePrivateKey", {'password': password});
+  Future<bool?> restorePrivateKey(String password) {
+    return _channel.invokeMethod('restorePrivateKey', {
+      'password': password,
+    });
   }
 
-  Future<bool> rotatePrivateKey() async {
-    return _channel.invokeMethod("rotatePrivateKey");
+  Future<bool?> rotatePrivateKey() {
+    return _channel.invokeMethod('rotatePrivateKey');
   }
 
-  Future<bool> hasLocalPrivateKey() async {
-    return _channel.invokeMethod("hasLocalPrivateKey");
+  Future<bool?> hasLocalPrivateKey() {
+    return _channel.invokeMethod('hasLocalPrivateKey');
   }
 
-  Future<bool> cleanup() async {
-    return _channel.invokeMethod("cleanup");
+  Future<bool?> cleanup() {
+    return _channel.invokeMethod('cleanup');
   }
 
-  Future<String> findUser(String identity) async {
-    final String card =
-        await _channel.invokeMethod('findUser', {'identity': identity});
+  Future<String?> findUser(String identity) async {
+    final String? card = await _channel.invokeMethod('findUser', {
+      'identity': identity,
+    });
 
     return card;
   }
 
-  Future<Map> findUsers(List<String> identities, bool forceReload) async {
-    Map users = await _channel.invokeMethod(
-        "findUsers", {"identities": identities, "forceReload": forceReload});
+  Future<Map?> findUsers(List<String> identities, bool forceReload) async {
+    Map? users = await _channel.invokeMethod('findUsers', {
+      'identities': identities,
+      'forceReload': forceReload,
+    });
 
     return users;
   }
 
-  Future<String> findCachedUser(String identity) async {
-    final String card =
-        await _channel.invokeMethod("findCachedUser", {'identity': identity});
+  Future<String?> findCachedUser(String identity) async {
+    final String? card = await _channel.invokeMethod('findCachedUser', {
+      'identity': identity,
+    });
 
     return card;
   }
 
-  Future<Map> findCachedUsers(List<String> identities) async {
-    final Map users = await _channel
-        .invokeMethod("findCachedUsers", {"identities": identities});
+  Future<Map?> findCachedUsers(List<String> identities) async {
+    final Map? users = await _channel.invokeMethod('findCachedUsers', {
+      'identities': identities,
+    });
 
     return users;
   }
 
-  Future<bool> updateCachedUsers() async {
-    return _channel.invokeMethod("updateCachedUsers");
+  Future<bool?> updateCachedUsers() {
+    return _channel.invokeMethod('updateCachedUsers');
   }
 
-  Future<String> authEncrypt(Map users, String data) async {
-    return _channel.invokeMethod("authEncrypt", {"users": users, "data": data});
+  Future<String?> authEncrypt(Map users, String data) {
+    return _channel.invokeMethod('authEncrypt', {
+      'users': users,
+      'data': data,
+    });
   }
 
-  Future<String> authDecrypt(String data, [String card = ""]) async {
-    return _channel.invokeMethod("authDecrypt", {"data": data, "card": card});
+  Future<String?> authDecrypt(String data, [String card = '']) {
+    return _channel.invokeMethod('authDecrypt', {
+      'data': data,
+      'card': card,
+    });
   }
 
-  Future<dynamic> handleMethodCall(MethodCall call) {
+  Future<dynamic> _handleMethodCall(MethodCall call) {
     switch (call.method) {
       case 'tokenCallback':
-        return this.tokenCallback();
+        return tokenCallback();
     }
-    return null;
+    return Future<dynamic>.error('Unknown method ${call.method}');
   }
 }
 

pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.8.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -28,7 +28,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -73,7 +73,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
@@ -92,7 +92,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
@@ -127,7 +127,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
+    version: "0.4.2"
   typed_data:
     dependency: transitive
     description:
@@ -143,5 +143,5 @@ packages:
     source: hosted
     version: "2.1.0"
 sdks:
-  dart: ">=2.12.0-0.0 <3.0.0"
+  dart: ">=2.12.0 <3.0.0"
   flutter: ">=1.20.0"

pubspec.yaml

@@ -5,7 +5,7 @@ homepage: https://virgilsecurity.com
 repository: https://github.com/VirgilSecurity/virgil-e3kit-flutter
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: '>=2.12.0 <3.0.0'
   flutter: ">=1.20.0"
 
 dependencies: