Forráskód Böngészése

migrated validator_util.dart to null safety

ashilkn 2 éve
szülő
commit
e51cdb78ef
2 módosított fájl, 7 hozzáadás és 9 törlés
  1. 2 2
      lib/models/key_attributes.dart
  2. 5 7
      lib/utils/validator_util.dart

+ 2 - 2
lib/models/key_attributes.dart

@@ -7,8 +7,8 @@ class KeyAttributes {
   final String publicKey;
   final String encryptedSecretKey;
   final String secretKeyDecryptionNonce;
-  final int memLimit;
-  final int opsLimit;
+  final int? memLimit;
+  final int? opsLimit;
   final String masterKeyEncryptedWithRecoveryKey;
   final String masterKeyDecryptionNonce;
   final String recoveryKeyEncryptedWithMasterKey;

+ 5 - 7
lib/utils/validator_util.dart

@@ -1,5 +1,3 @@
-// @dart=2.9
-
 import 'dart:convert';
 import 'dart:typed_data';
 
@@ -9,9 +7,9 @@ import 'package:photos/models/key_attributes.dart';
 Logger _logger = Logger("Validator");
 
 void validatePreVerificationStateCheck(
-  KeyAttributes keyAttr,
-  String password,
-  String encryptedToken,
+  KeyAttributes? keyAttr,
+  String? password,
+  String? encryptedToken,
 ) {
   nullOrEmptyArgCheck(encryptedToken, "encryptedToken");
   nullOrEmptyArgCheck(password, "userPassword");
@@ -32,7 +30,7 @@ void validatePreVerificationStateCheck(
   }
   // check password encoding issues
   try {
-    final Uint8List passwordL = utf8.encode(password);
+    final Uint8List passwordL = utf8.encode(password!) as Uint8List;
     try {
       utf8.decode(passwordL);
     } catch (e) {
@@ -45,7 +43,7 @@ void validatePreVerificationStateCheck(
   }
 }
 
-void nullOrEmptyArgCheck(String value, String name) {
+void nullOrEmptyArgCheck(String? value, String name) {
   if (value == null || value.isEmpty) {
     throw ArgumentError("Critical: $name is nullOrEmpty");
   }