From a139be29ba556468ca282c96e5c985762c466b5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 17 Sep 2014 21:36:38 +0200
Subject: PassphraseDialogActivity usage in Remote API

---
 .../keychain/remote/OpenPgpService.java            |  8 ++++----
 .../keychain/remote/ui/RemoteServiceActivity.java  | 22 ----------------------
 2 files changed, 4 insertions(+), 26 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index c11f283be..a8751bac0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -48,6 +48,7 @@ import org.sufficientlysecure.keychain.service.PassphraseCacheService;
 import org.sufficientlysecure.keychain.service.results.OperationResult.LogEntryParcel;
 import org.sufficientlysecure.keychain.service.results.SignEncryptResult;
 import org.sufficientlysecure.keychain.ui.ImportKeysActivity;
+import org.sufficientlysecure.keychain.ui.PassphraseDialogActivity;
 import org.sufficientlysecure.keychain.ui.ViewKeyActivity;
 import org.sufficientlysecure.keychain.util.InputData;
 import org.sufficientlysecure.keychain.util.Log;
@@ -203,11 +204,10 @@ public class OpenPgpService extends RemoteService {
 
     private Intent getPassphraseIntent(Intent data, long keyId) {
         // build PendingIntent for passphrase input
-        Intent intent = new Intent(getBaseContext(), RemoteServiceActivity.class);
-        intent.setAction(RemoteServiceActivity.ACTION_CACHE_PASSPHRASE);
-        intent.putExtra(RemoteServiceActivity.EXTRA_SECRET_KEY_ID, keyId);
+        Intent intent = new Intent(getBaseContext(), PassphraseDialogActivity.class);
+        intent.putExtra(PassphraseDialogActivity.EXTRA_SUBKEY_ID, keyId);
         // pass params through to activity that it can be returned again later to repeat pgp operation
-        intent.putExtra(RemoteServiceActivity.EXTRA_DATA, data);
+        intent.putExtra(PassphraseDialogActivity.EXTRA_DATA, data);
         PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0,
                 intent,
                 PendingIntent.FLAG_CANCEL_CURRENT);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
index ce5534cf4..6a96a831c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
@@ -54,8 +54,6 @@ public class RemoteServiceActivity extends ActionBarActivity {
     public static final String ACTION_REGISTER = Constants.INTENT_PREFIX + "API_ACTIVITY_REGISTER";
     public static final String ACTION_CREATE_ACCOUNT = Constants.INTENT_PREFIX
             + "API_ACTIVITY_CREATE_ACCOUNT";
-    public static final String ACTION_CACHE_PASSPHRASE = Constants.INTENT_PREFIX
-            + "API_ACTIVITY_CACHE_PASSPHRASE";
     public static final String ACTION_SELECT_PUB_KEYS = Constants.INTENT_PREFIX
             + "API_ACTIVITY_SELECT_PUB_KEYS";
     public static final String ACTION_ERROR_MESSAGE = Constants.INTENT_PREFIX
@@ -215,26 +213,6 @@ public class RemoteServiceActivity extends ActionBarActivity {
                     }
             );
 
-        } else if (ACTION_CACHE_PASSPHRASE.equals(action)) {
-            long secretKeyId = extras.getLong(EXTRA_SECRET_KEY_ID);
-            final Intent resultData = extras.getParcelable(EXTRA_DATA);
-
-            PassphraseDialogFragment.show(this, secretKeyId,
-                    new Handler() {
-                        @Override
-                        public void handleMessage(Message message) {
-                            if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) {
-                                // return given params again, for calling the service method again
-                                RemoteServiceActivity.this.setResult(RESULT_OK, resultData);
-                            } else {
-                                RemoteServiceActivity.this.setResult(RESULT_CANCELED);
-                            }
-
-                            RemoteServiceActivity.this.finish();
-                        }
-                    }
-            );
-
         } else if (ACTION_SELECT_PUB_KEYS.equals(action)) {
             long[] selectedMasterKeyIds = intent.getLongArrayExtra(EXTRA_SELECTED_MASTER_KEY_IDS);
             boolean noUserIdsCheck = intent.getBooleanExtra(EXTRA_NO_USER_IDS_CHECK, true);
-- 
cgit v1.2.3