From ee8e50bd76bb90dab31d0c557f34dfa02ed50068 Mon Sep 17 00:00:00 2001
From: rmceoin <rmceoin@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Sun, 9 Aug 2009 22:47:35 +0000
Subject: [PATCH] OI Safe: added new preference to control lock on screen lock

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@2272 72b678ce-9140-0410-bee8-679b907dd61a
---
 default.properties                            |  2 +-
 res/values/strings.xml                        |  6 ++++++
 res/xml/preferences.xml                       |  6 +++++-
 src/org/openintents/safe/CategoryList.java    |  8 +++++++-
 src/org/openintents/safe/IntentHandler.java   | 19 +++++++++++++++++--
 src/org/openintents/safe/Preferences.java     | 12 ++++++++++++
 .../safe/service/ServiceDispatch.aidl         |  1 +
 .../safe/service/ServiceDispatchImpl.java     | 10 +++++++++-
 8 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/default.properties b/default.properties
index 9c6195e..0a007ab 100644
--- a/default.properties
+++ b/default.properties
@@ -8,7 +8,7 @@
 # project structure.
 
 # Project target.
-target=android-2
+target=android-3
 # apk configurations. This property allows creation of APK files with limited
 # resources. For example, if your application contains many locales and
 # you wish to release multiple smaller apks instead of a large one, you can
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f90eba9..930bdb2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -161,6 +161,12 @@
 	
 	<string name="pref_dialog_title_lock_timeout">Auto lock timeout</string>
 	
+	<!-- Preference title -->
+	<string name="pref_title_lock_on_screen_lock">Lock on screen lock</string>
+	
+	<!-- Preference summary for lock on screen lock -->
+	<string name="pref_summary_lock_on_screen_lock">Lock when the screen locks</string>
+	
 	<!-- Preference title: use a numeric keypad to enter the password -->
 	<string name="pref_title_keypad">Keypad</string>
 	
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 3b062fc..2bd20f1 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -38,7 +38,11 @@
                 android:entryValues="@array/pref_entryvalues_lock_timeout"
                 android:dialogTitle="@string/pref_dialog_title_lock_timeout"
             	android:defaultValue="5" />    
-
+		<CheckBoxPreference
+			android:title="@string/pref_title_lock_on_screen_lock"
+			android:summary="@string/pref_summary_lock_on_screen_lock"
+			android:key="lock_on_screen_lock"
+			android:defaultValue="true"/>
 		<CheckBoxPreference
 			android:title="@string/pref_title_keypad"
 			android:summary="@string/pref_summary_keypad"
diff --git a/src/org/openintents/safe/CategoryList.java b/src/org/openintents/safe/CategoryList.java
index 0b1d7ea..43f9ee3 100644
--- a/src/org/openintents/safe/CategoryList.java
+++ b/src/org/openintents/safe/CategoryList.java
@@ -122,11 +122,15 @@ public class CategoryList extends ListActivity {
     private Intent restartTimerIntent;
     private int lastPosition=0;
     
+    private boolean lockOnScreenLock=true;
+    
     BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
         public void onReceive(Context context, Intent intent) {
             if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF)) {
             	 if (debug) Log.d(TAG,"caught ACTION_SCREEN_OFF");
-            	 masterKey=null;
+            	 if (lockOnScreenLock) {
+            		 masterKey=null;
+            	 }
             } else if (intent.getAction().equals(CryptoIntents.ACTION_CRYPTO_LOGGED_OUT)) {
             	 if (debug) Log.d(TAG,"caught ACTION_CRYPTO_LOGGED_OUT");
             	 lockAndShutFrontDoor();
@@ -248,6 +252,8 @@ public class CategoryList extends ListActivity {
     	}
 
         showFirstTimeWarningDialog();
+		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
+		lockOnScreenLock = sp.getBoolean(Preferences.PREFERENCE_LOCK_ON_SCREEN_LOCK, true);
     }
 
 	/**
diff --git a/src/org/openintents/safe/IntentHandler.java b/src/org/openintents/safe/IntentHandler.java
index 4b1e34f..76186b1 100644
--- a/src/org/openintents/safe/IntentHandler.java
+++ b/src/org/openintents/safe/IntentHandler.java
@@ -60,7 +60,7 @@ public class IntentHandler extends Activity {
 	private CryptoHelper ch;
 	
 	// service elements
-    private ServiceDispatch service;
+    private static ServiceDispatch service=null;
     private ServiceDispatchConnection conn;
 	private Intent mServiceIntent;
 
@@ -133,7 +133,9 @@ public class IntentHandler extends Activity {
 	private void setServiceParametersFromExtrasAndDispatchAction(Intent data) {
 		salt = data.getStringExtra("salt");
 		masterKey = data.getStringExtra("masterKey");
-		String timeout = mPreferences.getString(Preferences.PREFERENCE_LOCK_TIMEOUT, Preferences.PREFERENCE_LOCK_TIMEOUT_DEFAULT_VALUE); 
+		String timeout = mPreferences.getString(Preferences.PREFERENCE_LOCK_TIMEOUT, Preferences.PREFERENCE_LOCK_TIMEOUT_DEFAULT_VALUE);
+		boolean lockOnScreenLock = mPreferences.getBoolean(Preferences.PREFERENCE_LOCK_ON_SCREEN_LOCK, true);
+
 		int timeoutMinutes=5; // default to 5
 		try {
 			timeoutMinutes = Integer.valueOf(timeout);
@@ -143,6 +145,7 @@ public class IntentHandler extends Activity {
 		
 		try {
 			service.setTimeoutMinutes(timeoutMinutes);
+			service.setLockOnScreenLock(lockOnScreenLock);
 			service.setSalt(salt);
 			service.setPassword(masterKey); // should already be connected.
 		} catch (RemoteException e1) {
@@ -560,6 +563,18 @@ public class IntentHandler extends Activity {
 			
 			if (debug) Log.d( TAG,"onServiceDisconnected" );
 		}
+		
 	};
 
+	public static void setLockOnScreenLock(boolean lock)
+	{
+		if (service!=null) {
+			try {
+				service.setLockOnScreenLock(lock);
+			} catch (RemoteException e) {
+				Log.d(TAG, e.toString());
+			}
+		}
+	}
+
 }
diff --git a/src/org/openintents/safe/Preferences.java b/src/org/openintents/safe/Preferences.java
index 82a92e8..9004312 100644
--- a/src/org/openintents/safe/Preferences.java
+++ b/src/org/openintents/safe/Preferences.java
@@ -1,13 +1,16 @@
 package org.openintents.safe;
 
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceManager;
 
 public class Preferences extends PreferenceActivity {
 
 	public static final String PREFERENCE_ALLOW_EXTERNAL_ACCESS = "external_access";
 	public static final String PREFERENCE_LOCK_TIMEOUT = "lock_timeout";
 	public static final String PREFERENCE_LOCK_TIMEOUT_DEFAULT_VALUE = "5";
+	public static final String PREFERENCE_LOCK_ON_SCREEN_LOCK = "lock_on_screen_lock";
 	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";
@@ -35,4 +38,13 @@ public class Preferences extends PreferenceActivity {
 		}
 	}
 
+	@Override
+	protected void onPause() {
+		super.onPause();
+
+		SharedPreferences mPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+		boolean lockOnScreenLock = mPreferences.getBoolean(Preferences.PREFERENCE_LOCK_ON_SCREEN_LOCK, true);
+		IntentHandler.setLockOnScreenLock(lockOnScreenLock);
+	}
+
 }
diff --git a/src/org/openintents/safe/service/ServiceDispatch.aidl b/src/org/openintents/safe/service/ServiceDispatch.aidl
index 02d6e7b..cbf350f 100644
--- a/src/org/openintents/safe/service/ServiceDispatch.aidl
+++ b/src/org/openintents/safe/service/ServiceDispatch.aidl
@@ -24,4 +24,5 @@ interface ServiceDispatch {
   String encrypt (String clearText);
   String decrypt (String cryptoText);
   void setTimeoutMinutes(int timeoutMinutesIn);
+  void setLockOnScreenLock (boolean lock);
 }
diff --git a/src/org/openintents/safe/service/ServiceDispatchImpl.java b/src/org/openintents/safe/service/ServiceDispatchImpl.java
index 70e3f00..56065e7 100644
--- a/src/org/openintents/safe/service/ServiceDispatchImpl.java
+++ b/src/org/openintents/safe/service/ServiceDispatchImpl.java
@@ -45,6 +45,7 @@ public class ServiceDispatchImpl extends Service {
     private int timeoutMinutes = 5;
 	private long timeoutUntilStop = timeoutMinutes * 60000;
 	private BroadcastReceiver mIntentReceiver;
+    private boolean lockOnScreenLock=true;
     
     @Override
     public IBinder onBind(Intent intent) {
@@ -62,7 +63,9 @@ public class ServiceDispatchImpl extends Service {
           public void onReceive(Context context, Intent intent) {
               if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF)) {
              	 if (debug) Log.d(TAG,"caught ACTION_SCREEN_OFF");
-             	 stopSelf();
+             	 if (lockOnScreenLock) {
+             		 stopSelf();
+             	 }
               } else if (intent.getAction().equals(CryptoIntents.ACTION_RESTART_TIMER)) {
 	              	restartTimer();
               }
@@ -180,6 +183,11 @@ public class ServiceDispatchImpl extends Service {
 			Log.d(TAG,"set timeout to "+timeoutMinutes);
 		}
 
+		public void setLockOnScreenLock (boolean lock){
+			lockOnScreenLock = lock;
+    	}
+
+
     };
 
 }
-- 
2.50.1