aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThialfihar <thialfihar@gmail.com>2010-05-21 03:04:02 +0000
committerThialfihar <thialfihar@gmail.com>2010-05-21 03:04:02 +0000
commit97745873e73c0b740b9966948fbff96f4935f82c (patch)
treebbd738d0b48aaef655b82be68825ba6f9bf36a29 /src
parente72cd83286c111050bd3c039be73e9c37723aa18 (diff)
downloadopen-keychain-97745873e73c0b740b9966948fbff96f4935f82c.tar.gz
open-keychain-97745873e73c0b740b9966948fbff96f4935f82c.tar.bz2
open-keychain-97745873e73c0b740b9966948fbff96f4935f82c.zip
lifting branch to 0.9.8
Diffstat (limited to 'src')
-rw-r--r--src/org/thialfihar/android/apg/Apg.java2
-rw-r--r--src/org/thialfihar/android/apg/MainActivity.java6
2 files changed, 1 insertions, 7 deletions
diff --git a/src/org/thialfihar/android/apg/Apg.java b/src/org/thialfihar/android/apg/Apg.java
index 422545b86..1422cbd46 100644
--- a/src/org/thialfihar/android/apg/Apg.java
+++ b/src/org/thialfihar/android/apg/Apg.java
@@ -104,7 +104,7 @@ public class Apg {
public static final String ENCRYPT_FILE = "org.thialfihar.android.apg.intent.ENCRYPT_FILE";
}
- public static String VERSION = "0.9.7";
+ public static String VERSION = "0.9.8";
public static String FULL_VERSION = "APG v" + VERSION;
private static final int[] PREFERRED_SYMMETRIC_ALGORITHMS =
diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java
index ed08262b8..a4d584304 100644
--- a/src/org/thialfihar/android/apg/MainActivity.java
+++ b/src/org/thialfihar/android/apg/MainActivity.java
@@ -188,12 +188,6 @@ public class MainActivity extends BaseActivity {
message.setText("Read the warnings!\n\n" +
"Changes:\n" +
- "* pass phrase cache\n" +
- "* decrypt emails from k9mail via More -> Forward (alternate)\n" +
- "* compression preferences\n" +
- "* accurate decrypt progress bar\n" +
- "* fixed import of keys from Enigmail (and others)\n" +
- "* fixed recent decryption bug for symmetric encryption\n" +
"\n" +
"WARNING: be careful editing your existing keys, as they " +
"WILL be stripped of certificates right now.\n" +