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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 84fa9223b088f4e42cab581c5804fec07fd2b2f8..1e7a3a2c279f660ee64f2c9ac48bc1791afe717b 100644 (file)
--- 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" \r
-    android:versionName="1.2.5beta1" android:versionCode="14">\r
+    android:versionName="1.2.5" android:versionCode="15">\r
     <!-- History:
+    1.2.5 [15]: 2010-04-03
     1.2.4 [13]: 2009-11-27\r
     1.2.3 [12]: 2009-11-23\r
     1.2.2 [11]: 2009-10-29\r
@@ -40,7 +41,7 @@
         <meta-data android:name="org.openintents.metadata.EMAIL"\r
                        android:value="@string/about_email" />\r
                    
-        <activity class=".FrontDoor" android:name="FrontDoor" android:label="@string/app_name"\r
+        <activity class=".Safe" android:name="Safe" android:label="@string/app_name"\r
                        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 b20a8c408a7f6dba23d38b13df99ed8815e8009f..f0c6c67e8a550f4cf138d01dbe74e8fdf5733e97 100644 (file)
--- 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 cae49be0aa781763af240453547e0baf87016907..ce2e665580e67535d2f959ded9ea271a34f69cf6 100644 (file)
--- 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 687ec8b661610393c693062a5762c0f86c0e3ce5..9e0175fd312e2662f034da5cc783ee4a58ecd414 100644 (file)
--- 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 6ad3bd41ab12171a0e4df8030eda2016603af9ef..15844a677ff00aa376426ba5151fa1898434979c 100644 (file)
--- a/src/org/openintents/safe/CryptoContentProvider.java
+++ b/src/org/openintents/safe/CryptoContentProvider.java
@@ -150,7 +150,7 @@ public class CryptoContentProvider extends ContentProvider {
                                \r
                                if (debug) Log.d(TAG, "Original file path: " + originalFile);\r
                                        if (CategoryList.isSignedIn()==false) {\r
-                                               Intent frontdoor = new Intent(getContext(), FrontDoor.class);\r
+                                               Intent frontdoor = new Intent(getContext(), Safe.class);\r
                                                frontdoor.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);\r
                                                getContext().startActivity(frontdoor);          \r
                                        throw new CryptoHelperException("Not logged in.");\r

diff --git a/src/org/openintents/safe/Help.java b/src/org/openintents/safe/Help.java
index 18e2a8ceb4824fd1efcd069dc149f9dea62f7f41..39fe825c1a2af92dfc17fd01246e776e7cc75296 100644 (file)
--- 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 e3868df22a9b85c691b3cfb737d925b46c9f3f2b..4949f5e8b9c08e3f4131f39cfe8317e57001b250 100644 (file)
--- 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 4df4da98195bd4b0347e86ce4264c52b74bcbbff..4dfacffb464f21fb01d2bc1889f719017b8fc53c 100644 (file)
--- 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 56a2d07108465d2f4e5faab391ad9345f82c5862..907c34fe695fe16ef2c1859389451247472a2e17 100644 (file)
--- 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 78a868a504ab6d9d12b38f7817e83375cd1c2159..f28cd5d62a3a40d8b97dd79491a2209646f13c09 100644 (file)
--- 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 aa6a5d29bb30127e6f8f5a7ac5e8c587771270ae..487d8c792d39d3aeaaa14662a0565486ddf1c647 100644 (file)
--- 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 6b510f36d44cc366613a535fd520693714fec0e6..3035cca84f0498ba83f7eca23f6cee9837f4e2b0 100644 (file)
--- 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 9bdbadd5157f5d6b9b3be2ac393a86e41107d50a..6e489747b9e197f3d797201f3613eb9762d0d482 100644 (file)
--- 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 cf5822a7dde2c118639e1f5fcd67a61bd35be5ac..fa500434d40c2d7351cbd1c76a6d4a258ffcddf8 100644 (file)
--- a/src/org/openintents/safe/FrontDoor.java
+++ b/src/org/openintents/safe/Safe.java
@@ -25,14 +25,14 @@ import android.util.Log;
 \r
 \r
 /**\r
- * FrontDoor Activity\r
+ * Safe Activity\r
  * \r
  * This activity just makes sure we're entering the front door, not calling encrypt/decrypt\r
  * or other intents.\r
  * \r
  * @author Steven Osborn - http://steven.bitsetters.com\r
  */\r
-public class FrontDoor extends Activity {\r
+public class Safe extends Activity {\r
 \r
     private static final String TAG = "FrontDoor";\r
        private static final boolean debug = false;\r

diff --git a/src/org/openintents/safe/Search.java b/src/org/openintents/safe/Search.java
index 9066ccd64daffdf827dddc5db1899142aa0e0501..f0a85431431063c2eac578041dfcd2bb45b2bdca 100644 (file)
--- 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 (file)
index 0000000..8614d72
--- /dev/null
+++ b/tests/oisafe-test7.csv
@@ -0,0 +1,5 @@
+Category,Description,Website,Username,Password,Notes\r
+Business,Amazon ,www.amazon.com,,123456,\r
+Cards,AMEX,,,,card #: 1234 5678\r
+Organizations,AAMC,,,,#: 1234546\r
+Personal,Driver's License,,,,#: 123456789\r