qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of c:/ph/keepass2android

Browse Source
This commit is contained in:
Philipp Crocoll
2019-03-19 22:08:28 +01:00
parent 6c66f6199c c11731541c
commit 83bd6911c8
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Kp2aBusinessLogic/ProgressDialogStatusLogger.cs
View File

@@ -52,7 +52,8 @@ namespace keepass2android
public void UpdateMessage (String message)
{
_message = message;
Kp2aLog.Log("status message: " + message);
_message = message;
if ( _app!= null && _progressDialog != null && _handler != null ) {
_handler.Post(() => {_progressDialog.SetMessage(message); } );
}
@@ -60,6 +61,7 @@ namespace keepass2android
public void UpdateSubMessage(String submessage)
{
Kp2aLog.Log("status submessage: " + submessage);
_submessage = submessage;
if (_app != null && _progressDialog != null && _handler != null)
{

1
src/Kp2aBusinessLogic/database/SynchronizeCachedDatabase.cs
View File

@@ -105,6 +105,7 @@ namespace keepass2android
}
catch (Exception e)
{
Kp2aLog.LogUnexpectedError(e);
Finish(false, e.Message);
}

6
src/keepass2android/GroupBaseActivity.cs
View File

@@ -724,7 +724,7 @@ namespace keepass2android
RegisterInfoTextDisplay("ChildDb"); //this ensures that we don't show the general info texts too soon
}
UpdateBottomBarElementVisibility(Resource.Id.child_db_infotext, canShow);
UpdateBottomBarElementVisibility(Resource.Id.child_db_infotext, canShow && !disabledForDatabase);
}
private void UpdateDbReadOnlyInfo()
@@ -909,9 +909,9 @@ namespace keepass2android
searchView = view.JavaCast<Android.Support.V7.Widget.SearchView>();
searchView.SetSearchableInfo(searchManager.GetSearchableInfo(ComponentName));
/*searchView.SetOnSuggestionListener(new SuggestionListener(searchView.SuggestionsAdapter, this, searchItem));
searchView.SetOnSuggestionListener(new SuggestionListener(searchView.SuggestionsAdapter, this, searchItem));
searchView.SetOnQueryTextListener(new OnQueryTextListener(this));
*/
if (_prefs.GetBoolean("ActivateSearchView", false) && AppTask.CanActivateSearchViewOnStart)
{