From bad897ec0469775adb6ed5d41b1d0b0f4a6e76a7 Mon Sep 17 00:00:00 2001
From: rmceoin <rmceoin@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Sat, 14 Feb 2009 05:12:48 +0000
Subject: [PATCH] OI Safe: added keypad to AskPassword.  Access via menu or
 preferences.

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@1940 72b678ce-9140-0410-bee8-679b907dd61a
---
 res/layout/keypad.xml                     |  65 +++++
 res/raw/click6a.ogg                       | Bin 0 -> 5912 bytes
 res/raw/dooropening1.ogg                  | Bin 0 -> 12969 bytes
 res/raw/dtmf2a.ogg                        | Bin 0 -> 5995 bytes
 res/values/strings.xml                    |   5 +
 res/xml/preferences.xml                   |  12 +
 src/org/openintents/safe/AskPassword.java | 286 ++++++++++++++++++++--
 src/org/openintents/safe/Preferences.java |   2 +
 8 files changed, 344 insertions(+), 26 deletions(-)
 create mode 100644 res/layout/keypad.xml
 create mode 100644 res/raw/click6a.ogg
 create mode 100644 res/raw/dooropening1.ogg
 create mode 100644 res/raw/dtmf2a.ogg

diff --git a/res/layout/keypad.xml b/res/layout/keypad.xml
new file mode 100644
index 0000000..50160dc
--- /dev/null
+++ b/res/layout/keypad.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:scrollbars="vertical">
+   
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:stretchColumns="0,1,2">
+
+    <TableRow>
+		<ImageView android:id="@+id/entry_icon"
+			android:layout_height="wrap_content"
+			android:layout_width="wrap_content"
+			android:src="@drawable/icon_safe"
+			/>
+		<TextView android:id="@+id/entry_header"
+    		android:layout_width="fill_parent" 
+    		android:layout_height="wrap_content" 
+    		android:text="@string/app_name"
+    		android:paddingTop="10px"
+			android:textSize="24px"
+			android:layout_span="2"
+    		/>
+    </TableRow>
+    <TableRow>
+        <Button android:id="@+id/keypad1"
+        	android:text="1" />
+        <Button android:id="@+id/keypad2"
+        	android:text="2" />
+        <Button android:id="@+id/keypad3"
+        	android:text="3" />
+    </TableRow>
+    <TableRow>
+        <Button android:id="@+id/keypad4"
+        	android:text="4" />
+        <Button android:id="@+id/keypad5"
+        	android:text="5" />
+        <Button android:id="@+id/keypad6"
+        	android:text="6" />
+    </TableRow>
+    <TableRow>
+        <Button android:id="@+id/keypad7"
+        	android:text="7" />
+        <Button android:id="@+id/keypad8"
+        	android:text="8" />
+        <Button android:id="@+id/keypad9"
+        	android:text="9" />
+    </TableRow>
+    <TableRow>
+        <Button android:id="@+id/keypad_star"
+        	android:text="*" />
+        <Button android:id="@+id/keypad0"
+        	android:text="0" />
+        <Button android:id="@+id/keypad_pound"
+        	android:text="#" />
+    </TableRow>
+    <TableRow>
+        <Button android:id="@+id/keypad_continue"
+        	android:layout_span="3"
+        	android:text="@string/continue_text" />
+    </TableRow>
+</TableLayout>
+</ScrollView>
diff --git a/res/raw/click6a.ogg b/res/raw/click6a.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..f5089f62699ce45f0ff64b9479f77af51a419868
GIT binary patch
literal 5912
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

literal 0
HcmV?d00001

diff --git a/res/raw/dooropening1.ogg b/res/raw/dooropening1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..442c42667e6d90bc7d74d1bbed9fce3f1afc172d
GIT binary patch
literal 12969
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

literal 0
HcmV?d00001

diff --git a/res/raw/dtmf2a.ogg b/res/raw/dtmf2a.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..e5a4d59d04e8421bbdc84c4f8307e7eb9f0f3064
GIT binary patch
literal 5995
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%0Dwh!p+!j^
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
ITOIO$0J;|Aod5s;

literal 0
HcmV?d00001

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c33fb3f..d86aae3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -129,6 +129,10 @@
 	<string name="pref_title_lock_timeout">Auto lock timeout</string>
 	<string name="pref_summary_lock_timeout">Minutes before timeout occurs and safe is locked</string>
 	<string name="pref_dialog_title_lock_timeout">Auto lock timeout</string>
+	<string name="pref_title_keypad">Keypad</string>
+	<string name="pref_summary_keypad">Use a keypad to enter Master Password</string>
+	<string name="pref_title_keypad_mute">Keypad Mute</string>
+	<string name="pref_summary_keypad_mute">Mute keypad sounds</string>
 	<string name="intent_decrypt">Decrypt (OI Safe)</string>
 	<string name="intent_encrypt">Encrypt (OI Safe)</string>
 	<string name="intent_get_password">Get password (OI Safe)</string>
@@ -155,4 +159,5 @@
 	<string name="not_found">not found</string>
 	<string name="dialog_title_first_time_warning">New master key</string>
 	<string name="dialog_summary_first_time_warning">A new random master key has been created. Use menu > backup and store this key in a safe place. Without this key you may lose encrypted data.</string>
+	<string name="switch_mode">Switch mode</string>
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 453eacd..3b062fc 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -39,5 +39,17 @@
                 android:dialogTitle="@string/pref_dialog_title_lock_timeout"
             	android:defaultValue="5" />    
 
+		<CheckBoxPreference
+			android:title="@string/pref_title_keypad"
+			android:summary="@string/pref_summary_keypad"
+			android:key="keypad"
+			android:defaultValue="false"/>
+		<CheckBoxPreference
+			android:title="@string/pref_title_keypad_mute"
+			android:summary="@string/pref_summary_keypad_mute"
+			android:key="keypad_mute"
+			android:defaultValue="false"
+			android:dependency="keypad"/>
+
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/org/openintents/safe/AskPassword.java b/src/org/openintents/safe/AskPassword.java
index f5a4ca9..6a436ea 100644
--- a/src/org/openintents/safe/AskPassword.java
+++ b/src/org/openintents/safe/AskPassword.java
@@ -20,7 +20,6 @@ import java.io.File;
 import java.security.NoSuchAlgorithmException;
 
 import org.openintents.distribution.EulaActivity;
-import org.openintents.safe.dialog.DialogHostingActivity;
 import org.openintents.util.VersionUtils;
 
 import android.app.Activity;
@@ -28,8 +27,13 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.media.MediaPlayer;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
@@ -55,6 +59,14 @@ public class AskPassword extends Activity {
 
     public static final int REQUEST_RESTORE = 0;
 
+    // Menu Item order
+    public static final int SWITCH_MODE_INDEX = Menu.FIRST;
+    
+    public static final int VIEW_NORMAL = 0;
+    public static final int VIEW_KEYPAD = 1;
+    
+    private int viewMode = VIEW_NORMAL;
+
 	private EditText pbeKey;
 	private DBHelper dbHelper;
 	private TextView introText;
@@ -67,6 +79,14 @@ public class AskPassword extends Activity {
 	private CryptoHelper ch;
 	private boolean firstTime = false;
 
+	// Keypad variables
+	private String keypadPassword="";
+	
+	private MediaPlayer mpDigitBeep = null;
+	private MediaPlayer mpErrorBeep = null;
+	private MediaPlayer mpSuccessBeep = null;
+	private boolean mute=false;
+	
 	/** Called when the activity is first created. */
 	@Override
 	public void onCreate(Bundle icicle) {
@@ -75,13 +95,8 @@ public class AskPassword extends Activity {
 		if (!EulaActivity.checkEula(this, getIntent())) {
             return;
         }
-        
-		Intent thisIntent = getIntent();
-		
-		boolean isLocal = thisIntent.getBooleanExtra (EXTRA_IS_LOCAL, false);
 			
-		if (debug)
-			Log.d(TAG, "onCreate()");
+		if (debug) Log.d(TAG, "onCreate()");
 
 		dbHelper = new DBHelper(this);
 			
@@ -92,7 +107,28 @@ public class AskPassword extends Activity {
 				databaseVersionError();
 			}
 		}
+		salt = dbHelper.fetchSalt();
+		masterKey = dbHelper.fetchMasterKey();
 
+		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
+        boolean prefKeypad = sp.getBoolean(Preferences.PREFERENCE_KEYPAD, false);
+        boolean prefKeypadMute = sp.getBoolean(Preferences.PREFERENCE_KEYPAD_MUTE, false);
+        mute=prefKeypadMute;
+        
+        if (prefKeypad) {
+        	viewMode=VIEW_KEYPAD;
+        }
+		if (masterKey.length() == 0) {
+			firstTime=true;
+		}		
+		if ((viewMode==VIEW_NORMAL) || (firstTime)) {
+			normalInit();
+		} else {
+			keypadInit();
+		}
+	}
+	
+	private void normalInit() {
 		// Setup layout
 		setContentView(R.layout.front_door);
 		ImageView icon = (ImageView) findViewById(R.id.entry_icon);
@@ -103,13 +139,14 @@ public class AskPassword extends Activity {
 		String head = appName + " " + version + "\n";
 		header.setText(head);
 
+		Intent thisIntent = getIntent();
+		boolean isLocal = thisIntent.getBooleanExtra (EXTRA_IS_LOCAL, false);
+
 		pbeKey = (EditText) findViewById(R.id.password);
 		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);
-		salt = dbHelper.fetchSalt();
-		masterKey = dbHelper.fetchMasterKey();
 		if (masterKey.length() == 0) {
 			firstTime = true;
 			introText.setVisibility(View.VISIBLE);
@@ -191,23 +228,25 @@ public class AskPassword extends Activity {
 			        findViewById(R.id.password).startAnimation(shake);
 					return;
 				}
-
-				Intent callbackIntent = new Intent();
-				
-				// Return the master key to our caller.  We no longer need the
-				// user-entered PBEKey. The master key is used for everything
-				// from here on out.
-				if (debug) Log.d(TAG,"calbackintent: masterKey="+masterKey+" salt="+salt);
-				callbackIntent.putExtra("masterKey", masterKey);
-				callbackIntent.putExtra("salt", salt);
-				setResult(RESULT_OK, callbackIntent);
-				
-				finish();
-				
+				gotPassword();
 			}
 		});
 	}
 	
+	private void gotPassword() {
+		Intent callbackIntent = new Intent();
+		
+		// Return the master key to our caller.  We no longer need the
+		// user-entered PBEKey. The master key is used for everything
+		// from here on out.
+		if (debug) Log.d(TAG,"calbackintent: masterKey="+masterKey+" salt="+salt);
+		callbackIntent.putExtra("masterKey", masterKey);
+		callbackIntent.putExtra("salt", salt);
+		setResult(RESULT_OK, callbackIntent);
+		
+		finish();
+	}
+	
 	private void checkForBackup() {
 		String filename=CategoryList.BACKUP_FILENAME;
 		File restoreFile=new File(filename);
@@ -234,25 +273,79 @@ public class AskPassword extends Activity {
 	protected void onPause() {
 		super.onPause();
 
-		if (debug)
-			Log.d(TAG, "onPause()");
+		if (debug) Log.d(TAG, "onPause()");
 
 		dbHelper.close();
 		dbHelper = null;
 	}
 
+	@Override
+	public void onDestroy() {
+		super.onDestroy();
+		
+		if (debug) Log.d(TAG,"onDestroy()");
+		keypadOnDestroy();
+	}
+
 	@Override
 	protected void onResume() {
 		super.onPause();
 
-		if (debug)
-			Log.d(TAG, "onResume()");
+		if (debug) Log.d(TAG, "onResume()");
 		if (dbHelper == null) {
 			dbHelper = new DBHelper(this);
 		}
 
 	}
 
+	@Override
+	public boolean onMenuOpened(int featureId, Menu menu) {
+		if (menu != null) {
+			MenuItem miSwitch = menu.findItem(SWITCH_MODE_INDEX);
+			if (firstTime) {
+				miSwitch.setEnabled(false);
+			} else {
+				miSwitch.setEnabled(true);
+			}
+		}
+		return super.onMenuOpened(featureId, menu);
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		super.onCreateOptionsMenu(menu);
+	
+		menu.add(0, SWITCH_MODE_INDEX, 0, R.string.switch_mode)
+			.setIcon(android.R.drawable.ic_menu_directions);
+		
+		return super.onCreateOptionsMenu(menu);
+    }
+	
+    public boolean onOptionsItemSelected(MenuItem item) {
+		switch(item.getItemId()) {
+		case SWITCH_MODE_INDEX:
+			SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
+			SharedPreferences.Editor spe=sp.edit();
+			if (viewMode==VIEW_NORMAL) {
+				viewMode=VIEW_KEYPAD;
+				spe.putBoolean(Preferences.PREFERENCE_KEYPAD, true);
+				keypadInit();
+			} else {
+				viewMode=VIEW_NORMAL;
+				spe.putBoolean(Preferences.PREFERENCE_KEYPAD, false);
+				normalInit();
+			}
+			if (spe.commit()) {
+				if (debug) Log.d(TAG,"commitment issues");
+			}
+			break;
+		default:
+			Log.e(TAG,"Unknown itemId");
+			break;
+		}
+		return super.onOptionsItemSelected(item);
+    }
+
 	private void databaseVersionError() {
 		Dialog about = new AlertDialog.Builder(this)
 		.setIcon(R.drawable.passicon)
@@ -306,4 +399,145 @@ public class AskPassword extends Activity {
     	}
     }
 
+	/////////////// Keypad Functions /////////////////////
+
+	private void keypadInit() {
+		if (mpDigitBeep==null) {
+			mpDigitBeep = MediaPlayer.create(this, R.raw.dtmf2a);
+			mpErrorBeep = MediaPlayer.create(this, R.raw.click6a);
+			mpSuccessBeep = MediaPlayer.create(this, R.raw.dooropening1);
+		}
+
+		keypadPassword="";
+    	
+		setContentView(R.layout.keypad);
+
+		TextView header = (TextView) findViewById(R.id.entry_header);
+		String version = VersionUtils.getVersionNumber(this);
+		String appName = VersionUtils.getApplicationName(this);
+		String head = appName + " " + version;
+		header.setText(head);
+
+		Button keypad1 = (Button) findViewById(R.id.keypad1);
+		keypad1.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View arg0) {
+				keypadPassword += "1";
+				if (!mute) { mpDigitBeep.start(); }
+			}
+		});
+		Button keypad2 = (Button) findViewById(R.id.keypad2);
+		keypad2.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View arg0) {
+				keypadPassword += "2";
+				if (!mute) { mpDigitBeep.start(); }
+			}
+		});
+		Button keypad3 = (Button) findViewById(R.id.keypad3);
+		keypad3.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View arg0) {
+				keypadPassword += "3";
+				if (!mute) { mpDigitBeep.start(); }
+			}
+		});
+		Button keypad4 = (Button) findViewById(R.id.keypad4);
+		keypad4.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View arg0) {
+				keypadPassword += "4";
+				if (!mute) { mpDigitBeep.start(); }
+			}
+		});
+		Button keypad5 = (Button) findViewById(R.id.keypad5);
+		keypad5.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View arg0) {
+				keypadPassword += "5";
+				if (!mute) { mpDigitBeep.start(); }
+			}
+		});
+		Button keypad6 = (Button) findViewById(R.id.keypad6);
+		keypad6.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View arg0) {
+				keypadPassword += "6";
+				if (!mute) { mpDigitBeep.start(); }
+			}
+		});
+		Button keypad7 = (Button) findViewById(R.id.keypad7);
+		keypad7.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View arg0) {
+				keypadPassword += "7";
+				if (!mute) { mpDigitBeep.start(); }
+			}
+		});
+		Button keypad8 = (Button) findViewById(R.id.keypad8);
+		keypad8.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View arg0) {
+				keypadPassword += "8";
+				if (!mute) { mpDigitBeep.start(); }
+			}
+		});
+		Button keypad9 = (Button) findViewById(R.id.keypad9);
+		keypad9.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View arg0) {
+				keypadPassword += "9";
+				if (!mute) { mpDigitBeep.start(); }
+			}
+		});
+		Button keypadStar = (Button) findViewById(R.id.keypad_star);
+		keypadStar.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View arg0) {
+				keypadPassword += "*";
+				if (!mute) { mpDigitBeep.start(); }
+			}
+		});
+		Button keypad0 = (Button) findViewById(R.id.keypad0);
+		keypad0.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View arg0) {
+				keypadPassword += "0";
+				if (!mute) { mpDigitBeep.start(); }
+			}
+		});
+		Button keypadPound = (Button) findViewById(R.id.keypad_pound);
+		keypadPound.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View arg0) {
+				keypadPassword += "#";
+				if (!mute) { mpDigitBeep.start(); }
+			}
+		});
+		Button keypadContinue = (Button) findViewById(R.id.keypad_continue);
+		keypadContinue.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View arg0) {
+				keypadTryPassword(keypadPassword);
+			}
+		});
+	}
+    
+	private void keypadOnDestroy() {
+		if (mpDigitBeep!=null) {
+			mpDigitBeep.release();
+			mpErrorBeep.release();
+			mpSuccessBeep.release();
+			mpDigitBeep=null;
+			mpErrorBeep=null;
+			mpSuccessBeep=null;
+		}
+	}
+	
+	private void keypadTryPassword(String password) {
+		if (checkUserPassword(password)){
+			if (debug) Log.d(TAG,"match!!");
+			if (!mute) {
+				mpSuccessBeep.start();
+			}
+			gotPassword();
+		}else{
+			if (debug) Log.d(TAG,"bad password");
+			if (!mute) {
+				mpErrorBeep.start();
+			}
+		    Animation shake = AnimationUtils
+	        	.loadAnimation(AskPassword.this, R.anim.shake);
+	        findViewById(R.id.keypad_continue).startAnimation(shake);
+
+	        keypadPassword="";
+		}
+	}
 }
diff --git a/src/org/openintents/safe/Preferences.java b/src/org/openintents/safe/Preferences.java
index b55165b..22c8739 100644
--- a/src/org/openintents/safe/Preferences.java
+++ b/src/org/openintents/safe/Preferences.java
@@ -9,6 +9,8 @@ public class Preferences extends PreferenceActivity {
 	public static final String PREFERENCE_LOCK_TIMEOUT = "lock_timeout";
 	public static final String PREFERENCE_LOCK_TIMEOUT_DEFAULT_VALUE = "5";
 	public static final String PREFERENCE_FIRST_TIME_WARNING = "first_time_warning";
+	public static final String PREFERENCE_KEYPAD = "keypad";
+	public static final String PREFERENCE_KEYPAD_MUTE = "keypad_mute";
 	
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-- 
2.50.1