From: isaac.jones <isaac.jones@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Fri, 16 Jan 2009 05:26:22 +0000 (+0000)
Subject: listen for the log off broadcast receiver and lock and shut front door when received.
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=a531b66997813ff8191007ff73de6e17fe683443;p=android-vcpass-oisafe

listen for the log off broadcast receiver and lock and shut front door when received.

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@1738 72b678ce-9140-0410-bee8-679b907dd61a
---

diff --git a/src/org/openintents/safe/CategoryList.java b/src/org/openintents/safe/CategoryList.java
index cb0eeca..6baf7a5 100644
--- a/src/org/openintents/safe/CategoryList.java
+++ b/src/org/openintents/safe/CategoryList.java
@@ -28,6 +28,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import org.openintents.intents.CryptoIntents;
 import org.openintents.safe.service.ServiceDispatchImpl;
 
 
@@ -117,8 +118,11 @@ public class CategoryList extends ListActivity {
     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 (debug) Log.d(TAG,"caught ACTION_SCREEN_OFF");
+            	 masterKey=null;
+            } else if (intent.getAction().equals(CryptoIntents.ACTION_CRYPTO_LOGGED_OUT)) {
+            	 if (debug) Log.d(TAG,"caught ACTION_CRYPTO_LOGGED_OUT");
+            	 lockAndShutFrontDoor();
             }
         }
     };
@@ -200,6 +204,7 @@ public class CategoryList extends ListActivity {
 		
         IntentFilter filter = new IntentFilter();
         filter.addAction(Intent.ACTION_SCREEN_OFF);
+        filter.addAction (CryptoIntents.ACTION_CRYPTO_LOGGED_OUT);
         registerReceiver(mIntentReceiver, filter);
 
 		fillData();
@@ -459,14 +464,7 @@ public class CategoryList extends ListActivity {
 		}
 		switch(item.getItemId()) {
 		case LOCK_CATEGORY_INDEX:
-			Intent serviceIntent = new Intent();
-			serviceIntent.setClass(this, ServiceDispatchImpl.class );
-		    stopService(serviceIntent);
-			masterKey=null;
-		    Intent frontdoor = new Intent(this, FrontDoor.class);
-		    frontdoor.setAction(Intent.ACTION_MAIN);
-		    startActivity(frontdoor);
-		    finish();
+			lockAndShutFrontDoor();
 			break;
 		case OPEN_CATEGORY_INDEX:
 			launchPassList(rows.get(info.position).id);
@@ -536,6 +534,18 @@ public class CategoryList extends ListActivity {
     	return backup.getResult();
     }
 
+    
+    private void lockAndShutFrontDoor () {
+    	Intent serviceIntent = new Intent();
+		serviceIntent.setClass(this, ServiceDispatchImpl.class );
+	    stopService(serviceIntent);
+		masterKey=null;
+	    Intent frontdoor = new Intent(this, FrontDoor.class);
+	    frontdoor.setAction(Intent.ACTION_MAIN);
+	    startActivity(frontdoor);
+	    finish();
+    }
+    
 	/**
 	 * Start a separate thread to backup the database.   By running
 	 * the backup in a thread it allows the main UI thread to return