From 97745873e73c0b740b9966948fbff96f4935f82c Mon Sep 17 00:00:00 2001
From: Thialfihar <thialfihar@gmail.com>
Date: Fri, 21 May 2010 03:04:02 +0000
Subject: lifting branch to 0.9.8

---
 AndroidManifest.xml                              | 2 +-
 src/org/thialfihar/android/apg/Apg.java          | 2 +-
 src/org/thialfihar/android/apg/MainActivity.java | 6 ------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 760b390c4..c693e142a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.thialfihar.android.apg"
-    android:versionName="0.9.7" android:versionCode="12">
+    android:versionName="0.9.8" android:versionCode="13">
 
     <application
         android:icon="@drawable/icon"
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" +
-- 
cgit v1.2.3