From e2d28a06077ac0c394f1989b97a9f8d0019daa01 Mon Sep 17 00:00:00 2001 From: Marc Blank Date: Sun, 17 Jul 2011 15:46:03 -0700 Subject: [PATCH] Clear "security needed" notification when releasing holds * This fixes the issues with erroneous notifications remaining active Bug: 5039388 Change-Id: Ib1cd506e732e34f6368036a131d79270b22d4a4b --- .../email/activity/setup/AccountSecurity.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/com/android/email/activity/setup/AccountSecurity.java b/src/com/android/email/activity/setup/AccountSecurity.java index 0f5a9ba23..f6acf19a5 100644 --- a/src/com/android/email/activity/setup/AccountSecurity.java +++ b/src/com/android/email/activity/setup/AccountSecurity.java @@ -16,14 +16,6 @@ package com.android.email.activity.setup; -import com.android.email.Email; -import com.android.email.R; -import com.android.email.SecurityPolicy; -import com.android.email.activity.ActivityHelper; -import com.android.emailcommon.provider.Account; -import com.android.emailcommon.provider.HostAuth; -import com.android.emailcommon.utility.Utility; - import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -38,6 +30,14 @@ import android.os.AsyncTask; import android.os.Bundle; import android.util.Log; +import com.android.email.Email; +import com.android.email.R; +import com.android.email.SecurityPolicy; +import com.android.email.activity.ActivityHelper; +import com.android.emailcommon.provider.Account; +import com.android.emailcommon.provider.HostAuth; +import com.android.emailcommon.utility.Utility; + /** * Psuedo-activity (no UI) to bootstrap the user up to a higher desired security level. This * bootstrap requires the following steps. @@ -229,6 +229,7 @@ public class AccountSecurity extends Activity { Log.d(TAG, "Security active; clear holds"); } Account.clearSecurityHoldOnAllAccounts(this); + security.clearNotification(account.mId); finish(); return; } @@ -285,6 +286,7 @@ public class AccountSecurity extends Activity { Log.d(TAG, "Policies enforced; clear holds"); } Account.clearSecurityHoldOnAllAccounts(this); + security.clearNotification(account.mId); finish(); }