cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

designing encrypt and decrypt

Browse Source
This commit is contained in:
Dominik
2012-04-13 03:33:00 +02:00
parent 01230cd0a9
commit 4793cd1c25
4 changed files with 54 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
org_apg/res/layout/decrypt.xml
View File

@@ -25,13 +25,15 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_margin="10dip" android:fillViewport="true"
android:fillViewport="true" > android:paddingLeft="10dp"
android:paddingRight="10dp" >
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical"
android:padding="4dp" >
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
@@ -46,6 +48,7 @@
<TextView <TextView
android:id="@+id/sourceLabel" android:id="@+id/sourceLabel"
style="@style/SectionHeader"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="1" android:layout_weight="1"
@@ -70,7 +73,8 @@
android:id="@+id/sourceMessage" android:id="@+id/sourceMessage"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" > android:orientation="vertical"
android:padding="4dp" >
<EditText <EditText
android:id="@+id/message" android:id="@+id/message"
@@ -85,7 +89,8 @@
android:id="@+id/sourceFile" android:id="@+id/sourceFile"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" > android:orientation="vertical"
android:padding="4dp" >
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
@@ -111,21 +116,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" > android:orientation="horizontal" >
<TextView
android:id="@+id/label_deleteAfterDecryption"
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_deleteAfterDecryption"
android:textAppearance="?android:attr/textAppearanceMedium" />
<CheckBox <CheckBox
android:id="@+id/deleteAfterDecryption" android:id="@+id/deleteAfterDecryption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical"
android:text="@string/label_deleteAfterDecryption" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ViewFlipper> </ViewFlipper>
@@ -137,7 +133,10 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
android:orientation="horizontal" > android:orientation="horizontal"
android:padding="4dp"
android:paddingLeft="10dp"
android:paddingRight="10dp" >
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"

82
org_apg/res/layout/encrypt.xml
View File

@@ -18,18 +18,20 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_margin="10dip"
android:fillViewport="true" > android:fillViewport="true" >
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp" >
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" > android:orientation="horizontal"
android:padding="4dp" >
<ImageView <ImageView
android:id="@+id/sourcePrevious" android:id="@+id/sourcePrevious"
@@ -39,6 +41,7 @@
<TextView <TextView
android:id="@+id/sourceLabel" android:id="@+id/sourceLabel"
style="@style/SectionHeader"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="1" android:layout_weight="1"
@@ -63,7 +66,8 @@
android:id="@+id/sourceMessage" android:id="@+id/sourceMessage"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" > android:orientation="vertical"
android:padding="4dp" >
<EditText <EditText
android:id="@+id/message" android:id="@+id/message"
@@ -77,7 +81,8 @@
android:id="@+id/sourceFile" android:id="@+id/sourceFile"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" > android:orientation="vertical"
android:padding="4dp" >
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
@@ -111,7 +116,7 @@
android:layout_weight="1" android:layout_weight="1"
android:paddingRight="10dip" android:paddingRight="10dip"
android:text="@string/label_fileCompression" android:text="@string/label_fileCompression"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceSmall" />
<Spinner <Spinner
android:id="@+id/fileCompression" android:id="@+id/fileCompression"
@@ -125,21 +130,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" > android:orientation="horizontal" >
<TextView
android:id="@+id/label_deleteAfterEncryption"
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_deleteAfterEncryption"
android:textAppearance="?android:attr/textAppearanceMedium" />
<CheckBox <CheckBox
android:id="@+id/deleteAfterEncryption" android:id="@+id/deleteAfterEncryption"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical"
android:text="@string/label_deleteAfterEncryption" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@@ -147,35 +143,21 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" > android:orientation="horizontal" >
<TextView
android:id="@+id/label_asciiArmour"
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_asciiArmour"
android:textAppearance="?android:attr/textAppearanceMedium" />
<CheckBox <CheckBox
android:id="@+id/asciiArmour" android:id="@+id/asciiArmour"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical"
android:text="@string/label_asciiArmour" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ViewFlipper> </ViewFlipper>
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:layout_marginBottom="5dip"
android:background="?android:attr/listDivider" />
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" > android:orientation="horizontal"
android:padding="4dp" >
<ImageView <ImageView
android:id="@+id/modePrevious" android:id="@+id/modePrevious"
@@ -185,12 +167,12 @@
<TextView <TextView
android:id="@+id/modeLabel" android:id="@+id/modeLabel"
style="@style/SectionHeader"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_horizontal|center_vertical" android:gravity="center_horizontal|center_vertical"
android:text="@string/label_asymmetric" android:text="@string/label_asymmetric" />
android:textAppearance="?android:attr/textAppearanceMedium" />
<ImageView <ImageView
android:id="@+id/modeNext" android:id="@+id/modeNext"
@@ -208,21 +190,20 @@
android:id="@+id/modeAsymmetric" android:id="@+id/modeAsymmetric"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical"
android:padding="4dp" >
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" > android:orientation="horizontal" >
<TextView <CheckBox
android:id="@+id/label_sign" android:id="@+id/sign"
android:layout_width="0dip" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_weight="1" android:text="@string/label_sign" />
android:text="@string/label_sign"
android:textAppearance="?android:attr/textAppearanceMedium" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -247,12 +228,6 @@
android:text="Main User Id Rest" android:text="Main User Id Rest"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout> </LinearLayout>
<CheckBox
android:id="@+id/sign"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@@ -283,6 +258,7 @@
android:id="@+id/modeSymmetric" android:id="@+id/modeSymmetric"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp"
android:stretchColumns="1" > android:stretchColumns="1" >
<TableRow> <TableRow>
@@ -322,12 +298,6 @@
</TableRow> </TableRow>
</TableLayout> </TableLayout>
</ViewFlipper> </ViewFlipper>
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:layout_marginBottom="5dip"
android:background="?android:attr/listDivider" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

12
org_apg/src/org/apg/ui/DecryptActivity.java
View File

@@ -250,12 +250,6 @@ public class DecryptActivity extends BaseActivity {
Log.d(Constants.TAG, "got extras"); Log.d(Constants.TAG, "got extras");
} }
// disable home button on actionbar because this activity is run from another app
final ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayShowTitleEnabled(true);
actionBar.setDisplayHomeAsUpEnabled(false);
actionBar.setHomeButtonEnabled(false);
mData = extras.getByteArray(Apg.EXTRA_DATA); mData = extras.getByteArray(Apg.EXTRA_DATA);
String textData = null; String textData = null;
if (mData == null) { if (mData == null) {
@@ -312,6 +306,12 @@ public class DecryptActivity extends BaseActivity {
extras = new Bundle(); extras = new Bundle();
} }
// disable home button on actionbar because this activity is run from another app
final ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayShowTitleEnabled(true);
actionBar.setDisplayHomeAsUpEnabled(false);
actionBar.setHomeButtonEnabled(false);
mReturnBinary = extras.getBoolean(Apg.EXTRA_BINARY, false); mReturnBinary = extras.getBoolean(Apg.EXTRA_BINARY, false);
if (mContentUri == null) { if (mContentUri == null) {

10
org_apg/src/org/apg/ui/EncryptActivity.java
View File

@@ -314,10 +314,12 @@ public class EncryptActivity extends BaseActivity {
} }
// disable home button on actionbar because this activity is run from another app // disable home button on actionbar because this activity is run from another app
final ActionBar actionBar = getSupportActionBar(); if (Apg.Intent.ENCRYPT_AND_RETURN.equals(mIntent.getAction())) {
actionBar.setDisplayShowTitleEnabled(true); final ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayHomeAsUpEnabled(false); actionBar.setDisplayShowTitleEnabled(true);
actionBar.setHomeButtonEnabled(false); actionBar.setDisplayHomeAsUpEnabled(false);
actionBar.setHomeButtonEnabled(false);
}
if (Apg.Intent.ENCRYPT_AND_RETURN.equals(mIntent.getAction()) if (Apg.Intent.ENCRYPT_AND_RETURN.equals(mIntent.getAction())
|| Apg.Intent.GENERATE_SIGNATURE.equals(mIntent.getAction())) { || Apg.Intent.GENERATE_SIGNATURE.equals(mIntent.getAction())) {