From fcae4fcbb6be114a3fd750c3c5cd67737390c725 Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Thu, 3 Oct 2013 04:15:40 +0200 Subject: [PATCH] Bugfix with auto-open db --- src/keepass2android/PasswordActivity.cs | 1 + src/keepass2android/fileselect/FileSelectActivity.cs | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs index c4eba3d7..d639a3be 100644 --- a/src/keepass2android/PasswordActivity.cs +++ b/src/keepass2android/PasswordActivity.cs @@ -562,6 +562,7 @@ namespace keepass2android private void GoToFileSelectActivity() { Intent intent = new Intent(this, typeof (FileSelectActivity)); + intent.PutExtra(FileSelectActivity.NoForwardToPasswordActivity, true); AppTask.ToIntent(intent); StartActivityForResult(intent, 0); Finish(); diff --git a/src/keepass2android/fileselect/FileSelectActivity.cs b/src/keepass2android/fileselect/FileSelectActivity.cs index 50dc32dd..c62eeaed 100644 --- a/src/keepass2android/fileselect/FileSelectActivity.cs +++ b/src/keepass2android/fileselect/FileSelectActivity.cs @@ -65,6 +65,8 @@ namespace keepass2android internal AppTask AppTask; private IOConnectionInfo _iocToLaunch; + public const string NoForwardToPasswordActivity = "NoForwardToPasswordActivity"; + void ShowFilenameDialog(bool showOpenButton, bool showCreateButton, bool showBrowseButton, string defaultFilename, string detailsText, int requestCodeBrowse) { AlertDialog.Builder builder = new AlertDialog.Builder(this); @@ -583,10 +585,11 @@ namespace keepass2android else { //if no database is loaded: load the most recent database - if (_DbHelper.HasRecentFiles()) + if ( (Intent.GetBooleanExtra(NoForwardToPasswordActivity, false)==false) && _DbHelper.HasRecentFiles()) { Android.Database.ICursor filesCursor = _DbHelper.FetchAllFiles(); StartManagingCursor(filesCursor); + filesCursor.MoveToFirst(); IOConnectionInfo ioc = _DbHelper.CursorToIoc(filesCursor); if (App.Kp2a.GetFileStorage(ioc).RequiredSetup == null) {