diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt index d4227c2c..2656c1d3 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt @@ -148,7 +148,6 @@ const val ERROR_MOBIDZIENNIK_WEB_SERVER_PROBLEM = 218 const val ERROR_LOGIN_VULCAN_INVALID_SYMBOL = 301 const val ERROR_LOGIN_VULCAN_INVALID_TOKEN = 302 -const val ERROR_LOGIN_VULCAN_INVALID_PIN = 309 const val ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING = 310 const val ERROR_LOGIN_VULCAN_INVALID_PIN_1_REMAINING = 311 const val ERROR_LOGIN_VULCAN_INVALID_PIN_2_REMAINING = 312 diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginInfo.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginInfo.kt index 6ac41bcf..cf632af5 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginInfo.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginInfo.kt @@ -147,7 +147,8 @@ object LoginInfo { emptyText = R.string.login_error_no_token, invalidText = R.string.login_error_incorrect_token, errorCodes = mapOf( - ERROR_LOGIN_VULCAN_INVALID_TOKEN to R.string.login_error_incorrect_token + ERROR_LOGIN_VULCAN_INVALID_TOKEN to R.string.login_error_incorrect_token, + ERROR_LOGIN_VULCAN_EXPIRED_TOKEN to R.string.login_error_expired_token ), isRequired = true, validationRegex = "[A-Z0-9]{5,12}", @@ -173,16 +174,16 @@ object LoginInfo { emptyText = R.string.login_error_no_pin, invalidText = R.string.login_error_incorrect_pin, errorCodes = mapOf( - ERROR_LOGIN_VULCAN_INVALID_PIN to R.string.login_error_incorrect_pin + ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING to R.string.error_310_reason, + ERROR_LOGIN_VULCAN_INVALID_PIN_1_REMAINING to R.string.error_311_reason, + ERROR_LOGIN_VULCAN_INVALID_PIN_2_REMAINING to R.string.error_312_reason ), isRequired = true, validationRegex = "[0-9]+", caseMode = FormField.CaseMode.LOWER_CASE ) ), - errorCodes = mapOf( - ERROR_LOGIN_VULCAN_EXPIRED_TOKEN to R.string.login_error_expired_token - ) + errorCodes = mapOf() ), Mode( loginMode = LOGIN_MODE_VULCAN_WEB,