moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

file encrypt layout entirely rewritten, should be much more userfriendly and work on more devices, changed message encrypt layout to match

Browse Source
This commit is contained in:
Thialfihar 2010-04-26 17:41:06 +00:00
parent b01a47a115
commit 86192e39d9
7 changed files with 327 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@ -74,7 +74,6 @@
<activity
android:name=".EncryptFileActivity"
android:label="@string/title_encryptFile"
android:screenOrientation="portrait"
android:configChanges="keyboardHidden|orientation|keyboard">
<intent-filter>

178
res/layout/encrypt_file.xml
View File

@ -21,11 +21,23 @@
android:orientation="vertical"
android:paddingTop="5dip">
<ScrollView
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:fillViewport="true">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:layout_marginLeft="5dip"
android:layout_marginRight="?android:attr/scrollbarSize">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="5dip">
android:orientation="horizontal">
<TextView
android:id="@+id/label_filename"
@ -48,89 +60,75 @@
</LinearLayout>
<TableLayout
android:layout_height="wrap_content"
<LinearLayout
android:layout_width="fill_parent"
android:stretchColumns="1"
android:paddingLeft="6dip">
<TableRow>
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView android:id="@+id/label_algorithm"
android:text="Algorithm:"
android:text="@string/label_algorithm"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"/>
<Spinner
android:id="@+id/algorithm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
</TableRow>
<TableRow>
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/label_ascii_armour"
android:text="@string/ascii_armour"
android:text="@string/label_ascii_armour"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
android:layout_height="wrap_content"
android:layout_width="wrap_content"/>
android:layout_width="0dip"
android:layout_weight="1"/>
<CheckBox
android:id="@+id/ascii_armour"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="right|center_vertical"/>
android:layout_gravity="center_vertical"/>
</TableRow>
</LinearLayout>
</TableLayout>
<TabHost
android:id="@+id/tab_host"
android:layout_weight="1"
<View
android:layout_width="fill_parent"
android:layout_height="0dip">
<TabWidget
android:id="@android:id/tabs"
android:layout_width="fill_parent"
android:layout_height="65dip"/>
<FrameLayout
android:id="@android:id/tabcontent"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingTop="65dip">
<!-- -->
<LinearLayout
android:id="@+id/tab_asymmetric"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
android:layout_height="1dip"
android:background="?android:attr/listDivider"
android:layout_marginBottom="5dip"/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingBottom="3dip"
android:orientation="horizontal">
<CheckBox
android:text="@string/sign"
android:id="@+id/sign"
android:layout_width="wrap_content"
<TextView
android:id="@+id/label_sign"
android:text="@string/label_sign"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/>
<LinearLayout
android:orientation="vertical"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="5dip">
@ -152,46 +150,77 @@
</LinearLayout>
<CheckBox
android:id="@+id/sign"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingBottom="3dip"
android:orientation="horizontal">
<TextView
android:id="@+id/label_select_public_keys"
android:text="@string/label_select_public_keys"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_gravity="center_vertical"/>
<Button
android:text="@string/btn_selectEncryptKeys"
android:id="@+id/btn_selectEncryptKeys"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/>
</LinearLayout>
<View
android:id="@+id/separator"
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider"/>
android:background="?android:attr/listDivider"
android:layout_marginBottom="5dip"/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/label_encrypt_keys"
android:text="@string/label_encrypt_keys"
android:id="@+id/label_use_pass_phrase"
android:text="@string/label_use_pass_phrase"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_gravity="center_vertical"
android:paddingRight="10dip"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"/>
<ListView
android:id="@+id/public_key_list"
android:choiceMode="multipleChoice"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
<CheckBox
android:id="@+id/use_pass_phrase"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"/>
</LinearLayout>
<!-- -->
<LinearLayout
android:id="@+id/tab_symmetric"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:paddingTop="3dip">
<TableLayout
android:layout_height="fill_parent"
android:id="@+id/layout_pass_phrase"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:stretchColumns="1"
android:paddingLeft="6dip">
android:stretchColumns="1">
<TableRow>
<TextView android:id="@+id/label_pass_phrase"
android:text="Pass phrase"
android:text="@string/label_pass_phrase"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
@ -207,7 +236,7 @@
<TableRow>
<TextView android:id="@+id/label_pass_phrase_again"
android:text="Again:"
android:text="@string/label_pass_phrase_again"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
@ -222,12 +251,9 @@
</TableLayout>
</LinearLayout>
</FrameLayout>
</TabHost>
</ScrollView>
<LinearLayout
android:orientation="horizontal"

56
res/layout/encrypt_message.xml
View File

@ -30,21 +30,23 @@
android:inputType="text|textCapSentences|textMultiLine|textLongMessage"/>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:paddingBottom="3dip">
android:layout_height="wrap_content"
android:orientation="horizontal">
<CheckBox
android:text="@string/sign"
android:id="@+id/sign"
android:layout_width="wrap_content"
<TextView
android:id="@+id/label_sign"
android:text="@string/label_sign"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/>
<LinearLayout
android:orientation="vertical"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:paddingRight="5dip">
@ -66,6 +68,36 @@
</LinearLayout>
<CheckBox
android:id="@+id/sign"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingBottom="3dip"
android:orientation="horizontal">
<TextView
android:id="@+id/label_select_public_keys"
android:text="@string/label_select_public_keys"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_gravity="center_vertical"/>
<Button
android:text="@string/btn_selectEncryptKeys"
android:id="@+id/btn_selectEncryptKeys"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/>
</LinearLayout>
<LinearLayout
@ -74,18 +106,10 @@
android:layout_height="wrap_content"
style="@android:style/ButtonBar">
<Button
android:text="@string/btn_selectEncryptKeys"
android:id="@+id/btn_selectEncryptKeys"
android:layout_weight="1"
android:layout_width="0dip"
android:layout_height="wrap_content"/>
<Button
android:id="@+id/btn_send"
android:text="@string/btn_send"
android:layout_weight="1"
android:layout_width="0dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"/>
</LinearLayout>

23
res/values/strings.xml
View File

@ -45,24 +45,25 @@
<string name="btn_save">Save</string>
<string name="btn_doNotSave">Cancel</string>
<string name="tab_symmetric">Use Pass Phrase</string>
<string name="tab_asymmetric">Use Public Key</string>
<string name="menu_about">About</string>
<string name="menu_addAccount">Add GMail Account</string>
<string name="menu_managePublicKeys">Manage Public Keys</string>
<string name="menu_manageSecretKeys">Manage Secret Keys</string>
<string name="sign">Sign</string>
<string name="sign_as">Sign as</string>
<string name="no_keys_selected">Select Recipients</string>
<string name="one_key_selected">1 Recipient</string>
<string name="n_keys_selected">Recipients</string>
<string name="no_keys_selected">Select</string>
<string name="one_key_selected">1 Selected</string>
<string name="n_keys_selected">Selected</string>
<string name="unknown_user_id">&lt;unknown&gt;</string>
<string name="none">&lt;none&gt;</string>
<string name="label_file">File:</string>
<string name="label_encrypt_keys">Encrypt with:</string>
<string name="label_sign">Sign</string>
<string name="label_file">File</string>
<string name="label_pass_phrase">Pass Phrase</string>
<string name="label_pass_phrase_again">Again</string>
<string name="label_algorithm">Algorithm</string>
<string name="label_ascii_armour">ASCII Armour</string>
<string name="label_select_public_keys">Public Key(s)</string>
<string name="label_use_pass_phrase">Use Pass Phrase</string>
<string name="sign_only">Sign only</string>
<string name="encrypt_only">Encrypt only</string>
@ -83,7 +84,5 @@
<string name="filemanager_title_save">Save As...</string>
<string name="filemanager_btn_save">Save</string>
<string name="ascii_armour">ASCII armour</string>
</resources>

163
src/org/thialfihar/android/apg/EncryptFileActivity.java
View File

@ -27,12 +27,9 @@ import java.io.OutputStream;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.security.SignatureException;
import java.util.Collections;
import java.util.Vector;
import org.bouncycastle2.openpgp.PGPEncryptedData;
import org.bouncycastle2.openpgp.PGPException;
import org.bouncycastle2.openpgp.PGPPublicKeyRing;
import org.bouncycastle2.openpgp.PGPSecretKey;
import org.bouncycastle2.openpgp.PGPSecretKeyRing;
import org.openintents.intents.FileManager;
@ -47,35 +44,31 @@ import android.os.Bundle;
import android.os.Environment;
import android.os.Message;
import android.view.View;
import android.view.ViewGroup;
import android.view.View.OnClickListener;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ListView;
import android.widget.Spinner;
import android.widget.TabHost;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.TabHost.TabSpec;
public class EncryptFileActivity extends BaseActivity {
private final String TAB_ASYMMETRIC = "TAB_ASYMMETRIC";
private final String TAB_SYMMETRIC = "TAB_SYMMETRIC";
private TabHost mTabHost = null;
private EditText mFilename = null;
private ImageButton mBrowse = null;
private CheckBox mSign = null;
private TextView mMainUserId = null;
private TextView mMainUserIdRest = null;
private ListView mPublicKeyList = null;
private Spinner mAlgorithm = null;
private EditText mPassPhrase = null;
private EditText mPassPhraseAgain = null;
private CheckBox mAsciiArmour = null;
private CheckBox mUsePassPhrase = null;
private ViewGroup mPassPhraseLayout = null;
private Button mEncryptButton = null;
private Button mSelectKeysButton = null;
private long mEncryptionKeyIds[] = null;
private String mInputFilename = null;
@ -89,30 +82,14 @@ public class EncryptFileActivity extends BaseActivity {
mAsciiArmour = (CheckBox) findViewById(R.id.ascii_armour);
mTabHost = (TabHost) findViewById(R.id.tab_host);
mTabHost.setup();
TabSpec ts1 = mTabHost.newTabSpec(TAB_ASYMMETRIC);
ts1.setIndicator(getString(R.string.tab_asymmetric),
getResources().getDrawable(R.drawable.key));
ts1.setContent(R.id.tab_asymmetric);
mTabHost.addTab(ts1);
TabSpec ts2 = mTabHost.newTabSpec(TAB_SYMMETRIC);
ts2.setIndicator(getString(R.string.tab_symmetric),
getResources().getDrawable(R.drawable.key));
ts2.setContent(R.id.tab_symmetric);
mTabHost.addTab(ts2);
mTabHost.setCurrentTab(0);
// asymmetric tab
Vector<PGPPublicKeyRing> keyRings =
(Vector<PGPPublicKeyRing>) Apg.getPublicKeyRings().clone();
Collections.sort(keyRings, new Apg.PublicKeySorter());
mPublicKeyList = (ListView) findViewById(R.id.public_key_list);
mPublicKeyList.setAdapter(new SelectPublicKeyListAdapter(mPublicKeyList, keyRings));
mSelectKeysButton = (Button) findViewById(R.id.btn_selectEncryptKeys);
mSelectKeysButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
selectPublicKeys();
}
});
mFilename = (EditText) findViewById(R.id.filename);
mBrowse = (ImageButton) findViewById(R.id.btn_browse);
@ -167,9 +144,30 @@ public class EncryptFileActivity extends BaseActivity {
}
}
mUsePassPhrase = (CheckBox) findViewById(R.id.use_pass_phrase);
mPassPhraseLayout = (ViewGroup) findViewById(R.id.layout_pass_phrase);
mPassPhrase = (EditText) findViewById(R.id.pass_phrase);
mPassPhraseAgain = (EditText) findViewById(R.id.pass_phrase_again);
mUsePassPhrase.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
CheckBox checkBox = (CheckBox) v;
if (checkBox.isChecked()) {
mPassPhraseLayout.setVisibility(ViewGroup.VISIBLE);
} else {
mPassPhrase.setText("");
mPassPhraseAgain.setText("");
mPassPhraseLayout.setVisibility(ViewGroup.GONE);
}
}
});
if (mUsePassPhrase.isChecked()) {
mPassPhraseLayout.setVisibility(ViewGroup.VISIBLE);
} else {
mPassPhraseLayout.setVisibility(ViewGroup.GONE);
}
mEncryptButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
@ -181,8 +179,16 @@ public class EncryptFileActivity extends BaseActivity {
}
private void updateView() {
if (mEncryptionKeyIds == null || mEncryptionKeyIds.length == 0) {
mSelectKeysButton.setText(R.string.no_keys_selected);
} else if (mEncryptionKeyIds.length == 1) {
mSelectKeysButton.setText(R.string.one_key_selected);
} else {
mSelectKeysButton.setText("" + mEncryptionKeyIds.length + " " +
getResources().getString(R.string.n_keys_selected));
}
if (getSecretKeyId() == 0) {
mSign.setText(R.string.sign);
mSign.setChecked(false);
mMainUserId.setText("");
mMainUserIdRest.setText("");
@ -203,7 +209,6 @@ public class EncryptFileActivity extends BaseActivity {
}
mMainUserId.setText(uid);
mMainUserIdRest.setText(uidExtra);
mSign.setText(R.string.sign_as);
mSign.setChecked(true);
}
}
@ -231,6 +236,12 @@ public class EncryptFileActivity extends BaseActivity {
startActivityForResult(intent, Id.request.secret_keys);
}
private void selectPublicKeys() {
Intent intent = new Intent(this, SelectPublicKeyListActivity.class);
intent.putExtra("selection", mEncryptionKeyIds);
startActivityForResult(intent, Id.request.public_keys);
}
private void encryptClicked() {
String currentFilename = mFilename.getText().toString();
if (mInputFilename == null || !mInputFilename.equals(currentFilename)) {
@ -245,36 +256,9 @@ public class EncryptFileActivity extends BaseActivity {
return;
}
if (mTabHost.getCurrentTabTag().equals(TAB_ASYMMETRIC)) {
Vector<Long> vector = new Vector<Long>();
for (int i = 0; i < mPublicKeyList.getCount(); ++i) {
if (mPublicKeyList.isItemChecked(i)) {
vector.add(mPublicKeyList.getItemIdAtPosition(i));
}
}
if (vector.size() > 0) {
mEncryptionKeyIds = new long[vector.size()];
for (int i = 0; i < vector.size(); ++i) {
mEncryptionKeyIds[i] = vector.get(i);
}
} else {
mEncryptionKeyIds = null;
}
boolean encryptIt = mEncryptionKeyIds != null && mEncryptionKeyIds.length > 0;
// for now only support encryption
if (!encryptIt) {
Toast.makeText(this, "Select at least one encryption key.",
Toast.LENGTH_SHORT).show();
return;
}
if (getSecretKeyId() != 0 && Apg.getPassPhrase() == null) {
showDialog(Id.dialog.pass_phrase);
return;
}
} else {
// symmetric encryption
boolean gotPassPhrase = false;
if (mUsePassPhrase.isChecked()) {
String passPhrase = mPassPhrase.getText().toString();
String passPhraseAgain = mPassPhraseAgain.getText().toString();
if (!passPhrase.equals(passPhraseAgain)) {
@ -283,13 +267,27 @@ public class EncryptFileActivity extends BaseActivity {
return;
}
if (passPhrase.length() == 0) {
gotPassPhrase = (passPhrase.length() != 0);
if (!gotPassPhrase) {
Toast.makeText(this, "Enter a pass phrase.",
Toast.LENGTH_SHORT).show();
return;
}
}
boolean encryptIt = mEncryptionKeyIds != null && mEncryptionKeyIds.length > 0;
// for now require at least one form of encryption
if (!encryptIt && !gotPassPhrase) {
Toast.makeText(this, "Select at least one encryption key or a pass phrase.",
Toast.LENGTH_SHORT).show();
return;
}
if (getSecretKeyId() != 0 && Apg.getPassPhrase() == null) {
showDialog(Id.dialog.pass_phrase);
return;
}
askForOutputFilename();
}
@ -325,21 +323,15 @@ public class EncryptFileActivity extends BaseActivity {
InputStream in = new FileInputStream(mInputFilename);
ByteArrayOutputStream out = new ByteArrayOutputStream();
if (mTabHost.getCurrentTabTag().equals(TAB_ASYMMETRIC)) {
boolean encryptIt = mEncryptionKeyIds != null && mEncryptionKeyIds.length > 0;
if (encryptIt) {
String passPhrase = mPassPhrase.getText().toString();
if (passPhrase.length() == 0) {
passPhrase = null;
}
Apg.encrypt(in, out, mAsciiArmour.isChecked(),
mEncryptionKeyIds, getSecretKeyId(),
Apg.getPassPhrase(), this,
PGPEncryptedData.AES_256, null);
}
} else {
Apg.encrypt(in, out, mAsciiArmour.isChecked(),
null, 0, null, this,
((Choice) mAlgorithm.getSelectedItem()).getId(),
mPassPhrase.getText().toString());
}
passPhrase);
out.close();
OutputStream fileOut = new FileOutputStream(mOutputFilename);
@ -447,6 +439,23 @@ public class EncryptFileActivity extends BaseActivity {
return;
}
case Id.request.secret_keys: {
if (resultCode == RESULT_OK) {
super.onActivityResult(requestCode, resultCode, data);
updateView();
}
break;
}
case Id.request.public_keys: {
if (resultCode == RESULT_OK) {
Bundle bundle = data.getExtras();
mEncryptionKeyIds = bundle.getLongArray("selection");
updateView();
}
break;
}
default: {
break;
}

2
src/org/thialfihar/android/apg/EncryptMessageActivity.java
View File

@ -243,7 +243,6 @@ public class EncryptMessageActivity extends BaseActivity {
}
if (getSecretKeyId() == 0) {
mSign.setText(R.string.sign);
mSign.setChecked(false);
mMainUserId.setText("");
mMainUserIdRest.setText("");
@ -264,7 +263,6 @@ public class EncryptMessageActivity extends BaseActivity {
}
mMainUserId.setText(uid);
mMainUserIdRest.setText(uidExtra);
mSign.setText(R.string.sign_as);
mSign.setChecked(true);
}
}

2
src/org/thialfihar/android/apg/MainActivity.java
View File

@ -222,6 +222,8 @@ public class MainActivity extends BaseActivity {
SpannableString info =
new SpannableString("Read the warnings!\n\n" +
"Changes:\n" +
"* new layout for encrypt file\n" +
"* layout more consistent\n" +
"\n" +
"WARNING: be careful editing your existing keys, as they " +
"WILL be stripped of certificates right now.\n" +