From 4d9ce8e95b4604f753aa5f49fe2c243dc73a13a9 Mon Sep 17 00:00:00 2001
From: Nikita Mikhailov <nikita.s.mikhailov@gmail.com>
Date: Sat, 9 Apr 2016 13:13:02 +0600
Subject: OTG: Refactor persistent connections, naming

---
 .../keychain/ui/SecurityTokenOperationActivity.java          | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
index 5f0093678..884f33365 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
@@ -142,8 +142,7 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
             obtainSecurityTokenPin(mRequiredInput);
             checkPinAvailability();
         } else {
-            // No need for pin, rescan USB devices
-            mUsbDispatcher.rescanDevices();
+            checkDeviceConnection();
         }
     }
 
@@ -160,8 +159,7 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
             Passphrase passphrase = PassphraseCacheService.getCachedPassphrase(this,
                     mRequiredInput.getMasterKeyId(), mRequiredInput.getSubKeyId());
             if (passphrase != null) {
-                // Rescan USB devices
-                mUsbDispatcher.rescanDevices();
+                checkDeviceConnection();
             }
         } catch (PassphraseCacheService.KeyNotFoundException e) {
             throw new AssertionError(
@@ -175,7 +173,7 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
     }
 
     @Override
-    public void onNfcPreExecute() {
+    public void onSmartcardPreExecute() {
         // start with indeterminate progress
         vAnimator.setDisplayedChild(1);
         nfcGuideView.setCurrentStatus(NfcGuideView.NfcGuideViewStatus.TRANSFERRING);
@@ -293,7 +291,7 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
     }
 
     @Override
-    protected final void onNfcPostExecute() {
+    protected final void onSmartcardPostExecute() {
         handleResult(mInputParcel);
 
         // show finish
@@ -301,7 +299,7 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
 
         nfcGuideView.setCurrentStatus(NfcGuideView.NfcGuideViewStatus.DONE);
 
-        if (mSmartcardDevice.allowPersistentConnection()) {
+        if (mSmartcardDevice.isPersistentConnectionAllowed()) {
             // Just close
             finish();
         } else {
-- 
cgit v1.2.3