From fe8586dfcbf186902d94b1fbd21c029d80e85a83 Mon Sep 17 00:00:00 2001
From: rmceoin <rmceoin@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Sat, 24 Oct 2009 23:05:02 +0000
Subject: [PATCH] OI Safe: fixed bug with CategoryEdit preventing adding a
 category. Updated the front_door layout to work better on a QVGA display.

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@2346 72b678ce-9140-0410-bee8-679b907dd61a
---
 .classpath                                 |  2 +-
 AndroidManifest.xml                        |  2 +-
 res/layout-land/front_door.xml             | 54 +++++++---------------
 res/layout/front_door.xml                  | 40 ++++++++--------
 src/org/openintents/safe/AskPassword.java  |  6 +--
 src/org/openintents/safe/CategoryEdit.java |  4 --
 src/org/openintents/safe/CategoryList.java |  5 +-
 7 files changed, 43 insertions(+), 70 deletions(-)

diff --git a/.classpath b/.classpath
index 263baf8..8b37923 100644
--- a/.classpath
+++ b/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="lib" path="lib/OISafeMyBackupPro.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="lib" path="lib/OISafeMyBackupPro.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bd8a820..729d935 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -86,7 +86,7 @@
         <activity class=".PassEdit" android:name="PassEdit" android:label="@string/app_name" />
         <activity class=".CategoryList" android:name="CategoryList" android:label="@string/app_name" />
         <activity class=".Search" android:name="Search" android:label="@string/app_name" />
-        <activity class=".AskPassword" android:name="AskPassword" android:label="@string/app_name"/>
+        <activity class=".AskPassword" android:name="AskPassword" android:label="@string/app_name" android:windowSoftInputMode="adjustPan"/>
         <activity class=".Help" android:name="Help" android:label="@string/app_name" />
         <activity class=".ChangePass" android:name="ChangePass" android:label="@string/app_name" />
         <activity class=".Restore" android:name="Restore" android:label="@string/app_name" />
diff --git a/res/layout-land/front_door.xml b/res/layout-land/front_door.xml
index 6d3ef86..e8204fe 100644
--- a/res/layout-land/front_door.xml
+++ b/res/layout-land/front_door.xml
@@ -17,10 +17,12 @@
 * limitations under the License.
 *
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-	<LinearLayout android:id="@+id/entry_head"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:scrollbars="vertical">
+
+<LinearLayout android:id="@+id/entry_head"
 		android:layout_width="fill_parent" 
 		android:layout_height="wrap_content"
 		android:orientation = "vertical"
@@ -42,57 +44,35 @@
 				android:layout_height="wrap_content"
 			/>
 		</LinearLayout>
-	</LinearLayout>
 	<TextView android:id="@+id/first_time"
-		android:layout_below="@id/entry_head"
 		android:text="@string/first_time" 
 		android:paddingBottom="10sp"
-		android:visibility="invisible" 
+		android:visibility="gone" 
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content" />
-	<TextView android:id="@+id/pass_lbl"
-		android:layout_below="@id/first_time"
-		android:paddingRight="10sp"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/master_password" />
 	<EditText android:id="@+id/password" 
-		android:layout_below="@id/first_time"
-		android:layout_toRightOf="@id/pass_lbl"
-		android:password="true"
-		android:autoText="false"
-		android:singleLine="true"
+		android:inputType="textPassword"
+		android:hint="@string/master_password"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content" />
-		
-	<TextView android:id="@+id/confirm_lbl"
-		android:layout_below="@id/password"
-		android:paddingRight="17sp"
-		android:visibility="invisible" 
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/confirm" />
+
 	<EditText android:id="@+id/pass_confirm"
-		android:layout_below="@id/password"
-		android:layout_toRightOf="@id/confirm_lbl"
-		android:visibility="invisible" 
-		android:password="true"
-		android:autoText="false"
-		android:singleLine="true"
+		android:visibility="gone" 
+		android:inputType="textPassword"
+		android:hint="@string/confirm"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content" />
 
 	<Button android:id="@+id/continue_button" 
-		android:layout_below="@id/pass_confirm"
 	  	android:text="Continue"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content" />	
 
 	<Button android:id="@+id/restore_button" 
-		android:layout_below="@id/pass_confirm"
-		android:layout_toRightOf="@id/continue_button"
-		android:visibility="invisible" 
+		android:visibility="gone" 
 	  	android:text="@string/restore"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content" />	
-</RelativeLayout>	
\ No newline at end of file
+</LinearLayout>
+</ScrollView>
+	
\ No newline at end of file
diff --git a/res/layout/front_door.xml b/res/layout/front_door.xml
index 09d78c6..6c3ec45 100644
--- a/res/layout/front_door.xml
+++ b/res/layout/front_door.xml
@@ -17,7 +17,12 @@
 * limitations under the License.
 *
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:scrollbars="vertical">
+
+<LinearLayout
 	android:orientation="vertical" android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
 	 <LinearLayout android:layout_width="wrap_content" 
@@ -40,36 +45,26 @@
 	<TextView android:id="@+id/first_time"
 		android:text="@string/first_time" 
 		android:paddingBottom="10px"
-		android:visibility="invisible" 
+		android:visibility="gone" 
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content" />	
     <TextView android:id="@+id/remote"
 		android:text="@string/remote_ask" 
 		android:paddingBottom="10px"
-		android:visibility="invisible" 
+		android:visibility="gone" 
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content" />
-	<TextView android:id="@+id/pass_lbl"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:text="@string/master_password" />
+
 	<EditText android:id="@+id/password" 
-		android:password="true"
-		android:autoText="false"
-		android:singleLine="true"
+		android:inputType="textPassword"
+		android:hint="@string/master_password"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content" />
-		
-	<TextView android:id="@+id/confirm_lbl"
-		android:visibility="invisible" 
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:text="@string/confirm" />
+
 	<EditText android:id="@+id/pass_confirm"
-		android:visibility="invisible" 
-		android:password="true"
-		android:autoText="false"
-		android:singleLine="true"
+		android:visibility="gone" 
+		android:inputType="textPassword"
+		android:hint="@string/confirm"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content" />
 
@@ -78,8 +73,9 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content" />	
 	<Button android:id="@+id/restore_button" 
-		android:visibility="invisible" 
+		android:visibility="gone" 
 	  	android:text="@string/restore"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content" />	
-</LinearLayout>	
\ No newline at end of file
+</LinearLayout>
+</ScrollView>
diff --git a/src/org/openintents/safe/AskPassword.java b/src/org/openintents/safe/AskPassword.java
index 29045ad..df3e521 100644
--- a/src/org/openintents/safe/AskPassword.java
+++ b/src/org/openintents/safe/AskPassword.java
@@ -70,7 +70,7 @@ public class AskPassword extends Activity {
 	private EditText pbeKey;
 	private DBHelper dbHelper;
 	private TextView introText;
-	private TextView confirmText;
+//	private TextView confirmText;
 	private TextView remoteAsk;
 	private EditText confirmPass;
 	private String PBEKey;
@@ -147,11 +147,11 @@ public class AskPassword extends Activity {
 		introText = (TextView) findViewById(R.id.first_time);
 		remoteAsk = (TextView) findViewById(R.id.remote);
 		confirmPass = (EditText) findViewById(R.id.pass_confirm);
-		confirmText = (TextView) findViewById(R.id.confirm_lbl);
+//		confirmText = (TextView) findViewById(R.id.confirm_lbl);
 		if (masterKey.length() == 0) {
 			firstTime = true;
 			introText.setVisibility(View.VISIBLE);
-			confirmText.setVisibility(View.VISIBLE);
+//			confirmText.setVisibility(View.VISIBLE);
 			confirmPass.setVisibility(View.VISIBLE);
 			checkForBackup();
 		}
diff --git a/src/org/openintents/safe/CategoryEdit.java b/src/org/openintents/safe/CategoryEdit.java
index 12592e0..b20a8c4 100644
--- a/src/org/openintents/safe/CategoryEdit.java
+++ b/src/org/openintents/safe/CategoryEdit.java
@@ -79,10 +79,6 @@ public class CategoryEdit extends Activity {
 		    Bundle extras = getIntent().getExtras();            
 		    RowId = extras != null ? extras.getLong(CategoryList.KEY_ID) : null;
 		}
-		if ((RowId==null) || (RowId<1)) {
-			finish();	// no valid category
-			return;
-		}
 	
 		confirmButton.setOnClickListener(new View.OnClickListener() {
 		    public void onClick(View arg0) {
diff --git a/src/org/openintents/safe/CategoryList.java b/src/org/openintents/safe/CategoryList.java
index 0c0a9d1..18b5c01 100644
--- a/src/org/openintents/safe/CategoryList.java
+++ b/src/org/openintents/safe/CategoryList.java
@@ -483,7 +483,8 @@ public class CategoryList extends ListActivity {
 		return masterKey;
     }
 
-    private void addCategory() {
+    private void addCategoryActivity() {
+    	if (debug) Log.d(TAG,"addCategoryActivity()");
 		Intent i = new Intent(this, CategoryEdit.class);
 		startActivityForResult(i,REQUEST_ADD_CATEGORY);
     }
@@ -526,7 +527,7 @@ public class CategoryList extends ListActivity {
 			}
 		    break;
 		case ADD_CATEGORY_INDEX:
-		    addCategory();
+		    addCategoryActivity();
 		    break;
 		case DEL_CATEGORY_INDEX:
 		    try {
-- 
2.50.1