fix update errors, add initNative to SodiumInit.init

Skycoder42 · Aug 17, 2021 · dd0f824 · dd0f824
1 parent c33fb35
commit dd0f824
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 17 deletions.
diff --git a/packages/sodium_libs/CHANGELOG.md b/packages/sodium_libs/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.0] - 2021-08-17
+### Added
+- `SodiumInit.init` can now be called with `initNative: false` to disable
+initialization of the native library, in case it has already been initialized
+### Changed
+- Updated minimum required `sodium` version to `1.1.0`
+
 ## [1.0.1] - 2021-07-13
 ### Fixed
 - Make links in README secure (pub.dev score)
@@ -23,4 +30,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Deprecated
 ### Removed
 ### Fixed
-### Security
+### Security
diff --git a/packages/sodium_libs/lib/src/platforms/sodium_android.dart b/packages/sodium_libs/lib/src/platforms/sodium_android.dart
@@ -7,6 +7,8 @@ import '../sodium_platform.dart';
 @internal
 class SodiumAndroid extends SodiumPlatform {
   @override
-  Future<Sodium> loadSodium() =>
-      SodiumInit.init(DynamicLibrary.open('libsodium.so'));
+  Future<Sodium> loadSodium({bool initNative = true}) => SodiumInit.init(
+        DynamicLibrary.open('libsodium.so'),
+        initNative: initNative,
+      );
 }
diff --git a/packages/sodium_libs/lib/src/platforms/sodium_ios.dart b/packages/sodium_libs/lib/src/platforms/sodium_ios.dart
@@ -28,6 +28,10 @@ class _SodiumIos implements Sodium {
   @override
   SecureKey secureRandom(int length) => _sodium.secureRandom(length);
 
+  @override
+  SecureKey secureHandle(dynamic nativeHandle) =>
+      _sodium.secureHandle(nativeHandle);
+
   @override
   Uint8List unpad(Uint8List buf, int blocksize) =>
       _sodium.unpad(buf, blocksize);
@@ -39,6 +43,8 @@ class _SodiumIos implements Sodium {
 @internal
 class SodiumIos extends SodiumPlatform {
   @override
-  Future<Sodium> loadSodium() => SodiumInit.init(DynamicLibrary.process())
-      .then((sodium) => _SodiumIos(sodium));
+  Future<Sodium> loadSodium({bool initNative = true}) => SodiumInit.init(
+        DynamicLibrary.process(),
+        initNative: initNative,
+      ).then((sodium) => _SodiumIos(sodium));
 }
diff --git a/packages/sodium_libs/lib/src/platforms/sodium_linux.dart b/packages/sodium_libs/lib/src/platforms/sodium_linux.dart
@@ -7,7 +7,10 @@ import '../sodium_platform.dart';
 @internal
 class SodiumLinux extends SodiumPlatform {
   @override
-  Future<Sodium> loadSodium() => SodiumInit.init(DynamicLibrary.process());
+  Future<Sodium> loadSodium({bool initNative = true}) => SodiumInit.init(
+        DynamicLibrary.process(),
+        initNative: initNative,
+      );
 
   @override
   String get updateHint =>

diff --git a/packages/sodium_libs/lib/src/platforms/sodium_macos.dart b/packages/sodium_libs/lib/src/platforms/sodium_macos.dart
@@ -28,6 +28,10 @@ class _SodiumMacos implements Sodium {
   @override
   SecureKey secureRandom(int length) => _sodium.secureRandom(length);
 
+  @override
+  SecureKey secureHandle(dynamic nativeHandle) =>
+      _sodium.secureHandle(nativeHandle);
+
   @override
   Uint8List unpad(Uint8List buf, int blocksize) =>
       _sodium.unpad(buf, blocksize);
@@ -39,6 +43,8 @@ class _SodiumMacos implements Sodium {
 @internal
 class SodiumMacos extends SodiumPlatform {
   @override
-  Future<Sodium> loadSodium() => SodiumInit.init(DynamicLibrary.process())
-      .then((sodium) => _SodiumMacos(sodium));
+  Future<Sodium> loadSodium({bool initNative = true}) => SodiumInit.init(
+        DynamicLibrary.process(),
+        initNative: initNative,
+      ).then((sodium) => _SodiumMacos(sodium));
 }
diff --git a/packages/sodium_libs/lib/src/platforms/sodium_web.dart b/packages/sodium_libs/lib/src/platforms/sodium_web.dart
@@ -27,7 +27,7 @@ class SodiumWeb extends SodiumPlatform {
   }
 
   @override
-  Future<Sodium> loadSodium() async {
+  Future<Sodium> loadSodium({bool initNative = true}) async {
     final completer = Completer<dynamic>();
 
     setProperty(
@@ -45,7 +45,10 @@ class SodiumWeb extends SodiumPlatform {
       ..src = 'sodium.js';
     document.head!.append(script);
 
-    return SodiumInit.init(await completer.future);
+    return SodiumInit.init(
+      await completer.future,
+      initNative: initNative,
+    );
   }
 
   @override

diff --git a/packages/sodium_libs/lib/src/platforms/sodium_windows.dart b/packages/sodium_libs/lib/src/platforms/sodium_windows.dart
@@ -7,8 +7,10 @@ import '../sodium_platform.dart';
 @internal
 class SodiumWindows extends SodiumPlatform {
   @override
-  Future<Sodium> loadSodium() =>
-      SodiumInit.init(DynamicLibrary.open('libsodium.dll'));
+  Future<Sodium> loadSodium({bool initNative = true}) => SodiumInit.init(
+        DynamicLibrary.open('libsodium.dll'),
+        initNative: initNative,
+      );
 
   @override
   String get updateHint => 'Please run `flutter clean` and rebuild the project '

diff --git a/packages/sodium_libs/lib/src/sodium_init.dart b/packages/sodium_libs/lib/src/sodium_init.dart
@@ -47,13 +47,18 @@ abstract class SodiumInit {
   ///
   /// **Note:** Calling this method multiple times will always return the same
   /// instance.
-  static Future<sodium.Sodium> init() => _instanceLock.synchronized(() async {
+  static Future<sodium.Sodium> init({
+    bool initNative = true,
+  }) =>
+      _instanceLock.synchronized(() async {
         if (_instance != null) {
           return _instance!;
         }
         WidgetsFlutterBinding.ensureInitialized();
         ensurePlatformRegistered();
-        _instance = await SodiumPlatform.instance.loadSodium();
+        _instance = await SodiumPlatform.instance.loadSodium(
+          initNative: initNative,
+        );
         if (!kReleaseMode) {
           if (_instance!.version < _expectedVersion) {
             // ignore: avoid_print

diff --git a/packages/sodium_libs/lib/src/sodium_platform.dart b/packages/sodium_libs/lib/src/sodium_platform.dart
@@ -39,7 +39,7 @@ abstract class SodiumPlatform extends PlatformInterface {
   ///
   /// Check out the sodium package documentation for details on how to obtain
   /// a native instance on each platform.
-  Future<Sodium> loadSodium();
+  Future<Sodium> loadSodium({bool initNative = true});
 
   /// A hint for the user if an outdated version of libsodium is detected.
   ///

diff --git a/packages/sodium_libs/pubspec.yaml b/packages/sodium_libs/pubspec.yaml
@@ -1,5 +1,5 @@
 name: sodium_libs
-version: 1.0.1
+version: 1.1.0
 description: Flutter companion package to sodium that provides the low-level libsodium binaries for easy use.
 homepage: https://github.com/Skycoder42/libsodium_dart_bindings
 
@@ -15,7 +15,7 @@ dependencies:
   js: ^0.6.3
   meta: ^1.3.0
   plugin_platform_interface: ^2.0.1
-  sodium: ^1.0.0
+  sodium: ^1.1.0
   synchronized: ^3.0.0
 
 dev_dependencies: