diff --git a/README.md b/README.md index 180ef14..cd01012 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ An Android app to forward SMS to an email account Implemented thus far are: * [x] Basic functionality (accepting SMTP credentials and actually catching and forwarding SMS via SMTP) +* [x] End-to-end encryption via PGP Planned features: -* [ ] End-to-end encryption via PGP * [ ] Direct access to javax.mail props diff --git a/app/app.iml b/app/app.iml index cfc182a..df6a40d 100644 --- a/app/app.iml +++ b/app/app.iml @@ -94,8 +94,8 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 7ba7d96..3549dcf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "org.tpmkranz.smsforward" minSdkVersion 15 targetSdkVersion 23 - versionCode 20151120 - versionName "0.9.0.1" + versionCode 20151122 + versionName "0.9.1" } buildTypes { release { diff --git a/app/src/main/java/org/tpmkranz/smsforward/PGPPubkeyEncryptionUtil.java b/app/src/main/java/org/tpmkranz/smsforward/PGPPubkeyEncryptionUtil.java index 5e60f48..0fad21c 100644 --- a/app/src/main/java/org/tpmkranz/smsforward/PGPPubkeyEncryptionUtil.java +++ b/app/src/main/java/org/tpmkranz/smsforward/PGPPubkeyEncryptionUtil.java @@ -66,6 +66,7 @@ public boolean hasKey(){ public String encrypt(String plainText) throws NoSuchAlgorithmException, IOException, PGPException { byte[] rawText = plainText.getBytes(); + //This needs, like, three metric fucktons of explanation and/or cleaning up ByteArrayOutputStream encOut = new ByteArrayOutputStream(); OutputStream out = new ArmoredOutputStream(encOut); ByteArrayOutputStream bOut = new ByteArrayOutputStream();