From: rmceoin <rmceoin@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Fri, 4 Dec 2009 03:50:55 +0000 (+0000)
Subject: OI Safe: fixed bug with service notification staying alive even after
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=c7a0348dbc27a6c495f23a6ec289040a1b6e6c91;p=android-vcpass-oisafe

OI Safe: fixed bug with service notification staying alive even after
safe has been locked.   bumped version to 1.2.4


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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8b9e5fe..d0e10cd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.openintents.safe" 
-    android:versionName="1.2.4" android:versionCode="13">
+    android:versionName="1.2.5" android:versionCode="14">
     <!-- History:
     1.2.3 [12]: 2009-11-23
     1.2.2 [11]: 2009-10-29
diff --git a/readme.txt b/readme.txt
index d74c4d5..9721876 100644
--- a/readme.txt
+++ b/readme.txt
@@ -24,6 +24,11 @@ or decrypt data, and get or set passwords by connecting to OI Safe.
 To obtain the current release, visit
   http://www.openintents.org
 
+---------------------------------------------------------
+release: 1.2.5
+date: 2009-12-??
+- fixed latent service notification
+
 ---------------------------------------------------------
 release: 1.2.4
 date: 2009-11-27
diff --git a/src/org/openintents/safe/service/ServiceDispatchImpl.java b/src/org/openintents/safe/service/ServiceDispatchImpl.java
index 98f20d6..7c6f990 100644
--- a/src/org/openintents/safe/service/ServiceDispatchImpl.java
+++ b/src/org/openintents/safe/service/ServiceDispatchImpl.java
@@ -90,6 +90,7 @@ public class ServiceDispatchImpl extends Service {
 	  if (masterKey!=null) {
 		  lockOut();
 	  }
+	  ServiceNotification.clearNotification(ServiceDispatchImpl.this);
     }
 
     private void lockOut() {