From cf6a84dd14b2a80b9c75e625c111da3cce8e4207 Mon Sep 17 00:00:00 2001
From: rmceoin <rmceoin@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Sun, 4 Apr 2010 01:18:08 +0000
Subject: [PATCH] OI Safe: renamed FrontDoor to Safe, so that when you add the
 project to Eclipse it uses the name "Safe" not "FrontDoor".   I hate having
 to rename the project each time I add it back to Eclipse.

Also removed "beta" and made it 1.2.5.


git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@2597 72b678ce-9140-0410-bee8-679b907dd61a
---
 AndroidManifest.xml                                    | 5 +++--
 src/org/openintents/safe/CategoryEdit.java             | 2 +-
 src/org/openintents/safe/CategoryList.java             | 4 ++--
 src/org/openintents/safe/ChangePass.java               | 2 +-
 src/org/openintents/safe/CryptoContentProvider.java    | 2 +-
 src/org/openintents/safe/Help.java                     | 2 +-
 src/org/openintents/safe/LogOffActivity.java           | 2 +-
 src/org/openintents/safe/PassEdit.java                 | 2 +-
 src/org/openintents/safe/PassGen.java                  | 2 +-
 src/org/openintents/safe/PassList.java                 | 2 +-
 src/org/openintents/safe/PassView.java                 | 2 +-
 src/org/openintents/safe/Preferences.java              | 2 +-
 src/org/openintents/safe/Restore.java                  | 2 +-
 src/org/openintents/safe/{FrontDoor.java => Safe.java} | 4 ++--
 src/org/openintents/safe/Search.java                   | 2 +-
 tests/oisafe-test7.csv                                 | 5 +++++
 16 files changed, 24 insertions(+), 18 deletions(-)
 rename src/org/openintents/safe/{FrontDoor.java => Safe.java} (94%)
 create mode 100644 tests/oisafe-test7.csv

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 84fa922..1e7a3a2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.openintents.safe" 
-    android:versionName="1.2.5beta1" android:versionCode="14">
+    android:versionName="1.2.5" android:versionCode="15">
     <!-- History:
+    1.2.5 [15]: 2010-04-03
     1.2.4 [13]: 2009-11-27
     1.2.3 [12]: 2009-11-23
     1.2.2 [11]: 2009-10-29
@@ -40,7 +41,7 @@
         <meta-data android:name="org.openintents.metadata.EMAIL"
                        android:value="@string/about_email" />
                    
-        <activity class=".FrontDoor" android:name="FrontDoor" android:label="@string/app_name"
+        <activity class=".Safe" android:name="Safe" android:label="@string/app_name"
         		android:theme="@android:style/Theme.Translucent.NoTitleBar">
          	<intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/src/org/openintents/safe/CategoryEdit.java b/src/org/openintents/safe/CategoryEdit.java
index b20a8c4..f0c6c67 100644
--- a/src/org/openintents/safe/CategoryEdit.java
+++ b/src/org/openintents/safe/CategoryEdit.java
@@ -60,7 +60,7 @@ public class CategoryEdit extends Activity {
 		super.onCreate(icicle);
 		if (debug) Log.d(TAG,"onCreate("+icicle+")");
 		
-		frontdoor = new Intent(this, FrontDoor.class);
+		frontdoor = new Intent(this, Safe.class);
 		frontdoor.setAction(CryptoIntents.ACTION_AUTOLOCK);
 		restartTimerIntent = new Intent (CryptoIntents.ACTION_RESTART_TIMER);
 
diff --git a/src/org/openintents/safe/CategoryList.java b/src/org/openintents/safe/CategoryList.java
index cae49be..ce2e665 100644
--- a/src/org/openintents/safe/CategoryList.java
+++ b/src/org/openintents/safe/CategoryList.java
@@ -226,7 +226,7 @@ public class CategoryList extends ListActivity {
 		if (debug) Log.d(TAG,"onResume()");
 
 		if (isSignedIn()==false) {
-			Intent frontdoor = new Intent(this, FrontDoor.class);
+			Intent frontdoor = new Intent(this, Safe.class);
 			frontdoor.setAction(CryptoIntents.ACTION_AUTOLOCK);
 			startActivity(frontdoor);
 			return;
@@ -613,7 +613,7 @@ public class CategoryList extends ListActivity {
 		serviceIntent.setClass(this, ServiceDispatchImpl.class );
 	    stopService(serviceIntent);
 		masterKey=null;
-	    Intent frontdoor = new Intent(this, FrontDoor.class);
+	    Intent frontdoor = new Intent(this, Safe.class);
 		frontdoor.setAction(CryptoIntents.ACTION_AUTOLOCK);
 	    startActivity(frontdoor);
     }
diff --git a/src/org/openintents/safe/ChangePass.java b/src/org/openintents/safe/ChangePass.java
index 687ec8b..9e0175f 100644
--- a/src/org/openintents/safe/ChangePass.java
+++ b/src/org/openintents/safe/ChangePass.java
@@ -92,7 +92,7 @@ public class ChangePass extends Activity {
 
 		if (debug) Log.d(TAG,"onCreate()");
 
-		frontdoor = new Intent(this, FrontDoor.class);
+		frontdoor = new Intent(this, Safe.class);
 		frontdoor.setAction(CryptoIntents.ACTION_AUTOLOCK);
 		restartTimerIntent = new Intent (CryptoIntents.ACTION_RESTART_TIMER);
 		
diff --git a/src/org/openintents/safe/CryptoContentProvider.java b/src/org/openintents/safe/CryptoContentProvider.java
index 6ad3bd4..15844a6 100644
--- a/src/org/openintents/safe/CryptoContentProvider.java
+++ b/src/org/openintents/safe/CryptoContentProvider.java
@@ -150,7 +150,7 @@ public class CryptoContentProvider extends ContentProvider {
 			        
 			        if (debug) Log.d(TAG, "Original file path: " + originalFile);
 					if (CategoryList.isSignedIn()==false) {
-						Intent frontdoor = new Intent(getContext(), FrontDoor.class);
+						Intent frontdoor = new Intent(getContext(), Safe.class);
 						frontdoor.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 						getContext().startActivity(frontdoor);		
 			        	throw new CryptoHelperException("Not logged in.");
diff --git a/src/org/openintents/safe/Help.java b/src/org/openintents/safe/Help.java
index 18e2a8c..39fe825 100644
--- a/src/org/openintents/safe/Help.java
+++ b/src/org/openintents/safe/Help.java
@@ -61,7 +61,7 @@ public class Help extends Activity {
     public void onCreate(Bundle icicle) {
     	super.onCreate(icicle);
 
-		frontdoor = new Intent(this, FrontDoor.class);
+		frontdoor = new Intent(this, Safe.class);
 		frontdoor.setAction(CryptoIntents.ACTION_AUTOLOCK);
 		restartTimerIntent = new Intent (CryptoIntents.ACTION_RESTART_TIMER);
 
diff --git a/src/org/openintents/safe/LogOffActivity.java b/src/org/openintents/safe/LogOffActivity.java
index e3868df..4949f5e 100644
--- a/src/org/openintents/safe/LogOffActivity.java
+++ b/src/org/openintents/safe/LogOffActivity.java
@@ -47,7 +47,7 @@ public class LogOffActivity extends Activity {
 	        
 	    	gotoPWS.setOnClickListener(new View.OnClickListener() {
 	    		public void onClick(View arg0) {
-	    			Intent intent = new Intent(LogOffActivity.this, FrontDoor.class);
+	    			Intent intent = new Intent(LogOffActivity.this, Safe.class);
 	    			//intent.setClass (LogOffActivity.this, FrontDoor.class );
 	    			intent.addCategory(Intent.CATEGORY_LAUNCHER);
 	    			intent.setAction(Intent.ACTION_MAIN);
diff --git a/src/org/openintents/safe/PassEdit.java b/src/org/openintents/safe/PassEdit.java
index 4df4da9..4dfacff 100644
--- a/src/org/openintents/safe/PassEdit.java
+++ b/src/org/openintents/safe/PassEdit.java
@@ -107,7 +107,7 @@ public class PassEdit extends Activity {
 			return;
 		}
 
-		frontdoor = new Intent(this, FrontDoor.class);
+		frontdoor = new Intent(this, Safe.class);
 		frontdoor.setAction(CryptoIntents.ACTION_AUTOLOCK);
 		restartTimerIntent = new Intent (CryptoIntents.ACTION_RESTART_TIMER);
 
diff --git a/src/org/openintents/safe/PassGen.java b/src/org/openintents/safe/PassGen.java
index 56a2d07..907c34f 100644
--- a/src/org/openintents/safe/PassGen.java
+++ b/src/org/openintents/safe/PassGen.java
@@ -128,7 +128,7 @@ public class PassGen extends Activity {
     public void onCreate(Bundle icicle) {
 		super.onCreate(icicle);
 		
-		frontdoor = new Intent(this, FrontDoor.class);
+		frontdoor = new Intent(this, Safe.class);
 		frontdoor.setAction(CryptoIntents.ACTION_AUTOLOCK);
 		restartTimerIntent = new Intent (CryptoIntents.ACTION_RESTART_TIMER);
 
diff --git a/src/org/openintents/safe/PassList.java b/src/org/openintents/safe/PassList.java
index 78a868a..f28cd5d 100644
--- a/src/org/openintents/safe/PassList.java
+++ b/src/org/openintents/safe/PassList.java
@@ -153,7 +153,7 @@ public class PassList extends ListActivity {
 			return;
 		}
 
-		frontdoor = new Intent(this, FrontDoor.class);
+		frontdoor = new Intent(this, Safe.class);
 		frontdoor.setAction(CryptoIntents.ACTION_AUTOLOCK);
 		restartTimerIntent = new Intent (CryptoIntents.ACTION_RESTART_TIMER);
 
diff --git a/src/org/openintents/safe/PassView.java b/src/org/openintents/safe/PassView.java
index aa6a5d2..487d8c7 100644
--- a/src/org/openintents/safe/PassView.java
+++ b/src/org/openintents/safe/PassView.java
@@ -87,7 +87,7 @@ public class PassView extends Activity implements View.OnClickListener {
 
 		if (debug) Log.d(TAG,"onCreate("+icicle+")");
 		
-		frontdoor = new Intent(this, FrontDoor.class);
+		frontdoor = new Intent(this, Safe.class);
 		frontdoor.setAction(CryptoIntents.ACTION_AUTOLOCK);
 		restartTimerIntent = new Intent (CryptoIntents.ACTION_RESTART_TIMER);
 
diff --git a/src/org/openintents/safe/Preferences.java b/src/org/openintents/safe/Preferences.java
index 6b510f3..3035cca 100644
--- a/src/org/openintents/safe/Preferences.java
+++ b/src/org/openintents/safe/Preferences.java
@@ -41,7 +41,7 @@ public class Preferences extends PreferenceActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
-		frontdoor = new Intent(this, FrontDoor.class);
+		frontdoor = new Intent(this, Safe.class);
 		frontdoor.setAction(CryptoIntents.ACTION_AUTOLOCK);
 		restartTimerIntent = new Intent (CryptoIntents.ACTION_RESTART_TIMER);
 
diff --git a/src/org/openintents/safe/Restore.java b/src/org/openintents/safe/Restore.java
index 9bdbadd..6e48974 100644
--- a/src/org/openintents/safe/Restore.java
+++ b/src/org/openintents/safe/Restore.java
@@ -86,7 +86,7 @@ public class Restore extends Activity {
 		    firstTime = extras != null ? extras.getBoolean(Restore.KEY_FIRST_TIME) : false;
 		}
 
-		frontdoor = new Intent(this, FrontDoor.class);
+		frontdoor = new Intent(this, Safe.class);
 		frontdoor.setAction(CryptoIntents.ACTION_AUTOLOCK);
 		restartTimerIntent = new Intent (CryptoIntents.ACTION_RESTART_TIMER);
 
diff --git a/src/org/openintents/safe/FrontDoor.java b/src/org/openintents/safe/Safe.java
similarity index 94%
rename from src/org/openintents/safe/FrontDoor.java
rename to src/org/openintents/safe/Safe.java
index cf5822a..fa50043 100644
--- a/src/org/openintents/safe/FrontDoor.java
+++ b/src/org/openintents/safe/Safe.java
@@ -25,14 +25,14 @@ import android.util.Log;
 
 
 /**
- * FrontDoor Activity
+ * Safe Activity
  * 
  * This activity just makes sure we're entering the front door, not calling encrypt/decrypt
  * or other intents.
  * 
  * @author Steven Osborn - http://steven.bitsetters.com
  */
-public class FrontDoor extends Activity {
+public class Safe extends Activity {
 
     private static final String TAG = "FrontDoor";
 	private static final boolean debug = false;
diff --git a/src/org/openintents/safe/Search.java b/src/org/openintents/safe/Search.java
index 9066ccd..f0a8543 100644
--- a/src/org/openintents/safe/Search.java
+++ b/src/org/openintents/safe/Search.java
@@ -102,7 +102,7 @@ public class Search extends ListActivity {
 			getResources().getString(R.string.search);
 		setTitle(title);
 
-		frontdoor = new Intent(this, FrontDoor.class);
+		frontdoor = new Intent(this, Safe.class);
 		frontdoor.setAction(CryptoIntents.ACTION_AUTOLOCK);
 		restartTimerIntent = new Intent (CryptoIntents.ACTION_RESTART_TIMER);
 
diff --git a/tests/oisafe-test7.csv b/tests/oisafe-test7.csv
new file mode 100644
index 0000000..8614d72
--- /dev/null
+++ b/tests/oisafe-test7.csv
@@ -0,0 +1,5 @@
+Category,Description,Website,Username,Password,Notes
+Business,Amazon ,www.amazon.com,,123456,
+Cards,AMEX,,,,card #: 1234 5678
+Organizations,AAMC,,,,#: 1234546
+Personal,Driver's License,,,,#: 123456789
-- 
2.50.1