locked empty security tokens are locked, not empty

2017-09-28 17:00:00 +02:00
parent 3d473e05ad
commit 77856afc4f
1 changed files with 7 additions and 1 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenPresenter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenPresenter.java
@@ -165,8 +165,14 @@ class ManageSecurityTokenPresenter implements ManageSecurityTokenMvpPresenter {
    private void performKeyCheck() {
        boolean keyIsEmpty = tokenInfo.isEmpty();
        if (keyIsEmpty) {
-            view.statusLineOk();
+            boolean tokenIsAdminLocked = tokenInfo.getVerifyAdminRetries() == 0;
+            if (tokenIsAdminLocked) {
+                view.statusLineError();
+                view.showActionLocked(0);
+                return;
+            }

+            view.statusLineOk();
            view.showActionEmptyToken();
            return;
        }