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

set svn:ignore for bin directory and .project/.classpath

Browse Source 
asymmetric file encryption working, some more cleanup, introduced an application directory to encrypt to by default
This commit is contained in:
Thialfihar
2010-04-19 13:56:43 +00:00
parent bd4463774e
commit 26cf672d67
11 changed files with 223 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,6 +178,9 @@ public class EncryptMessageActivity extends BaseActivity {
try {
boolean encryptIt = mEncryptionKeyIds != null && mEncryptionKeyIds.length > 0;
if (getSecretKeyId() == 0 && !encryptIt) {
throw new Apg.GeneralException("no signature key or encryption key selected");
}
String message = mMessage.getText().toString();
if (!encryptIt) {
@@ -198,12 +201,11 @@ public class EncryptMessageActivity extends BaseActivity {
if (encryptIt) {
Apg.encrypt(in, out, true, mEncryptionKeyIds, getSecretKeyId(),
Apg.getPassPhrase(), this);
data.putString("message", new String(out.toByteArray()));
} else {
Apg.signText(in, out, getSecretKeyId(),
Apg.getPassPhrase(), HashAlgorithmTags.SHA256, this);
data.putString("message", new String(out.toByteArray()));
}
data.putString("message", new String(out.toByteArray()));
} catch (IOException e) {
error = e.getMessage();
} catch (PGPException e) {
@@ -288,22 +290,6 @@ public class EncryptMessageActivity extends BaseActivity {
break;
}
case Id.request.secret_keys: {
if (resultCode == RESULT_OK) {
Bundle bundle = data.getExtras();
long newId = bundle.getLong("selectedKeyId");
if (getSecretKeyId() != newId) {
Apg.setPassPhrase(null);
}
setSecretKeyId(newId);
} else {
setSecretKeyId(0);
Apg.setPassPhrase(null);
}
updateView();
break;
}
default: {
break;
}