Skip to content

Commit

Permalink
nullsafety
Browse files Browse the repository at this point in the history
  • Loading branch information
@joaovvrodrigues
joaovvrodrigues committed Mar 3, 2021
1 parent c655479 commit 2d4b9ad
Show file tree
Hide file tree
Showing 8 changed files with 135 additions and 201 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.1.2

* support nullsafety

## 1.1.1

* support swift 5
Expand Down
1 change: 1 addition & 0 deletions example/.flutter-plugins-dependencies
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_des","path":"/Users/joaov/StudioProjects/flutter_des/","dependencies":[]}],"android":[{"name":"flutter_des","path":"/Users/joaov/StudioProjects/flutter_des/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_des","dependencies":[]}],"date_created":"2021-03-03 20:18:02.320662","version":"2.0.0"}
13 changes: 13 additions & 0 deletions example/ios/Flutter/flutter_export_environment.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh
# This is a generated file; do not edit or check into version control.
export "FLUTTER_ROOT=/Users/joaov/flutter"
export "FLUTTER_APPLICATION_PATH=/Users/joaov/StudioProjects/flutter_des/example"
export "FLUTTER_TARGET=lib/main.dart"
export "FLUTTER_BUILD_DIR=build"
export "SYMROOT=${SOURCE_ROOT}/../build/ios"
export "FLUTTER_BUILD_NAME=1.0.0"
export "FLUTTER_BUILD_NUMBER=1"
export "DART_OBFUSCATION=false"
export "TRACK_WIDGET_CREATION=false"
export "TREE_SHAKE_ICONS=false"
export "PACKAGE_CONFIG=.packages"
148 changes: 53 additions & 95 deletions example/pubspec.lock
View file
Original file line number Diff line number Diff line change
@@ -1,69 +1,62 @@
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
archive:
dependency: transitive
description:
name: archive
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.11"
args:
dependency: transitive
description:
name: args
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.5.2"
async:
dependency: transitive
description:
name: async
url: "https://pub.flutter-io.cn"
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.0"
version: "2.5.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.flutter-io.cn"
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.5"
charcode:
version: "2.1.0"
characters:
dependency: transitive
description:
name: charcode
url: "https://pub.flutter-io.cn"
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.2"
collection:
version: "1.1.0"
charcode:
dependency: transitive
description:
name: collection
url: "https://pub.flutter-io.cn"
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.14.11"
convert:
version: "1.2.0"
clock:
dependency: transitive
description:
name: convert
url: "https://pub.flutter-io.cn"
name: clock
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
crypto:
version: "1.1.0"
collection:
dependency: transitive
description:
name: crypto
url: "https://pub.flutter-io.cn"
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.3"
version: "1.15.0"
cupertino_icons:
dependency: "direct main"
description:
name: cupertino_icons
url: "https://pub.flutter-io.cn"
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.2"
version: "1.2.0"
flutter:
dependency: "direct main"
description: flutter
Expand All @@ -75,61 +68,33 @@ packages:
path: ".."
relative: true
source: path
version: "1.1.1"
version: "1.1.2"
flutter_test:
dependency: "direct dev"
description: flutter
source: sdk
version: "0.0.0"
image:
dependency: transitive
description:
name: image
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.4"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.flutter-io.cn"
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.6"
version: "0.12.10"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.flutter-io.cn"
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.8"
version: "1.3.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.flutter-io.cn"
url: "https://pub.dartlang.org"
source: hosted
version: "1.6.4"
pedantic:
dependency: transitive
description:
name: pedantic
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.8.0+1"
petitparser:
dependency: transitive
description:
name: petitparser
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.4.0"
quiver:
dependency: transitive
description:
name: quiver
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.5"
version: "1.8.0"
sky_engine:
dependency: transitive
description: flutter
Expand All @@ -139,64 +104,57 @@ packages:
dependency: transitive
description:
name: source_span
url: "https://pub.flutter-io.cn"
url: "https://pub.dartlang.org"
source: hosted
version: "1.5.5"
version: "1.8.0"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.flutter-io.cn"
url: "https://pub.dartlang.org"
source: hosted
version: "1.9.3"
version: "1.10.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.flutter-io.cn"
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
version: "2.1.0"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.flutter-io.cn"
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.5"
version: "1.1.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.flutter-io.cn"
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
version: "1.2.0"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.flutter-io.cn"
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.11"
version: "0.2.19"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.flutter-io.cn"
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.6"
version: "1.3.0"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.8"
xml:
dependency: transitive
description:
name: xml
url: "https://pub.flutter-io.cn"
url: "https://pub.dartlang.org"
source: hosted
version: "3.5.0"
version: "2.1.0"
sdks:
dart: ">=2.4.0 <3.0.0"
dart: ">=2.12.0 <3.0.0"
22 changes: 11 additions & 11 deletions lib/flutter_des.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ const String _iv = '01234567';
class FlutterDes {
static const MethodChannel _channel = const MethodChannel('flutter_des');

static Future<Uint8List> encrypt(String string, String key,
static Future<Uint8List?> encrypt(String string, String key,
{String iv = _iv}) async {
if (string.isEmpty) {
return null;
}
final Uint8List crypt =
final Uint8List? crypt =
await _channel.invokeMethod('encrypt', [string, key, iv]);
return crypt;
}

static Future<String> encryptToHex(String string, String key,
static Future<String?> encryptToHex(String string, String key,
{String iv = _iv}) async {
if (string.isEmpty) {
return '';
}
final String crypt =
final String? crypt =
await _channel.invokeMethod('encryptToHex', [string, key, iv]);
return crypt;
}
Expand All @@ -34,27 +34,27 @@ class FlutterDes {
if (string.isEmpty) {
return '';
}
final String crypt = base64Encode(await encrypt(string, key, iv: iv));
final String crypt = base64Encode(await (encrypt(string, key, iv: iv) as FutureOr<List<int>>));
return crypt;
}

static Future<String> decrypt(Uint8List data, String key,
static Future<String?> decrypt(Uint8List data, String key,
{String iv = _iv}) async {
final String crypt =
final String? crypt =
await _channel.invokeMethod('decrypt', [data, key, iv]);
return crypt;
}

static Future<String> decryptFromHex(String hex, String key,
static Future<String?> decryptFromHex(String? hex, String key,
{String iv = _iv}) async {
final String crypt =
final String? crypt =
await _channel.invokeMethod('decryptFromHex', [hex, key, iv]);
return crypt;
}

static Future<String> decryptFromBase64(String base64, String key,
static Future<String?> decryptFromBase64(String base64, String key,
{String iv = _iv}) async {
final String crypt = await decrypt(base64Decode(base64), key, iv: iv);
final String? crypt = await decrypt(base64Decode(base64), key, iv: iv);
return crypt;
}
}
Loading

0 comments on commit 2d4b9ad

Please sign in to comment.