1 files changed, 4 insertions, 51 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index 1231b6209..4f18f69d7 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
@@ -108,11 +108,6 @@ public class EncryptActivity extends DrawerActivity {
     private String mInputFilename = null;
     private String mOutputFilename = null;
 
-    private Integer mShortAnimationDuration = null;
-    private boolean mFileAdvancedSettingsVisible = false;
-    private TextView mFileAdvancedSettings = null;
-    private LinearLayout mFileAdvancedSettingsContainer = null;
-    private FontAwesomeText mAdvancedSettingsIcon;
     private boolean mAsciiArmorDemand = false;
     private boolean mOverrideAsciiArmor = false;
 
@@ -147,9 +142,6 @@ public class EncryptActivity extends DrawerActivity {
         updateMode();
 
         updateActionBarButtons();
-
-        // retrieve and cache the system's short animation time
-        mShortAnimationDuration = getResources().getInteger(android.R.integer.config_shortAnimTime);
     }
 
     /**
@@ -605,11 +597,11 @@ public class EncryptActivity extends DrawerActivity {
 
         intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
-        // Message is received after encrypting is done in ApgService
+        // Message is received after encrypting is done in KeychainIntentService
         KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
                 getString(R.string.progress_encrypting), ProgressDialog.STYLE_HORIZONTAL) {
             public void handleMessage(Message message) {
-                // handle messages by standard ApgHandler first
+                // handle messages by standard KeychainIntentServiceHandler first
                 super.handleMessage(message);
 
                 if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
@@ -795,49 +787,10 @@ public class EncryptActivity extends DrawerActivity {
             }
         });
 
-        mAdvancedSettingsIcon = (FontAwesomeText) findViewById(R.id.advancedSettingsIcon);
-        mFileAdvancedSettingsContainer = (LinearLayout) findViewById(R.id.fileAdvancedSettingsContainer);
-        mFileAdvancedSettings = (TextView) findViewById(R.id.advancedSettings);
 
-        LinearLayout advancedSettingsControl = (LinearLayout) findViewById(R.id.advancedSettingsControl);
-        advancedSettingsControl.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mFileAdvancedSettingsVisible = !mFileAdvancedSettingsVisible;
-                if (mFileAdvancedSettingsVisible) {
-                    mAdvancedSettingsIcon.setIcon("fa-chevron-down");
-                    mFileAdvancedSettingsContainer.setVisibility(View.VISIBLE);
-                    AlphaAnimation animation = new AlphaAnimation(0f, 1f);
-                    animation.setDuration(mShortAnimationDuration);
-                    mFileAdvancedSettingsContainer.startAnimation(animation);
-                    mFileAdvancedSettings.setText(R.string.btn_encryption_advanced_settings_hide);
 
-                } else {
-                    mAdvancedSettingsIcon.setIcon("fa-chevron-right");
-                    AlphaAnimation animation = new AlphaAnimation(1f, 0f);
-                    animation.setDuration(mShortAnimationDuration);
-                    animation.setAnimationListener(new Animation.AnimationListener() {
-                        @Override
-                        public void onAnimationStart(Animation animation) {
-                            // do nothing
-                        }
 
-                        @Override
-                        public void onAnimationEnd(Animation animation) {
-                            // making sure that at the end the container is completely removed from view
-                            mFileAdvancedSettingsContainer.setVisibility(View.GONE);
-                        }
 
-                        @Override
-                        public void onAnimationRepeat(Animation animation) {
-                            // do nothing
-                        }
-                    });
-                    mFileAdvancedSettingsContainer.startAnimation(animation);
-                    mFileAdvancedSettings.setText(R.string.btn_encryption_advanced_settings_show);
-                }
-            }
-        });
 
         mFileCompression = (Spinner) findViewById(R.id.fileCompression);
         Choice[] choices = new Choice[]{
@@ -1002,8 +955,8 @@ public class EncryptActivity extends DrawerActivity {
 
             case Id.request.secret_keys: {
                 if (resultCode == RESULT_OK) {
-                    Bundle bundle = data.getExtras();
-                    mSecretKeyId = bundle.getLong(SelectSecretKeyActivity.RESULT_EXTRA_MASTER_KEY_ID);
+                    Uri uri_master_key = data.getData();
+                    mSecretKeyId = Long.valueOf(uri_master_key.getLastPathSegment());
                 } else {
                     mSecretKeyId = Id.key.none;
                 }