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

Merge branch 'master' of https://github.com/PhilippC/keepass2android into nonet

Browse Source
This commit is contained in:
Philipp Crocoll
2020-11-16 10:24:47 +01:00
parent 1ecfe83706 ad4b719f3f
commit 18f989fae4
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/keepass2android/ChangeLog.cs
View File

@@ -27,7 +27,7 @@ namespace keepass2android
AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(ctx, Android.Resource.Style.ThemeHoloLightDialog));
builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title));
List<string> changeLog = new List<string>{
BuildChangelogString(ctx, Resource.Array.ChangeLog_1_08b, "1.08b"),
BuildChangelogString(ctx, Resource.Array.ChangeLog_1_08c, "1.08c"),
BuildChangelogString(ctx, Resource.Array.ChangeLog_1_08b, "1.08b"),
BuildChangelogString(ctx, Resource.Array.ChangeLog_1_08, "1.08"),
ctx.GetString(Resource.String.ChangeLog_1_07b),

6
src/keepass2android/services/AutofillBase/ChooseForAutofillActivityBase.cs
View File

@@ -33,11 +33,13 @@ namespace keepass2android.services.AutofillBase
protected override void OnCreate(Bundle savedInstanceState)
{
Kp2aLog.Log("ChooseForAutofillActivityBase.OnCreate");
base.OnCreate(savedInstanceState);
//if launched from history, don't re-use the task. Proceed to FileSelect instead.
if (Intent.Flags.HasFlag(ActivityFlags.LaunchedFromHistory))
{
Kp2aLog.Log("ChooseForAutofillActivityBase: started from history");
Kp2aLog.Log("Forwarding to FileSelect. QueryCredentialsActivity started from history.");
RestartApp();
return;
@@ -46,6 +48,7 @@ namespace keepass2android.services.AutofillBase
string requestedUrl = Intent.GetStringExtra(ExtraQueryString);
if (requestedUrl == null)
{
Kp2aLog.Log("ChooseForAutofillActivityBase: no requestedUrl ");
Toast.MakeText(this, "Cannot execute query for null.", ToastLength.Long).Show();
RestartApp();
return;
@@ -53,8 +56,10 @@ namespace keepass2android.services.AutofillBase
if (Intent.HasExtra(ExtraDisplayWarning))
{
AutofillServiceBase.DisplayWarning warning =
(AutofillServiceBase.DisplayWarning)Intent.GetIntExtra(ExtraDisplayWarning, (int)AutofillServiceBase.DisplayWarning.None);
Kp2aLog.Log("ChooseForAutofillActivityBase: ExtraDisplayWarning = " + warning);
if (warning != AutofillServiceBase.DisplayWarning.None)
{
AlertDialog.Builder builder = new AlertDialog.Builder(this);
@@ -117,6 +122,7 @@ namespace keepass2android.services.AutofillBase
}
}
else Kp2aLog.Log("ChooseForAutofillActivityBase: No ExtraDisplayWarning");
Proceed();
}