Improve file selection.

AndroidManifest.xml

@@ -10,12 +10,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-    <activity android:name=".PasswordActivity"></activity><activity android:name=".GroupActivity"></activity>
-<activity android:name=".EntryActivity"></activity>
-<meta-data android:name="com.a0soft.gphone.aTrackDog.webURL" android:value="http://keepassdroid.com" />
-
-</application>
-
-
-
+    	<activity android:name=".fileselect.FileSelectActivity"></activity><activity android:name=".PasswordActivity"></activity><activity android:name=".GroupActivity"></activity>
+		<activity android:name=".EntryActivity"></activity>
+		<meta-data android:name="com.a0soft.gphone.aTrackDog.webURL" android:value="http://keepassdroid.com" />
+	</application>
 </manifest> 

CHANGELOG

@@ -1,3 +1,7 @@
+KeePassDroid (0.2.0)
+
+  * Improve file selection
+
 KeePassDroid (0.1.4)
 
   * Add key file support

res/layout/entry_view.xml

@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2009 Brian Pellin.
+     
+ This file is part of KeePassDroid.
 
+  KeePassDroid is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  KeePassDroid is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical" android:layout_width="fill_parent"
 	android:layout_height="fill_parent">

res/layout/file_row.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2009 Brian Pellin.
+     
+ This file is part of KeePassDroid.
+
+  KeePassDroid is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  KeePassDroid is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<TextView android:id="@+id/file_filename" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textSize="20sp"/>

res/layout/file_selection.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2009 Brian Pellin.
+     
+ This file is part of KeePassDroid.
+
+  KeePassDroid is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  KeePassDroid is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:orientation="vertical">
+	<LinearLayout android:layout_width="fill_parent"
+	  android:layout_height="wrap_content"
+	  android:layout_weight="0"
+	  android:orientation="vertical">
+	  	<TextView android:layout_width="wrap_content"
+	  	  android:layout_height="wrap_content"
+	  	  android:text="@string/pass_filename"/>
+	  	<EditText android:id="@+id/file_filename"
+	  	  android:layout_width="fill_parent"
+	  	  android:layout_height="wrap_content"
+	  	  android:singleLine="true"/>
+	  	<Button android:id="@+id/file_button"
+	  	  android:text="Open"
+	  	  android:layout_height="wrap_content"
+	  	  android:layout_width="wrap_content"/>
+		<ImageView
+		  android:layout_width="fill_parent"
+		  android:layout_height="wrap_content"
+		  android:scaleType="fitXY"
+		  android:tint="#0000dd"
+	  	  android:src="@android:drawable/divider_horizontal_dark"/>
+	  	<TextView android:id="@+id/file_listtop" 
+	  	  android:layout_width="fill_parent"
+	  	  android:layout_height="wrap_content"
+	  	  android:text="Recently opened files:"/>
+		<ImageView
+		  android:layout_width="fill_parent"
+		  android:layout_height="wrap_content"
+		  android:scaleType="fitXY"
+	  	  android:src="@android:drawable/divider_horizontal_dark"/>
+	</LinearLayout>
+  	<ListView android:id="@android:id/list"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"/>
+	<TextView android:id="@android:id/empty" 
+	  android:layout_width="fill_parent"
+	  android:layout_height="wrap_content"
+	  android:text="No files in history"
+	  android:textSize="10sp"
+	  android:textStyle="italic"/>
+	<ImageView
+	  android:layout_width="fill_parent"
+	  android:layout_height="wrap_content"
+	  android:scaleType="fitXY"
+  	  android:src="@android:drawable/divider_horizontal_dark"
+  	  android:layout_weight="0"/>
+</LinearLayout>

res/layout/list.xml

@@ -1,12 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2009 Brian Pellin.
+     
+ This file is part of KeePassDroid.
+
+  KeePassDroid is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  KeePassDroid is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content">
+	<ListView android:id="@android:id/list"
       android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
-  <ListView android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"/>
-  <TextView android:id="@android:id/empty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/no_keys"/>
+      android:layout_height="wrap_content"/>
+  	<TextView android:id="@android:id/empty"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/no_keys"/>
 </LinearLayout>

res/layout/password.xml

@@ -1,45 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2009 Brian Pellin.
+     
+ This file is part of KeePassDroid.
 
+  KeePassDroid is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  KeePassDroid is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="wrap_content">
-
+  android:orientation="vertical" android:layout_width="fill_parent"
+  android:layout_height="wrap_content">
 	<TextView android:layout_width="wrap_content"
-		android:layout_height="wrap_content" 
-		android:text="@string/pass_filename" />
-	<EditText android:id="@+id/pass_filename" 
+	  android:layout_height="wrap_content" 
+	  android:text="@string/pass_filename" />
+	<ImageView
+	  android:layout_width="fill_parent"
+	  android:layout_height="wrap_content"
+	  android:scaleType="fitXY"
+  	  android:src="@android:drawable/divider_horizontal_dark"/>
+	<TextView android:id="@+id/pass_filename" 
+	  android:textStyle="bold" 
 	  android:layout_width="fill_parent"
 	  android:layout_height="wrap_content" 
-		android:layout_weight="1"
-		android:singleLine="true"/>
-
+	  android:layout_weight="1"
+	  android:singleLine="true"/>
+	<ImageView
+	  android:layout_width="fill_parent"
+	  android:layout_height="wrap_content"
+	  android:scaleType="fitXY"
+  	  android:src="@android:drawable/divider_horizontal_dark"/>
 	<TextView android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:textStyle="bold" 
-		android:text="@string/entry_and_or" />
-
+	  android:layout_height="wrap_content"
+	  android:text="@string/entry_and_or" />
 	<TextView android:layout_width="wrap_content"
-		android:layout_height="wrap_content" 
-		android:text="@string/entry_password" />
+	  android:layout_height="wrap_content" 
+	  android:text="@string/entry_password" />
 	<EditText android:id="@+id/pass_password" 
 	  android:layout_width="fill_parent"
-		android:layout_height="wrap_content" 
-		android:layout_weight="1"
-		android:password="true"
-		android:singleLine="true"/>
-
+	  android:layout_height="wrap_content" 
+	  android:layout_weight="1"
+	  android:password="true"
+	  android:singleLine="true"/>
 	<TextView android:layout_width="wrap_content"
-		android:layout_height="wrap_content" 
-		android:text="@string/entry_keyfile" />
+	  android:layout_height="wrap_content" 
+	  android:text="@string/entry_keyfile" />
 	<EditText android:id="@+id/pass_keyfile" 
 	  android:layout_width="fill_parent"
-		android:layout_height="wrap_content" 
-		android:layout_weight="1"
-		android:singleLine="true"/>
-	
+	  android:layout_height="wrap_content" 
+	  android:layout_weight="1"
+	  android:singleLine="true"/>
 	<Button android:id="@+id/pass_ok" 
 	  android:text="@string/pass_ok"
-		android:layout_width="100sp"
-		android:layout_height="wrap_content" />
-
+	  android:layout_width="100sp"
+	  android:layout_height="wrap_content" />
 </LinearLayout>

res/layout/row.xml

@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2009 Brian Pellin.
+     
+ This file is part of KeePassDroid.
+
+  KeePassDroid is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  KeePassDroid is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <TextView android:id="@+id/text1" xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"/>

res/values/strings.xml

@@ -2,8 +2,8 @@
 <resources>
     
     <string name="app_name">KeePassDroid</string>
-<string name="no_keys">No keys in database.</string>
-<string name="FileNotFound">/sdcard/keepass/keepass.kdb not found</string>
+<string name="no_keys">No entries in the database or group.</string>
+<string name="FileNotFound">File not found.</string>
 <string name="InvalidPassword">Invalid password or key file.</string>
 <string name="pass_ok">Ok</string>
 <string name="entry_title">Name: </string>
@@ -25,4 +25,5 @@
 <string name="error_nopass">A password or a keyfile is requried.</string>
 <string name="entry_and_or">Enter a password and/or a key file to unlock your database:</string>
 <string name="entry_keyfile">Key file (optional):</string>
+
 </resources>

src/com/android/keepass/Database.java

@@ -16,7 +16,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
  *
- */package com.android.keepass;
+ */
+package com.android.keepass;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;

src/com/android/keepass/KeePass.java

@@ -19,6 +19,8 @@
  */
 package com.android.keepass;
 
+import com.android.keepass.fileselect.FileSelectActivity;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -32,7 +34,7 @@ public class KeePass extends Activity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
-		Intent i = new Intent(this, PasswordActivity.class);
+		Intent i = new Intent(this, FileSelectActivity.class);
 		
 		startActivityForResult(i, 0);
 	}

src/com/android/keepass/PasswordActivity.java

@@ -19,40 +19,84 @@
  */
 package com.android.keepass;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
 import org.bouncycastle1.crypto.InvalidCipherTextException;
 
-import com.android.keepass.keepasslib.InvalidKeyFileException;
-
 import android.app.Activity;
-import android.content.SharedPreferences;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
-import android.widget.EditText;
+import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.keepass.fileselect.FileDbHelper;
+import com.android.keepass.keepasslib.InvalidKeyFileException;
+
 public class PasswordActivity extends Activity {
 
-	public static final String LAST_FILENAME = "lastFile";
-	public static final String LAST_KEYFILE = "lastKey";
-	
 	private static final int MENU_HOMEPAGE = Menu.FIRST;
+	private static final String KEY_FILENAME = "fileName";
+	private static final String KEY_KEYFILE = "keyFile";
+
+	private String mFileName;
+	private String mKeyFile;
+	
+	public static void Launch(Activity act, String fileName) throws FileNotFoundException {
+		Launch(act,fileName,"");
+	}
+	
+	public static void Launch(Activity act, String fileName, String keyFile) throws FileNotFoundException {
+		File dbFile = new File(fileName);
+		if ( ! dbFile.exists() ) {
+			throw new FileNotFoundException();
+			//Toast.makeText(act, R.string.FileNotFound, Toast.LENGTH_LONG);
+			//return;
+		}
+		
+		Intent i = new Intent(act, PasswordActivity.class);
+		i.putExtra(KEY_FILENAME, fileName);
+		i.putExtra(KEY_KEYFILE, keyFile);
+		
+		act.startActivityForResult(i, 0);
+		
+	}
+	
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		
+		if (resultCode == KeePass.EXIT_LOCK) {
+			setResult(KeePass.EXIT_LOCK);
+			finish();
+		}
+		
+		Database.clear(); 
+	}
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+	
+		Intent i = getIntent();
+		mFileName = i.getStringExtra(KEY_FILENAME);
+		mKeyFile = i.getStringExtra(KEY_KEYFILE);
+		
 		setContentView(R.layout.password);
+		populateView();
 
 		Button confirmButton = (Button) findViewById(R.id.pass_ok);
 		confirmButton.setOnClickListener(new ClickHandler(this));
-		
-		loadDefaultPrefs();
-		
+	}
+	
+	private void populateView() {
+		setEditText(R.id.pass_filename, mFileName);
+		setEditText(R.id.pass_keyfile, mKeyFile);
 	}
 	
 	@Override
@@ -61,7 +105,6 @@ public class PasswordActivity extends Activity {
 		
 		// Clear password on Database state
 		setEditText(R.id.pass_password, "");
-		Database.clear(); 
 	}
 
 	@Override
@@ -70,28 +113,6 @@ public class PasswordActivity extends Activity {
 		
 	}
 
-	private void loadDefaultPrefs() {
-		SharedPreferences settings = getPreferences(MODE_PRIVATE);
-		String lastFile = settings.getString(LAST_FILENAME, "");
-		String lastKey = settings.getString(LAST_KEYFILE,"");
-		
-		if (lastFile == "") {
-			lastFile = "/sdcard/keepass/keepass.kdb";
-		}
-		
-		setEditText(R.id.pass_filename, lastFile);
-		setEditText(R.id.pass_keyfile, lastKey);
-	}
-	
-	private void saveDefaultPrefs() {
-		SharedPreferences settings = getPreferences(MODE_PRIVATE);
-		SharedPreferences.Editor editor = settings.edit();
-		editor.putString(LAST_FILENAME, getEditText(R.id.pass_filename));
-		editor.putString(LAST_KEYFILE, getEditText(R.id.pass_keyfile));
-		editor.commit();
-	}
-	
-	
 	private void errorMessage(CharSequence text)
 	{
 		Toast.makeText(this, text, Toast.LENGTH_LONG).show();
@@ -118,9 +139,9 @@ public class PasswordActivity extends Activity {
 			}
 			
 			try {
-
-				Database.LoadData(getEditText(R.id.pass_filename), pass, key);
-				saveDefaultPrefs();
+				String fileName = getEditText(R.id.pass_filename);
+				Database.LoadData(fileName, pass, key);
+				saveFileData(fileName, key);
 				GroupActivity.Launch(mAct, null);
 
 			} catch (InvalidCipherTextException e) {
@@ -135,19 +156,21 @@ public class PasswordActivity extends Activity {
 		}			
 	}
 	
-	private String getEditText(int resId) {
-		EditText te =  (EditText) findViewById(resId);
-		assert(te == null);
+	private void saveFileData(String fileName, String key) {
+		FileDbHelper db = new FileDbHelper(this);
+		db.open();
 		
-		if (te != null) {
-			return te.getText().toString();
-		} else {
-			return "";
-		}
+		db.createFile(fileName, key);
+		
+		db.close();
+	}
+	
+	private String getEditText(int resId) {
+		return Util.getEditText(this, resId);
 	}
 	
 	private void setEditText(int resId, String str) {
-		EditText te =  (EditText) findViewById(resId);
+		TextView te =  (TextView) findViewById(resId);
 		assert(te == null);
 		
 		if (te != null) {

src/com/android/keepass/Util.java

@@ -19,10 +19,12 @@
  */
 package com.android.keepass;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.text.ClipboardManager;
+import android.widget.TextView;
 
 public class Util {
 	public static void copyToClipboard(Context context, String text) {
@@ -37,4 +39,24 @@ public class Util {
 		}
 	}
 
+	public static String getEditText(Activity act, int resId) {
+		TextView te =  (TextView) act.findViewById(resId);
+		assert(te == null);
+		
+		if (te != null) {
+			return te.getText().toString();
+		} else {
+			return "";
+		}
+	}
+	
+	public static void setEditText(Activity act, int resId, String str) {
+		TextView te =  (TextView) act.findViewById(resId);
+		assert(te == null);
+		
+		if (te != null) {
+			te.setText(str);
+		}
+	}
+
 }

src/com/android/keepass/fileselect/FileDbHelper.java

@@ -0,0 +1,196 @@
+/*
+ * Copyright 2009 Brian Pellin.
+ *     
+ * This file is part of KeePassDroid.
+ *
+ *  KeePassDroid is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDroid is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.android.keepass.fileselect;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+
+public class FileDbHelper {
+	
+	public static final String LAST_FILENAME = "lastFile";
+	public static final String LAST_KEYFILE = "lastKey";
+	
+	private static final String DATABASE_NAME = "keepassdroid";
+	private static final String FILE_TABLE = "files";
+	private static final int DATABASE_VERSION = 1;
+	
+	private static final int MAX_FILES = 5;
+	
+	public static final String KEY_FILE_ID = "_id";
+	public static final String KEY_FILE_FILENAME = "fileName";
+	public static final String KEY_FILE_KEYFILE = "keyFile";
+	public static final String KEY_FILE_UPDATED = "updated";
+
+	private static final String DATABASE_CREATE = 
+		"create table " + FILE_TABLE + " ( " + KEY_FILE_ID + " integer primary key autoincrement, " 
+			+ KEY_FILE_FILENAME + " text not null, " + KEY_FILE_KEYFILE + " text, "
+			+ KEY_FILE_UPDATED + " integer not null);";
+	
+	private final Context mCtx;
+	private DatabaseHelper mDbHelper;
+	private SQLiteDatabase mDb;
+	
+	private static class DatabaseHelper extends SQLiteOpenHelper {
+		private final Context mCtx;
+		
+		DatabaseHelper(Context ctx) {
+			super(ctx, DATABASE_NAME, null, DATABASE_VERSION);
+			mCtx = ctx;
+		}
+
+		@Override
+		public void onCreate(SQLiteDatabase db) {
+			db.execSQL(DATABASE_CREATE);
+			
+			// Migrate preference to database if it is set.
+			SharedPreferences settings = mCtx.getSharedPreferences("PasswordActivity", Context.MODE_PRIVATE); 
+			String lastFile = settings.getString(LAST_FILENAME, "");
+			String lastKey = settings.getString(LAST_KEYFILE,"");
+						
+			if ( lastFile.length() > 0 ) {
+				ContentValues vals = new ContentValues();
+				vals.put(KEY_FILE_FILENAME, lastFile);
+				vals.put(KEY_FILE_UPDATED, System.currentTimeMillis());
+				
+				if ( lastKey.length() > 0 ) {
+					vals.put(KEY_FILE_KEYFILE, lastKey);
+				}
+				
+				db.insert(FILE_TABLE, null, vals);
+				
+				// Clear old preferences
+				deletePrefs(settings);
+				
+			}
+		}
+
+		@Override
+		public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+			// Only one database version so far
+		}
+		
+		private void deletePrefs(SharedPreferences prefs) {
+			// We won't worry too much if this fails
+			try {
+				SharedPreferences.Editor editor = prefs.edit();
+				editor.remove(LAST_FILENAME);
+				editor.remove(LAST_KEYFILE);
+				editor.commit();
+			} catch (Exception e) {
+				assert(true);
+			}
+		}
+	}
+	
+	public FileDbHelper(Context ctx) {
+		mCtx = ctx;
+	}
+	
+	public FileDbHelper open() throws SQLException {
+		mDbHelper = new DatabaseHelper(mCtx);
+		mDb = mDbHelper.getWritableDatabase();
+		return this;
+	}
+	
+	public void close() {
+		mDb.close();
+	}
+	
+	public long createFile(String fileName, String keyFile) {
+		
+		// Check to see if this filename is already used
+		Cursor cursor;
+		try {
+			cursor = mDb.query(true, FILE_TABLE, new String[] {KEY_FILE_ID}, 
+					KEY_FILE_FILENAME + "=?", new String[] {fileName}, null, null, null, null);
+		} catch (Exception e ) {
+			assert(true);
+			return -1;
+		}
+		
+		long result;
+		// If there is an existing entry update it with the new key file
+		if ( cursor.getCount() > 0 ) {
+			cursor.moveToFirst();
+			long id = cursor.getLong(cursor.getColumnIndexOrThrow(KEY_FILE_ID));
+			
+			ContentValues vals = new ContentValues();
+			vals.put(KEY_FILE_KEYFILE, keyFile);
+			vals.put(KEY_FILE_UPDATED, System.currentTimeMillis());
+			
+			result = mDb.update(FILE_TABLE, vals, KEY_FILE_ID + " = " + id, null);
+		
+		// Otherwise add the new entry
+		} else {
+			ContentValues vals = new ContentValues();
+			vals.put(KEY_FILE_FILENAME, fileName);
+			vals.put(KEY_FILE_KEYFILE, keyFile);
+			vals.put(KEY_FILE_UPDATED, System.currentTimeMillis());
+			
+			result = mDb.insert(FILE_TABLE, null, vals);
+			
+		}
+		// Delete all but the last five records
+		try {
+			deleteAllBut(MAX_FILES);
+		} catch (Exception e) {
+			e.printStackTrace();
+			assert(true);
+		}
+		return result;
+		
+	}
+	
+	private void deleteAllBut(int limit) {
+		Cursor cursor = mDb.query(FILE_TABLE, new String[] {KEY_FILE_UPDATED}, null, null, null, null, KEY_FILE_UPDATED);
+		
+		if ( cursor.getCount() > limit ) {
+			cursor.moveToFirst();
+			long time = cursor.getLong(cursor.getColumnIndexOrThrow(KEY_FILE_UPDATED));
+			
+			mDb.execSQL("DELETE FROM " + FILE_TABLE + " WHERE " + KEY_FILE_UPDATED + "<" + time + ";");
+		}
+		
+		
+	}
+	
+	public Cursor fetchAllFiles() {
+		Cursor ret;
+		ret = mDb.query(FILE_TABLE, new String[] {KEY_FILE_ID, KEY_FILE_FILENAME, KEY_FILE_KEYFILE }, null, null, null, null, KEY_FILE_UPDATED + " DESC", Integer.toString(MAX_FILES));
+		return ret;
+	}
+	
+	public Cursor fetchFile(long fileId) throws SQLException {
+		Cursor cursor = mDb.query(true, FILE_TABLE, new String[] {KEY_FILE_FILENAME, KEY_FILE_KEYFILE}, 
+				KEY_FILE_ID + "=" + fileId, null, null, null, null, null);
+		
+		if ( cursor != null ) {
+			cursor.moveToFirst();
+		}
+		
+		return cursor;
+		
+	}
+}

src/com/android/keepass/fileselect/FileListAdapter.java

@@ -0,0 +1,40 @@
+package com.android.keepass.fileselect;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+public class FileListAdapter extends BaseAdapter {
+	private final Context mCtx;
+	
+	FileListAdapter(Context ctx) {
+		mCtx = ctx;
+	}
+	
+	@Override
+	public int getCount() {
+		// TODO Auto-generated method stub
+		return 20;
+	}
+
+	@Override
+	public Object getItem(int arg0) {
+		return arg0;
+	}
+
+	@Override
+	public long getItemId(int arg0) {
+		// TODO Auto-generated method stub
+		return arg0;
+	}
+
+	@Override
+	public View getView(int arg0, View arg1, ViewGroup arg2) {
+		TextView tv = new TextView(mCtx);
+		tv.setText("This is the " + arg0 + " list item.");
+		return tv;
+	}
+
+}

src/com/android/keepass/fileselect/FileSelectActivity.java

@@ -0,0 +1,148 @@
+/*
+ * Copyright 2009 Brian Pellin.
+ *     
+ * This file is part of KeePassDroid.
+ *
+ *  KeePassDroid is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePassDroid is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePassDroid.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.android.keepass.fileselect;
+
+import java.io.FileNotFoundException;
+
+import android.app.Activity;
+import android.app.ListActivity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.SimpleCursorAdapter;
+import android.widget.Toast;
+
+import com.android.keepass.PasswordActivity;
+import com.android.keepass.R;
+import com.android.keepass.Util;
+
+public class FileSelectActivity extends ListActivity {
+
+	private static final int MENU_HOMEPAGE = Menu.FIRST;
+	private FileDbHelper mDbHelper;
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		
+		setContentView(R.layout.file_selection);
+		
+		Button openButton = (Button) findViewById(R.id.file_button);
+		openButton.setOnClickListener(new ClickHandler(this));
+		
+		mDbHelper = new FileDbHelper(this);
+		mDbHelper.open();
+		
+		fillData();
+		
+	}
+	
+	private void fillData() {
+        // Get all of the rows from the database and create the item list
+        Cursor filesCursor = mDbHelper.fetchAllFiles();
+        startManagingCursor(filesCursor);
+        
+        // Create an array to specify the fields we want to display in the list (only TITLE)
+        String[] from = new String[]{FileDbHelper.KEY_FILE_FILENAME};
+        
+        // and an array of the fields we want to bind those fields to (in this case just text1)
+        int[] to = new int[]{R.id.file_filename};
+        
+        // Now create a simple cursor adapter and set it to display
+        SimpleCursorAdapter notes = 
+        	    new SimpleCursorAdapter(this, R.layout.file_row, filesCursor, from, to);
+        setListAdapter(notes);
+	}
+
+	
+	@Override
+	protected void onListItemClick(ListView l, View v, int position, long id) {
+		super.onListItemClick(l, v, position, id);
+	
+		Cursor cursor = mDbHelper.fetchFile(id);
+		startManagingCursor(cursor);
+		
+		String fileName = cursor.getString(cursor.getColumnIndexOrThrow(FileDbHelper.KEY_FILE_FILENAME));
+		String keyFile = cursor.getString(cursor.getColumnIndexOrThrow(FileDbHelper.KEY_FILE_KEYFILE));
+		
+		try {
+			PasswordActivity.Launch(this, fileName, keyFile);
+		} catch (FileNotFoundException e) {
+			Toast.makeText(this, R.string.FileNotFound, Toast.LENGTH_LONG).show();
+		}
+	}
+
+
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		
+		fillData();
+	}
+
+
+	private class ClickHandler implements View.OnClickListener {
+		Activity mAct;
+		
+		ClickHandler(Activity act) {
+			mAct = act;
+		}
+		
+		@Override
+		public void onClick(View v) {
+			String fileName = Util.getEditText(mAct, R.id.file_filename);
+			
+			try {
+				PasswordActivity.Launch(mAct, fileName);
+			} catch (FileNotFoundException e) {
+				Toast.makeText(mAct, R.string.FileNotFound, Toast.LENGTH_LONG).show();
+			}
+			
+		}
+		
+	}
+	
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		super.onCreateOptionsMenu(menu);
+		
+		menu.add(0, MENU_HOMEPAGE, 0, R.string.menu_homepage);
+		menu.findItem(MENU_HOMEPAGE).setIcon(android.R.drawable.ic_menu_upload);
+		
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch ( item.getItemId() ) {
+		case MENU_HOMEPAGE:
+			Util.gotoUrl(this, getText(R.string.homepage).toString());
+			return true;
+		}
+		
+		return super.onOptionsItemSelected(item);
+	}
+
+}