* clear combined notification when db locked by timeout

* close notification drawer when clicking action button in notification
This commit is contained in:
Philipp Crocoll 2015-01-06 04:03:27 +01:00
parent 687416d2bb
commit aeb4833ad0

View File

@ -366,6 +366,7 @@ namespace keepass2android
_notificationManager.Cancel(NotifyPassword); _notificationManager.Cancel(NotifyPassword);
_notificationManager.Cancel(NotifyUsername); _notificationManager.Cancel(NotifyUsername);
_notificationManager.Cancel(NotifyKeyboard); _notificationManager.Cancel(NotifyKeyboard);
_notificationManager.Cancel(NotifyCombined);
_numElementsToWaitFor = 0; _numElementsToWaitFor = 0;
ClearKeyboard(true); ClearKeyboard(true);
@ -738,6 +739,7 @@ namespace keepass2android
{ {
CopyToClipboardService.CopyValueToClipboardWithTimeout(context, username); CopyToClipboardService.CopyValueToClipboardWithTimeout(context, username);
} }
context.SendBroadcast(new Intent(Intent.ActionCloseSystemDialogs)); //close notification drawer
} }
else if (action.Equals(Intents.CopyPassword)) else if (action.Equals(Intents.CopyPassword))
{ {
@ -746,6 +748,7 @@ namespace keepass2android
{ {
CopyToClipboardService.CopyValueToClipboardWithTimeout(context, password); CopyToClipboardService.CopyValueToClipboardWithTimeout(context, password);
} }
context.SendBroadcast(new Intent(Intent.ActionCloseSystemDialogs)); //close notification drawer
} }
else if (action.Equals(Intents.CheckKeyboard)) else if (action.Equals(Intents.CheckKeyboard))
{ {