From 77856afc4fe7ca2b75357e746bee157c4e102833 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 28 Sep 2017 17:00:00 +0200
Subject: [PATCH] locked empty security tokens are locked, not empty

---
 .../keychain/ui/token/ManageSecurityTokenPresenter.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenPresenter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/ManageSecurityTokenPresenter.java
index d8f514fae..2eeef8bca 100644
--- 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;
         }