Move shutdown from Database into App.

src/com/keepassdroid/Database.java

@@ -56,7 +56,6 @@ public class Database {
 	public PwManager mPM;
 	public String mFilename;
 	public SearchDbHelper searchHelper;
-	public boolean shutdown = false;
 	private boolean loaded = false;
 	
 	public boolean Loaded() {
@@ -175,7 +174,6 @@ public class Database {
 		gRoot = null;
 		mPM = null;
 		mFilename = null;
-		shutdown = false;
 		loaded = false;
 	}
 	

src/com/keepassdroid/EntryActivity.java

@@ -224,7 +224,7 @@ public class EntryActivity extends LockingActivity {
 			return true;
 			
 		case MENU_LOCK:
-			App.getDB().shutdown = true;
+			App.setShutdown();
 			setResult(KeePass.EXIT_LOCK);
 			finish();
 			return true;

src/com/keepassdroid/GroupBaseActivity.java

@@ -164,7 +164,7 @@ public abstract class GroupBaseActivity extends LockingListActivity {
 			
 			return true;
 		case MENU_LOCK:
-			App.getDB().shutdown = true;
+			App.setShutdown();
 			setResult(KeePass.EXIT_LOCK);
 			finish();
 			return true;
@@ -217,7 +217,7 @@ public abstract class GroupBaseActivity extends LockingListActivity {
 				refreshIfDirty();
 			} else {
 				mHandler.post(new UIToastTask(GroupBaseActivity.this, "Unrecoverable error: " + mMessage));
-				App.getDB().shutdown = true;
+				App.setShutdown();
 				finish();
 			}
 		}

src/com/keepassdroid/LockingActivity.java

@@ -49,7 +49,7 @@ public class LockingActivity extends Activity {
 		
 		mLM.stopTimeout();
 
-		if ( App.getDB().shutdown ) {
+		if ( App.isShutdown() ) {
 			setResult(KeePass.EXIT_LOCK);
 			finish();
 		}

src/com/keepassdroid/LockingListActivity.java

@@ -48,7 +48,7 @@ public class LockingListActivity extends ListActivity {
 
 		mLM.stopTimeout();
 		
-		if ( App.getDB().shutdown ) {
+		if ( App.isShutdown() ) {
 			setResult(KeePass.EXIT_LOCK);
 			finish();
 		}

src/com/keepassdroid/PasswordActivity.java

@@ -218,6 +218,9 @@ public class PasswordActivity extends Activity {
 			Database db = App.getDB();
 			db.clear();
 			
+			// Clear the shutdown flag
+			App.clearShutdown();
+			
 			Handler handler = new Handler();
 			LoadDB task = new LoadDB(db, PasswordActivity.this, fileName, pass, key, new AfterLoad(handler));
 			ProgressTask pt = new ProgressTask(PasswordActivity.this, task, R.string.loading_database);

src/com/keepassdroid/app/App.java

@@ -25,6 +25,7 @@ import com.keepassdroid.Database;
 
 public class App extends Application {
 	private static Database db;
+	private static boolean shutdown;
 
 	public static Database getDB() {
 		if ( db == null ) {
@@ -37,6 +38,18 @@ public class App extends Application {
 	public static void setDB(Database d) {
 		db = d;
 	}
+	
+	public static boolean isShutdown() {
+		return shutdown;
+	}
+	
+	public static void setShutdown() {
+		shutdown = true;
+	}
+	
+	public static void clearShutdown() {
+		shutdown = false;
+	}
 
 	@Override
 	public void onTerminate() {

src/com/keepassdroid/services/TimeoutService.java

@@ -91,7 +91,7 @@ public class TimeoutService extends Service {
 		public void run() {
 			timeout = true;
 			
-			App.getDB().shutdown = true;
+			App.setShutdown();
 		}
 		
 	}