diff --git a/android/app/build.gradle b/android/app/build.gradle index 29e3443..cccb7d1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -11,16 +11,21 @@ if (localPropertiesFile.exists()) { localProperties.load(reader) } } +def flutterVersionName = localProperties.getProperty("flutter.versionName") +if (flutterVersionName == null) { + flutterVersionName = "1.0" +} -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +def flutterVersionCode = localProperties.getProperty("flutter.versionCode") if (flutterVersionCode == null) { - flutterVersionCode = '1' + flutterVersionCode = "1" } - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' +def str = "" +for (element in flutterVersionName.split("\\.")) { + str += element.toString().padLeft(2, "0") } +flutterVersionCode = str + flutterVersionCode.padLeft(2, "0") //Use 4 left pads, to be compatible with the old mobile client versioning stuff + def keystoreProperties = new Properties() diff --git a/lib/pages/registration.dart b/lib/pages/registration.dart index 6a8fc7a..1e7ed00 100644 --- a/lib/pages/registration.dart +++ b/lib/pages/registration.dart @@ -95,7 +95,6 @@ class RegistrationState extends ConsumerState { String? _validatePassword(String? value) { var errorCode = PasswordService.checkNewPassword(value ?? ""); - String errorText = ""; if (errorCode != PasswordErrorCode.none) { switch (errorCode) { case PasswordErrorCode.empty: @@ -108,7 +107,7 @@ class RegistrationState extends ConsumerState { return NSSLStrings.of(context).passwordMissingCharactersError(); } } - return errorText; + return null; } String? _validatePassword2(String? value) { diff --git a/pubspec.yaml b/pubspec.yaml index 80ce4b6..a9ce0b4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: nssl description: An app for handling shopping lists -version: 0.41.0+0 +version: 0.41.1+1 environment: sdk: '>=3.8.0 <4.0.0'