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

…into nonet
PhilippC · Nov 16, 2020 · 18f989f · 18f989f
2 parents 1ecfe83 + ad4b719
commit 18f989f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/keepass2android/ChangeLog.cs b/src/keepass2android/ChangeLog.cs
@@ -27,7 +27,7 @@ public static void ShowChangeLog(Context ctx, Action onDismiss)
 			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),

diff --git a/src/keepass2android/services/AutofillBase/ChooseForAutofillActivityBase.cs b/src/keepass2android/services/AutofillBase/ChooseForAutofillActivityBase.cs
@@ -33,11 +33,13 @@ public abstract class ChooseForAutofillActivityBase : AndroidX.AppCompat.App.App
 
         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,15 +48,18 @@ protected override void OnCreate(Bundle savedInstanceState)
             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;
             }
 
             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 @@ protected override void OnCreate(Bundle savedInstanceState)
                 }
 
             }
+            else Kp2aLog.Log("ChooseForAutofillActivityBase: No ExtraDisplayWarning");
             Proceed();
         }