Stop AutoLock service on LogOffActivity.

Also only update progress on notification if we have a Master Key.
openintents · Dec 9, 2012 · 037d9fc · 037d9fc
1 parent acc7df2
commit 037d9fc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Safe/src/org/openintents/safe/LogOffActivity.java b/Safe/src/org/openintents/safe/LogOffActivity.java
@@ -48,6 +48,10 @@ public void onClick(View arg0) {
 				Intent serviceIntent = new Intent();
 				serviceIntent.setClass(LogOffActivity.this, ServiceDispatchImpl.class );
 				stopService(serviceIntent);
+
+				Intent autoLockIntent = new Intent(getApplicationContext(), AutoLockService.class);
+				stopService(autoLockIntent);
+
 				CategoryList.setSignedOut();
 
 				/*

diff --git a/Safe/src/org/openintents/safe/service/AutoLockService.java b/Safe/src/org/openintents/safe/service/AutoLockService.java
@@ -157,12 +157,13 @@ public void onTick(long millisUntilFinished) {
 				if (debug)
 					Log.d(TAG, "tick: " + millisUntilFinished + " this=" + this);
 				timeRemaining = millisUntilFinished;
-				ServiceNotification.updateProgress(AutoLockService.this, (int)timeoutUntilStop,
-						(int)timeRemaining);
 				if (Master.getMasterKey() == null) {
 					if (debug)
 						Log.d(TAG, "detected masterKey=null");
 					lockOut();
+				} else {
+					ServiceNotification.updateProgress(AutoLockService.this, (int)timeoutUntilStop,
+							(int)timeRemaining);
 				}
 			}