diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index 8ecfef39..4707c6d0 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -29,7 +29,7 @@ class ConfirmLogin extends StatefulWidget { class _ConfirmLogin extends State { final LocalAuthentication auth = LocalAuthentication(); - dynamic _availableBiometrics; + var _availableBiometrics; var sharedPref = new AppSharedPreferences(); bool authenticated; final authService = new AuthProvider(); @@ -271,9 +271,10 @@ class _ConfirmLogin extends State { if (type == 2 || type == 3) { fingrePrintBefore = type; } - this.selectedOption = user.logInType == 3 || user.logInType == 2 - ? user.logInType - : fingrePrintBefore != null ? fingrePrintBefore : type; + this.selectedOption = + (user != null && (user.logInType == 3 || user.logInType == 2)) + ? user.logInType + : fingrePrintBefore != null ? fingrePrintBefore : type; switch (type) { case 1: @@ -411,8 +412,9 @@ class _ConfirmLogin extends State { } setUser() async { - user = SelectDeviceIMEIRES.fromJson( - await sharedPref.getObject(IMEI_USER_DATA)); + if (await sharedPref.getObject(IMEI_USER_DATA) != null) + user = SelectDeviceIMEIRES.fromJson( + await sharedPref.getObject(IMEI_USER_DATA)); } setDefault() async {