Fix more tabs

This commit is contained in:
ianjazz246
2023-05-20 10:46:29 -07:00
parent 72a3b55341
commit 3526aa1889

View File

@@ -505,7 +505,7 @@ namespace keepass2android
} }
OnUserInputDialogClose(); OnUserInputDialogClose();
}); });
Dialog dialog = builder.Create(); Dialog dialog = builder.Create();
@@ -522,11 +522,11 @@ namespace keepass2android
actionOnResult = null; actionOnResult = null;
} }
OnUserInputDialogClose(); OnUserInputDialogClose();
})); }));
OnUserInputDialogShow(); OnUserInputDialogShow();
dialog.Show(); dialog.Show();
} }
public void StoreOpenedFileAsRecent(IOConnectionInfo ioc, string keyfile, bool updateTimestamp, string displayName = "") public void StoreOpenedFileAsRecent(IOConnectionInfo ioc, string keyfile, bool updateTimestamp, string displayName = "")
@@ -589,7 +589,7 @@ namespace keepass2android
EventHandler dismissHandler, EventHandler dismissHandler,
Context ctx, string messageSuffix = "") Context ctx, string messageSuffix = "")
{ {
Handler handler = new Handler(Looper.MainLooper); Handler handler = new Handler(Looper.MainLooper);
handler.Post(() => handler.Post(() =>
{ {
AlertDialog.Builder builder = new AlertDialog.Builder(ctx); AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
@@ -597,13 +597,13 @@ namespace keepass2android
builder.SetMessage(GetResourceString(messageKey) + (messageSuffix != "" ? " " + messageSuffix : "")); builder.SetMessage(GetResourceString(messageKey) + (messageSuffix != "" ? " " + messageSuffix : ""));
// _____handlerWithShow are wrappers around given handlers to update _isSHowingYesNoCancelDialog // _____handlerWithShow are wrappers around given handlers to update _isSHowingYesNoCancelDialog
// and to show progress dialog after yesNoCancel dialog is closed // and to show progress dialog after yesNoCancel dialog is closed
EventHandler<DialogClickEventArgs> yesHandlerWithShow = (sender, args) => EventHandler<DialogClickEventArgs> yesHandlerWithShow = (sender, args) =>
{ {
OnUserInputDialogClose(); OnUserInputDialogClose();
yesHandler.Invoke(sender, args); yesHandler.Invoke(sender, args);
}; };
string yesText = GetResourceString(yesString); string yesText = GetResourceString(yesString);
builder.SetPositiveButton(yesText, yesHandlerWithShow); builder.SetPositiveButton(yesText, yesHandlerWithShow);
string noText = ""; string noText = "";
@@ -611,23 +611,23 @@ namespace keepass2android
{ {
EventHandler<DialogClickEventArgs> noHandlerWithShow = (sender, args) => EventHandler<DialogClickEventArgs> noHandlerWithShow = (sender, args) =>
{ {
OnUserInputDialogClose(); OnUserInputDialogClose();
noHandler.Invoke(sender, args); noHandler.Invoke(sender, args);
}; };
noText = GetResourceString(noString); noText = GetResourceString(noString);
builder.SetNegativeButton(noText, noHandlerWithShow); builder.SetNegativeButton(noText, noHandlerWithShow);
} }
string cancelText = ""; string cancelText = "";
if (cancelHandler != null) if (cancelHandler != null)
{ {
EventHandler<DialogClickEventArgs> cancelHandlerWithShow = (sender, args) => EventHandler<DialogClickEventArgs> cancelHandlerWithShow = (sender, args) =>
{ {
OnUserInputDialogClose(); OnUserInputDialogClose();
cancelHandler.Invoke(sender, args); cancelHandler.Invoke(sender, args);
}; };
cancelText = ctx.GetString(Android.Resource.String.Cancel); cancelText = ctx.GetString(Android.Resource.String.Cancel);
builder.SetNeutralButton(cancelText, builder.SetNeutralButton(cancelText,
cancelHandlerWithShow); cancelHandlerWithShow);
} }
@@ -660,7 +660,7 @@ namespace keepass2android
} }
} }
); );
} }
/// <summary> /// <summary>
/// Shows all non-dismissed progress dialogs. /// Shows all non-dismissed progress dialogs.
@@ -765,8 +765,8 @@ namespace keepass2android
public IProgressDialog CreateProgressDialog(Context ctx) public IProgressDialog CreateProgressDialog(Context ctx)
{ {
return new RealProgressDialog(ctx, this); return new RealProgressDialog(ctx, this);
} }
public IFileStorage GetFileStorage(IOConnectionInfo iocInfo) public IFileStorage GetFileStorage(IOConnectionInfo iocInfo)
{ {