1 files changed, 8 insertions, 80 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
index 52d098adc..a849cdf12 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
@@ -18,22 +18,17 @@
 
 package org.sufficientlysecure.keychain.ui;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.view.View;
 
-import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.intents.OpenKeychainIntents;
-import org.sufficientlysecure.keychain.ui.base.BaseActivity;
 import org.sufficientlysecure.keychain.util.Log;
-import org.sufficientlysecure.keychain.util.Passphrase;
 
-public class EncryptTextActivity extends BaseActivity implements
-        EncryptModeAsymmetricFragment.IAsymmetric, EncryptModeSymmetricFragment.ISymmetric,
-        EncryptTextFragment.IMode {
+public class EncryptTextActivity extends EncryptActivity {
 
     /* Intents */
     public static final String ACTION_ENCRYPT_TEXT = OpenKeychainIntents.ENCRYPT_TEXT;
@@ -41,40 +36,13 @@ public class EncryptTextActivity extends BaseActivity implements
     /* EXTRA keys for input */
     public static final String EXTRA_TEXT = OpenKeychainIntents.ENCRYPT_EXTRA_TEXT;
 
-    // preselect ids, for internal use
-    public static final String EXTRA_SIGNATURE_KEY_ID = Constants.EXTRA_PREFIX + "EXTRA_SIGNATURE_KEY_ID";
-    public static final String EXTRA_ENCRYPTION_KEY_IDS = Constants.EXTRA_PREFIX + "EXTRA_SIGNATURE_KEY_IDS";
-
-    Fragment mModeFragment;
-    EncryptTextFragment mEncryptFragment;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setFullScreenDialogClose(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        }, false);
-
-        // Handle intent actions
-        handleActions(getIntent(), savedInstanceState);
-    }
-
-    @Override
-    protected void initLayout() {
-        setContentView(R.layout.encrypt_text_activity);
-    }
-
+        setFullScreenDialogClose(Activity.RESULT_OK, false);
 
-    /**
-     * Handles all actions with this intent
-     *
-     * @param intent
-     */
-    private void handleActions(Intent intent, Bundle savedInstanceState) {
+        Intent intent = getIntent();
         String action = intent.getAction();
         Bundle extras = intent.getExtras();
         String type = intent.getType();
@@ -83,10 +51,6 @@ public class EncryptTextActivity extends BaseActivity implements
             extras = new Bundle();
         }
 
-        /*
-         * Android's Action
-         */
-
         // When sending to OpenKeychain Encrypt via share menu
         if (Intent.ACTION_SEND.equals(action) && type != null) {
             Log.logDebugBundle(extras, "extras");
@@ -108,55 +72,19 @@ public class EncryptTextActivity extends BaseActivity implements
             textData = "";
         }
 
-        // preselect keys given by intent
-        long mSigningKeyId = extras.getLong(EXTRA_SIGNATURE_KEY_ID);
-        long[] mEncryptionKeyIds = extras.getLongArray(EXTRA_ENCRYPTION_KEY_IDS);
-
         if (savedInstanceState == null) {
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 
-            mModeFragment = EncryptModeAsymmetricFragment.newInstance(mSigningKeyId, mEncryptionKeyIds);
-            transaction.replace(R.id.encrypt_mode_container, mModeFragment, "mode");
-
-            mEncryptFragment = EncryptTextFragment.newInstance(textData);
-            transaction.replace(R.id.encrypt_text_container, mEncryptFragment, "text");
-
+            EncryptTextFragment encryptFragment = EncryptTextFragment.newInstance(textData);
+            transaction.replace(R.id.encrypt_text_container, encryptFragment);
             transaction.commit();
-
-            getSupportFragmentManager().executePendingTransactions();
         }
-    }
-
-    @Override
-    public void onModeChanged(boolean symmetric) {
-        // switch fragments
-        getSupportFragmentManager().beginTransaction()
-                .replace(R.id.encrypt_mode_container,
-                        symmetric
-                                ? EncryptModeSymmetricFragment.newInstance()
-                                : EncryptModeAsymmetricFragment.newInstance(0, null)
-                )
-                .commitAllowingStateLoss();
-        getSupportFragmentManager().executePendingTransactions();
-    }
-
-    @Override
-    public void onSignatureKeyIdChanged(long signatureKeyId) {
-        mEncryptFragment.setSigningKeyId(signatureKeyId);
-    }
 
-    @Override
-    public void onEncryptionKeyIdsChanged(long[] encryptionKeyIds) {
-        mEncryptFragment.setEncryptionKeyIds(encryptionKeyIds);
     }
 
     @Override
-    public void onEncryptionUserIdsChanged(String[] encryptionUserIds) {
-        mEncryptFragment.setEncryptionUserIds(encryptionUserIds);
+    protected void initLayout() {
+        setContentView(R.layout.encrypt_text_activity);
     }
 
-    @Override
-    public void onPassphraseChanged(Passphrase passphrase) {
-        mEncryptFragment.setSymmetricPassphrase(passphrase);
-    }
 }