use CryptoOperationFragment for linked id fragments, and some warning cleanup

1 files changed, 10 insertions, 32 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java
index 0767aabd2..b98fc6238 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java
@@ -1,6 +1,5 @@
 package org.sufficientlysecure.keychain.ui.linked;
 
-import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.graphics.PorterDuff;
@@ -8,7 +7,6 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -28,14 +26,11 @@ import org.sufficientlysecure.keychain.service.KeychainIntentService;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
 import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
-import org.sufficientlysecure.keychain.ui.PassphraseDialogActivity;
+import org.sufficientlysecure.keychain.ui.base.CryptoOperationFragment;
 import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment.ServiceType;
 import org.sufficientlysecure.keychain.ui.util.Notify;
-import org.sufficientlysecure.keychain.util.Passphrase;
 
-public abstract class LinkedIdCreateFinalFragment extends Fragment {
-
-    protected static final int REQUEST_CODE_PASSPHRASE = 0x00007008;
+public abstract class LinkedIdCreateFinalFragment extends CryptoOperationFragment {
 
     protected LinkedIdWizard mLinkedIdWizard;
 
@@ -63,7 +58,7 @@ public abstract class LinkedIdCreateFinalFragment extends Fragment {
         view.findViewById(R.id.next_button).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                startCertify();
+                cryptoOperation();
             }
         });
 
@@ -174,29 +169,28 @@ public abstract class LinkedIdCreateFinalFragment extends Fragment {
 
     }
 
-    private void startCertify() {
+    protected void cryptoOperation(CryptoInputParcel cryptoInput) {
 
         if (mVerifiedResource == null) {
             Notify.create(getActivity(), R.string.linked_need_verify, Notify.Style.ERROR).show();
             return;
         }
 
-        Intent intent = new Intent(getActivity(), PassphraseDialogActivity.class);
-        intent.putExtra(PassphraseDialogActivity.EXTRA_SUBKEY_ID, mLinkedIdWizard.mMasterKeyId);
-        startActivityForResult(intent, REQUEST_CODE_PASSPHRASE);
-
-    }
-
-    private void certifyLinkedIdentity (CryptoInputParcel cryptoInput) {
         ServiceProgressHandler saveHandler = new ServiceProgressHandler(
                 getActivity(),
                 getString(R.string.progress_saving),
                 ProgressDialog.STYLE_HORIZONTAL,
                 true, ServiceType.KEYCHAIN_INTENT) {
+
             public void handleMessage(Message message) {
                 // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
+                // handle pending messages
+                if (handlePendingMessage(message)) {
+                    return;
+                }
+
                 if (message.arg1 == MessageStatus.OKAY.ordinal()) {
 
                     // get returned data bundle
@@ -252,20 +246,4 @@ public abstract class LinkedIdCreateFinalFragment extends Fragment {
 
     }
 
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        switch (requestCode) {
-            case REQUEST_CODE_PASSPHRASE:
-                if (resultCode == Activity.RESULT_OK && data != null) {
-                    CryptoInputParcel cryptoInput =
-                            data.getParcelableExtra(PassphraseDialogActivity.RESULT_CRYPTO_INPUT);
-                    certifyLinkedIdentity(cryptoInput);
-                }
-                break;
-            default:
-                super.onActivityResult(requestCode, resultCode, data);
-        }
-    }
-
 }