From b8009d6d43277a7840819885a64aeda9e5f582e7 Mon Sep 17 00:00:00 2001
From: Thialfihar <thialfihar@gmail.com>
Date: Wed, 14 Apr 2010 14:08:24 +0000
Subject: [PATCH] 0.8.x branch promoted to version 0.8.1, fixed list view of
 mail accounts not filling the main layout, made a bunch of private classes
 static

---
 AndroidManifest.xml                                      | 2 +-
 res/layout/main.xml                                      | 5 +++--
 src/org/thialfihar/android/apg/Apg.java                  | 2 +-
 src/org/thialfihar/android/apg/MailListActivity.java     | 4 ++--
 src/org/thialfihar/android/apg/MainActivity.java         | 2 +-
 .../thialfihar/android/apg/PublicKeyListActivity.java    | 2 +-
 .../thialfihar/android/apg/SecretKeyListActivity.java    | 2 +-
 .../thialfihar/android/apg/provider/DataProvider.java    | 9 +--------
 8 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5a41f262d..497da3ce1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,7 +16,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.thialfihar.android.apg"
-      android:versionCode="3" android:versionName="0.8.0">
+      android:versionName="0.8.1" android:versionCode="4">
     <application android:icon="@drawable/icon" android:label="@string/app_name">
         <activity android:name=".MainActivity"
                   android:label="@string/app_name"
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 81c5f224b..5418b21f6 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -26,12 +26,13 @@
    android:layout_marginTop="10dip"
    android:layout_width="fill_parent"
    android:layout_height="0dip"
-   android:layout_weight="1">
+   android:layout_weight="1"
+   android:fillViewport="true">
 
 <ListView
    android:id="@+id/account_list"
    android:layout_width="fill_parent"
-   android:layout_height="wrap_content">
+   android:layout_height="fill_parent">
 </ListView>
 
 </ScrollView>
diff --git a/src/org/thialfihar/android/apg/Apg.java b/src/org/thialfihar/android/apg/Apg.java
index 68c4f8877..bf32fc1eb 100644
--- a/src/org/thialfihar/android/apg/Apg.java
+++ b/src/org/thialfihar/android/apg/Apg.java
@@ -97,7 +97,7 @@ public class Apg {
         public static final String ENCRYPT = "org.thialfihar.android.apg.intent.ENCRYPT";
     }
 
-    public static String VERSION = "0.8.0";
+    public static String VERSION = "0.8.1";
     public static String FULL_VERSION = "APG v" + VERSION;
 
     private static final int[] PREFERRED_SYMMETRIC_ALGORITHMS =
diff --git a/src/org/thialfihar/android/apg/MailListActivity.java b/src/org/thialfihar/android/apg/MailListActivity.java
index 8e63a7920..570e761df 100644
--- a/src/org/thialfihar/android/apg/MailListActivity.java
+++ b/src/org/thialfihar/android/apg/MailListActivity.java
@@ -39,7 +39,7 @@ import android.widget.AdapterView.OnItemClickListener;
 public class MailListActivity extends ListActivity {
     LayoutInflater minflater = null;
 
-    private class Conversation {
+    private static class Conversation {
         public long id;
         public String subject;
         public Vector<Message> messages;
@@ -50,7 +50,7 @@ public class MailListActivity extends ListActivity {
         }
     }
 
-    private class Message {
+    private static class Message {
         public Conversation parent;
         public long id;
         public String subject;
diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java
index e7107f255..af0618031 100644
--- a/src/org/thialfihar/android/apg/MainActivity.java
+++ b/src/org/thialfihar/android/apg/MainActivity.java
@@ -360,7 +360,7 @@ public class MainActivity extends Activity {
         startActivity(new Intent(this, MailListActivity.class).putExtra("account", account));
     }
 
-    private class AccountListAdapter extends CursorAdapter {
+    private static class AccountListAdapter extends CursorAdapter {
         private LayoutInflater minflater;
 
         public AccountListAdapter(Context context, Cursor cursor) {
diff --git a/src/org/thialfihar/android/apg/PublicKeyListActivity.java b/src/org/thialfihar/android/apg/PublicKeyListActivity.java
index cebd9c7ae..d858908c9 100644
--- a/src/org/thialfihar/android/apg/PublicKeyListActivity.java
+++ b/src/org/thialfihar/android/apg/PublicKeyListActivity.java
@@ -481,7 +481,7 @@ public class PublicKeyListActivity extends ExpandableListActivity
         ((PublicKeyListAdapter) getExpandableListAdapter()).notifyDataSetChanged();
     }
 
-    private class PublicKeyListAdapter extends BaseExpandableListAdapter {
+    private static class PublicKeyListAdapter extends BaseExpandableListAdapter {
         private LayoutInflater mInflater;
 
         private class KeyChild {
diff --git a/src/org/thialfihar/android/apg/SecretKeyListActivity.java b/src/org/thialfihar/android/apg/SecretKeyListActivity.java
index f42b4ccad..69e8c8c7a 100644
--- a/src/org/thialfihar/android/apg/SecretKeyListActivity.java
+++ b/src/org/thialfihar/android/apg/SecretKeyListActivity.java
@@ -580,7 +580,7 @@ public class SecretKeyListActivity extends ExpandableListActivity
                 .notifyDataSetChanged();
     }
 
-    private class SecretKeyListAdapter extends BaseExpandableListAdapter {
+    private static class SecretKeyListAdapter extends BaseExpandableListAdapter {
         private LayoutInflater mInflater;
 
         private class KeyChild {
diff --git a/src/org/thialfihar/android/apg/provider/DataProvider.java b/src/org/thialfihar/android/apg/provider/DataProvider.java
index 0a6a814e4..fbc1be047 100644
--- a/src/org/thialfihar/android/apg/provider/DataProvider.java
+++ b/src/org/thialfihar/android/apg/provider/DataProvider.java
@@ -115,14 +115,7 @@ public class DataProvider extends ContentProvider {
 
         @Override
         public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-            int currentVersion = oldVersion;
-            while (currentVersion < newVersion) {
-                switch (currentVersion) {
-                    default: {
-                        break;
-                    }
-                }
-            }
+            // TODO: upgrade db if necessary, and do that in a clever way
         }
     }