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 8b9e5fe89f540b14767fbacb1464191795d677e0..d0e10cd9f15ce5f7b8925e532c1a8e9d77c83a03 100644 (file)
--- 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" \r
-    android:versionName="1.2.4" android:versionCode="13">\r
+    android:versionName="1.2.5" android:versionCode="14">\r
     <!-- History:
     1.2.3 [12]: 2009-11-23\r
     1.2.2 [11]: 2009-10-29\r

diff --git a/readme.txt b/readme.txt
index d74c4d5f9005013f3036b457ce193fc5ffa05bbb..97218766a835b86428b0c1aaa5a18e2581580d7a 100644 (file)
--- 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\r
   http://www.openintents.org\r
 \r
+---------------------------------------------------------\r
+release: 1.2.5\r
+date: 2009-12-??\r
+- fixed latent service notification\r
+\r
 ---------------------------------------------------------\r
 release: 1.2.4\r
 date: 2009-11-27\r

diff --git a/src/org/openintents/safe/service/ServiceDispatchImpl.java b/src/org/openintents/safe/service/ServiceDispatchImpl.java
index 98f20d625947bbe6b0aa2651b1522747acac31a4..7c6f99018de8355a1fb25676c591c8246c7274b4 100644 (file)
--- 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() {