Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java

@@ -495,11 +495,10 @@ public class EditKeyActivity extends ActionBarActivity {
 
     private void saveClicked() {
         long masterKeyId = getMasterKeyId();
-        try {
+        if (!isPassphraseSet()) {
-            if (!isPassphraseSet()) {
+            Log.e(Constants.TAG, "No passphrase has been set");
-                throw new PgpGeneralException(this.getString(R.string.set_a_passphrase));
+            Toast.makeText(this, R.string.set_a_passphrase, Toast.LENGTH_LONG).show();
-            }
+        } else {
-
             String passphrase = null;
             if (mIsPassPhraseSet) {
                 passphrase = PassphraseCacheService.getCachedPassphrase(this, masterKeyId);
@@ -512,9 +511,6 @@ public class EditKeyActivity extends ActionBarActivity {
                 mCurrentPassphrase = passphrase;
                 finallySaveClicked();
             }
-        } catch (PgpGeneralException e) {
-            //Toast.makeText(this, getString(R.string.error_message, e.getMessage()),
-            //        Toast.LENGTH_SHORT).show();
         }
     }
 
@@ -576,8 +572,9 @@ public class EditKeyActivity extends ActionBarActivity {
             // start service with intent
             startService(intent);
         } catch (PgpGeneralException e) {
-            //Toast.makeText(this, getString(R.string.error_message, e.getMessage()),
+            Log.e(Constants.TAG, getString(R.string.error_message, e.getMessage()));
-            //        Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, getString(R.string.error_message, e.getMessage()),
+                    Toast.LENGTH_SHORT).show();
         }
     }
 

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);
     }
 
     /**
@@ -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[]{

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java

@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.sufficientlysecure.keychain.ui.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import com.beardedhen.androidbootstrap.FontAwesomeText;
+import org.sufficientlysecure.keychain.R;
+
+/**
+ * Class representing a LinearLayout that can fold and hide it's content when pressed
+ * To use just add the following to your xml layout
+
+ <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
+     android:layout_width="wrap_content"
+     android:layout_height="wrap_content"
+     custom:foldedLabel="@string/TEXT_TO_DISPLAY_WHEN_FOLDED"
+     custom:unFoldedLabel="@string/TEXT_TO_DISPLAY_WHEN_UNFOLDED"
+     custom:foldedIcon="ICON_NAME_FROM_FontAwesomeText_TO_USE_WHEN_FOLDED"
+     custom:unFoldedIcon="ICON_NAME_FROM_FontAwesomeText_TO_USE_WHEN_UNFOLDED">
+
+    <include layout="@layout/ELEMENTS_TO_BE_FOLDED"/>
+
+ </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
+
+ */
+public class FoldableLinearLayout extends LinearLayout {
+
+    private FontAwesomeText mFoldableIcon;
+    private boolean mFolded;
+    private boolean mHasMigrated = false;
+    private Integer mShortAnimationDuration = null;
+    private TextView mFoldableTextView = null;
+    private LinearLayout mFoldableContainer = null;
+    private View mFoldableLayout = null;
+
+    private String mFoldedIconName;
+    private String mUnFoldedIconName;
+    private String mFoldedLabel;
+    private String mUnFoldedLabel;
+
+    public FoldableLinearLayout(Context context) {
+        super(context);
+        processAttributes(context, null);
+    }
+
+    public FoldableLinearLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        processAttributes(context, attrs);
+    }
+
+    public FoldableLinearLayout(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs);
+        processAttributes(context, attrs);
+    }
+
+    /**
+     * Load given attributes to inner variables,
+     * @param context
+     * @param attrs
+     */
+    private void processAttributes(Context context, AttributeSet attrs) {
+        if(attrs != null) {
+            TypedArray a = context.obtainStyledAttributes(attrs,
+                    R.styleable.FoldableLinearLayout, 0, 0);
+            mFoldedIconName = a.getString(R.styleable.FoldableLinearLayout_foldedIcon);
+            mUnFoldedIconName = a.getString(R.styleable.FoldableLinearLayout_unFoldedIcon);
+            mFoldedLabel = a.getString(R.styleable.FoldableLinearLayout_foldedLabel);
+            mUnFoldedLabel = a.getString(R.styleable.FoldableLinearLayout_unFoldedLabel);
+            a.recycle();
+        }
+        // If any attribute isn't found then set a default one
+        mFoldedIconName = (mFoldedIconName == null) ? "fa-chevron-right" : mFoldedIconName;
+        mUnFoldedIconName = (mUnFoldedIconName == null) ? "fa-chevron-down" : mUnFoldedIconName;
+        mFoldedLabel = (mFoldedLabel == null) ? context.getString(R.id.none) : mFoldedLabel;
+        mUnFoldedLabel = (mUnFoldedLabel == null) ? context.getString(R.id.none) : mUnFoldedLabel;
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        // if the migration has already happened
+        // there is no need to move any children
+        if(!mHasMigrated) {
+            migrateChildrenToContainer();
+            mHasMigrated = true;
+        }
+
+        initialiseInnerViews();
+
+        super.onFinishInflate();
+    }
+
+    /**
+     * Migrates Child views as declared in xml to the inner foldableContainer
+     */
+    private void migrateChildrenToContainer() {
+        // Collect children of FoldableLinearLayout as declared in XML
+        int childNum = getChildCount();
+        View[] children = new View[childNum];
+
+        for(int i = 0; i < childNum; i++) {
+            children[i] = getChildAt(i);
+        }
+        if(children[0].getId() == R.id.foldableControl) {
+
+        }
+
+        // remove all of them from FoldableLinearLayout
+        detachAllViewsFromParent();
+
+        // Inflate the inner foldable_linearlayout.xml
+        LayoutInflater inflator = (LayoutInflater)getContext().getSystemService(
+                Context.LAYOUT_INFLATER_SERVICE);
+
+        mFoldableLayout = inflator.inflate(R.layout.foldable_linearlayout, this, true);
+        mFoldableContainer = (LinearLayout) mFoldableLayout.findViewById(R.id.foldableContainer);
+
+        // Push previously collected children into foldableContainer.
+        for(int i = 0; i < childNum; i++) {
+            addView(children[i]);
+        }
+    }
+
+    private void initialiseInnerViews() {
+        mFoldableIcon = (FontAwesomeText) mFoldableLayout.findViewById(R.id.foldableIcon);
+        mFoldableIcon.setIcon(mFoldedIconName);
+        mFoldableTextView = (TextView) mFoldableLayout.findViewById(R.id.foldableText);
+        mFoldableTextView.setText(mFoldedLabel);
+
+        // retrieve and cache the system's short animation time
+        mShortAnimationDuration = getResources().getInteger(android.R.integer.config_shortAnimTime);
+
+        LinearLayout foldableControl = (LinearLayout) mFoldableLayout.findViewById(R.id.foldableControl);
+        foldableControl.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mFolded = !mFolded;
+                if (mFolded) {
+                    mFoldableIcon.setIcon(mUnFoldedIconName);
+                    mFoldableContainer.setVisibility(View.VISIBLE);
+                    AlphaAnimation animation = new AlphaAnimation(0f, 1f);
+                    animation.setDuration(mShortAnimationDuration);
+                    mFoldableContainer.startAnimation(animation);
+                    mFoldableTextView.setText(mUnFoldedLabel);
+
+                } else {
+                    mFoldableIcon.setIcon(mFoldedIconName);
+                    AlphaAnimation animation = new AlphaAnimation(1f, 0f);
+                    animation.setDuration(mShortAnimationDuration);
+                    animation.setAnimationListener(new Animation.AnimationListener() {
+                        @Override
+                        public void onAnimationStart(Animation animation) { }
+
+                        @Override
+                        public void onAnimationEnd(Animation animation) {
+                            // making sure that at the end the container is completely removed from view
+                            mFoldableContainer.setVisibility(View.GONE);
+                        }
+
+                        @Override
+                        public void onAnimationRepeat(Animation animation) { }
+                    });
+                    mFoldableContainer.startAnimation(animation);
+                    mFoldableTextView.setText(mFoldedLabel);
+                }
+            }
+        });
+
+    }
+
+    /**
+     * Adds provided child view to foldableContainer View
+     * @param child
+     */
+    @Override
+    public void addView(View child) {
+        if(mFoldableContainer != null) {
+            mFoldableContainer.addView(child);
+        }
+    }
+}

OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:fontawesometext="http://schemas.android.com/apk/res-auto"
+        xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
-        xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:id="@+id/content_frame"
+        xmlns:custom="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/content_frame"
         android:layout_marginLeft="@dimen/drawer_content_padding"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -254,101 +255,18 @@
                             bootstrapbutton:bb_type="default"/>
                 </LinearLayout>
 
-                <LinearLayout
+                <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
-                        android:id="@+id/advancedSettingsControl"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
-                        android:orientation="horizontal"
+                        custom:foldedLabel="@string/btn_encryption_advanced_settings_show"
-                        android:clickable="true">
+                        custom:unFoldedLabel="@string/btn_encryption_advanced_settings_hide"
+                        custom:foldedIcon="fa-chevron-right"
+                        custom:unFoldedIcon="fa-chevron-down">
 
-                    <com.beardedhen.androidbootstrap.FontAwesomeText
+                    <include layout="@layout/encrypt_content_adv_settings"/>
-                            android:id="@+id/advancedSettingsIcon"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginRight="10dp"
-                            android:textSize="12sp"
-                            android:paddingTop="@dimen/padding_medium"
-                            android:paddingBottom="@dimen/padding_medium"
-                            fontawesometext:fa_icon="fa-chevron-right"/>
 
-                    <TextView
+                </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
-                            android:id="@+id/advancedSettings"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/btn_encryption_advanced_settings_show"
-                            android:paddingTop="@dimen/padding_medium"
-                            android:paddingBottom="@dimen/padding_medium"
-                            android:textColor="@color/emphasis"/>
-                </LinearLayout>
 
-                <LinearLayout
-                        android:id="@+id/fileAdvancedSettingsContainer"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:visibility="gone">
-
-                    <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                        <TextView
-                                android:id="@+id/label_fileCompression"
-                                android:layout_width="0dip"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:layout_weight="1"
-                                android:paddingRight="10dip"
-                                android:text="@string/label_file_compression"
-                                android:textAppearance="?android:attr/textAppearanceSmall"/>
-
-                        <Spinner
-                                android:id="@+id/fileCompression"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"/>
-                    </LinearLayout>
-
-                    <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                        <CheckBox
-                                android:id="@+id/deleteAfterEncryption"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:text="@string/label_delete_after_encryption"/>
-                    </LinearLayout>
-
-                    <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                        <CheckBox
-                                android:id="@+id/shareAfterEncryption"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:text="@string/label_share_after_encryption"/>
-                    </LinearLayout>
-
-                    <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                        <CheckBox
-                                android:id="@+id/asciiArmour"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:text="@string/label_ascii_armor"/>
-                    </LinearLayout>
-                </LinearLayout>
             </LinearLayout>
         </ViewFlipper>
 

OpenPGP-Keychain/src/main/res/layout/encrypt_content_adv_settings.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+        <TextView
+                android:id="@+id/label_fileCompression"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:paddingRight="10dip"
+                android:text="@string/label_file_compression"
+                android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+        <Spinner
+                android:id="@+id/fileCompression"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+        <CheckBox
+                android:id="@+id/deleteAfterEncryption"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/label_delete_after_encryption"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+        <CheckBox
+                android:id="@+id/shareAfterEncryption"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/label_share_after_encryption"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+        <CheckBox
+                android:id="@+id/asciiArmour"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/label_ascii_armor"/>
+    </LinearLayout>
+</merge>

OpenPGP-Keychain/src/main/res/layout/foldable_linearlayout.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:fontawesometext="http://schemas.android.com/apk/res-auto"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <LinearLayout
+            android:id="@+id/foldableControl"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:clickable="true">
+
+        <com.beardedhen.androidbootstrap.FontAwesomeText
+                android:id="@+id/foldableIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10dp"
+                android:textSize="12sp"
+                android:paddingTop="@dimen/padding_medium"
+                android:paddingBottom="@dimen/padding_medium"
+                fontawesometext:fa_icon="fa-chevron-right"/>
+
+        <TextView
+                android:id="@+id/foldableText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/none"
+                android:paddingTop="@dimen/padding_medium"
+                android:paddingBottom="@dimen/padding_medium"
+                android:textColor="@color/emphasis"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:id="@+id/foldableContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="gone"/>
+</LinearLayout>

OpenPGP-Keychain/src/main/res/values/attr.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="FoldableLinearLayout">
+        <attr name="foldedLabel" format="string" />
+        <attr name="unFoldedLabel" format="string" />
+        <attr name="foldedIcon" format="string" />
+        <attr name="unFoldedIcon" format="string" />
+    </declare-styleable>
+
+</resources>