moparisthebest/keepass2android
1
0
Fork 0
mirror of https://github.com/moparisthebest/keepass2android synced 2025-02-07 10:20:11 -05:00
Code Issues Releases Wiki Activity

Bugfix: it's now possible again to close the app by pressing back button in QuickUnlock (especially import with Share URL search)

Browse Source
This commit is contained in:
Philipp Crocoll 2013-09-03 21:57:13 +02:00
parent 2ca50c5778
commit 320f5e1fea
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/keepass2android/KeePass.cs
View File

@ -41,6 +41,7 @@ namespace keepass2android
public const Result ExitCloseAfterTaskComplete = Result.FirstUser+4; public const Result ExitCloseAfterTaskComplete = Result.FirstUser+4;
public const Result TaskComplete = Result.FirstUser + 5; public const Result TaskComplete = Result.FirstUser + 5;
public const Result ExitReloadDb = Result.FirstUser+6; public const Result ExitReloadDb = Result.FirstUser+6;
public const Result ExitClose = Result.FirstUser + 7;
AppTask _appTask; AppTask _appTask;

4
src/keepass2android/PasswordActivity.cs
View File

@ -153,6 +153,10 @@ namespace keepass2android
SetResult(KeePass.ExitCloseAfterTaskComplete); SetResult(KeePass.ExitCloseAfterTaskComplete);
Finish(); Finish();
break; break;
case KeePass.ExitClose:
SetResult(KeePass.ExitClose);
Finish();
break;
case KeePass.ExitReloadDb: case KeePass.ExitReloadDb:
//if the activity was killed, fill password/keyfile so the user can directly hit load again //if the activity was killed, fill password/keyfile so the user can directly hit load again
if (App.Kp2a.GetDb().Loaded) if (App.Kp2a.GetDb().Loaded)

6
src/keepass2android/QuickUnlock.cs
View File

@ -117,6 +117,12 @@ namespace keepass2android
keyboard.ShowSoftInput(pwd, 0); keyboard.ShowSoftInput(pwd, 0);
}, 50); }, 50);
} }
public override void OnBackPressed()
{
SetResult(KeePass.ExitClose);
base.OnBackPressed();
}
} }
} }