From 000d1254ec296bc75f5f492e9b95a3a3532de6cc Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Tue, 27 May 2025 11:53:46 +0200 Subject: [PATCH] make parameter naming more consistent --- .../database/edit/DeleteRunnable.cs | 2 +- src/Kp2aBusinessLogic/database/edit/LoadDB.cs | 4 ++-- src/Kp2aBusinessLogic/database/edit/SaveDB.cs | 4 ++-- .../ConfigureChildDatabasesActivity.cs | 6 +++--- src/keepass2android-app/EntryActivity.cs | 11 ++++++----- src/keepass2android-app/GroupActivity.cs | 2 +- src/keepass2android-app/GroupBaseActivity.cs | 8 ++++---- src/keepass2android-app/SyncUtil.cs | 6 +++--- .../settings/AppSettingsActivity.cs | 16 ++++++++-------- 9 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/Kp2aBusinessLogic/database/edit/DeleteRunnable.cs b/src/Kp2aBusinessLogic/database/edit/DeleteRunnable.cs index 1a84d50c..2fa3f5d6 100644 --- a/src/Kp2aBusinessLogic/database/edit/DeleteRunnable.cs +++ b/src/Kp2aBusinessLogic/database/edit/DeleteRunnable.cs @@ -214,7 +214,7 @@ namespace keepass2android Android.Util.Log.Debug("KP2A", "Calling PerformDelete.."); PerformDelete(touchedGroups, permanentlyDeletedGroups); - _operationFinishedHandler = new ActionOnOperationFinished(App,(success, message, activity) => + _operationFinishedHandler = new ActionOnOperationFinished(App,(success, message, context) => { if (success) { diff --git a/src/Kp2aBusinessLogic/database/edit/LoadDB.cs b/src/Kp2aBusinessLogic/database/edit/LoadDB.cs index ea2f2588..d6718dac 100644 --- a/src/Kp2aBusinessLogic/database/edit/LoadDB.cs +++ b/src/Kp2aBusinessLogic/database/edit/LoadDB.cs @@ -202,10 +202,10 @@ namespace keepass2android if (requiresSubsequentSync) { var syncTask = new SynchronizeCachedDatabase(_app, new ActionOnOperationFinished(_app, - (success, message, activeActivity) => + (success, message, context) => { if (!String.IsNullOrEmpty(message)) - _app.ShowMessage(activeActivity, message, + _app.ShowMessage(context, message, success ? MessageSeverity.Info : MessageSeverity.Error); }), new BackgroundDatabaseModificationLocker(_app) diff --git a/src/Kp2aBusinessLogic/database/edit/SaveDB.cs b/src/Kp2aBusinessLogic/database/edit/SaveDB.cs index 7e2f56b3..20c3a77e 100644 --- a/src/Kp2aBusinessLogic/database/edit/SaveDB.cs +++ b/src/Kp2aBusinessLogic/database/edit/SaveDB.cs @@ -236,10 +236,10 @@ namespace keepass2android if (requiresSubsequentSync) { var syncTask = new SynchronizeCachedDatabase(_app, new ActionOnOperationFinished(_app, - (success, message, activeActivity) => + (success, message, context) => { if (!System.String.IsNullOrEmpty(message)) - _app.ShowMessage(activeActivity, message, success ? MessageSeverity.Info : MessageSeverity.Error); + _app.ShowMessage(context, message, success ? MessageSeverity.Info : MessageSeverity.Error); }), new BackgroundDatabaseModificationLocker(_app) ); diff --git a/src/keepass2android-app/ConfigureChildDatabasesActivity.cs b/src/keepass2android-app/ConfigureChildDatabasesActivity.cs index 1f5bc6a2..1cb4f391 100644 --- a/src/keepass2android-app/ConfigureChildDatabasesActivity.cs +++ b/src/keepass2android-app/ConfigureChildDatabasesActivity.cs @@ -228,7 +228,7 @@ namespace keepass2android newEntry.SetUuid(new PwUuid(true), true); // Create new UUID string strTitle = newEntry.Strings.ReadSafe(PwDefs.TitleField); newEntry.Strings.Set(PwDefs.TitleField, new ProtectedString(false, strTitle + " (" + Android.OS.Build.Model + ")")); - var addTask = new AddEntry( App.Kp2a.CurrentDb, App.Kp2a, newEntry,item.Entry.ParentGroup,new ActionOnOperationFinished(App.Kp2a, (success, message, activity) => ((ConfigureChildDatabasesActivity)activity).Update())); + var addTask = new AddEntry( App.Kp2a.CurrentDb, App.Kp2a, newEntry,item.Entry.ParentGroup,new ActionOnOperationFinished(App.Kp2a, (success, message, context) => (context as ConfigureChildDatabasesActivity)?.Update())); BlockingOperationRunner pt = new BlockingOperationRunner(App.Kp2a, addTask); pt.Run(); @@ -260,7 +260,7 @@ namespace keepass2android private void Save(AutoExecItem item) { - var addTask = new SaveDb(App.Kp2a, App.Kp2a.FindDatabaseForElement(item.Entry), new ActionOnOperationFinished(App.Kp2a, (success, message, activity) => ((ConfigureChildDatabasesActivity)activity).Update())); + var addTask = new SaveDb(App.Kp2a, App.Kp2a.FindDatabaseForElement(item.Entry), new ActionOnOperationFinished(App.Kp2a, (success, message, context) => (context as ConfigureChildDatabasesActivity)?.Update())); BlockingOperationRunner pt = new BlockingOperationRunner(App.Kp2a, addTask); pt.Run(); @@ -367,7 +367,7 @@ namespace keepass2android {KeeAutoExecExt.ThisDeviceId, true} }))); - var addTask = new AddEntry( db, App.Kp2a, newEntry, autoOpenGroup, new ActionOnOperationFinished(App.Kp2a, (success, message, activity) => (activity as ConfigureChildDatabasesActivity)?.Update())); + var addTask = new AddEntry( db, App.Kp2a, newEntry, autoOpenGroup, new ActionOnOperationFinished(App.Kp2a, (success, message, context) => (context as ConfigureChildDatabasesActivity)?.Update())); BlockingOperationRunner pt = new BlockingOperationRunner(App.Kp2a, addTask); pt.Run(); diff --git a/src/keepass2android-app/EntryActivity.cs b/src/keepass2android-app/EntryActivity.cs index 24aa4a4a..e814eb4a 100644 --- a/src/keepass2android-app/EntryActivity.cs +++ b/src/keepass2android-app/EntryActivity.cs @@ -76,10 +76,10 @@ namespace keepass2android protected override void SaveFile(IOConnectionInfo ioc) { - var task = new EntryActivity.WriteBinaryTask(App.Kp2a, new ActionOnOperationFinished(App.Kp2a, (success, message, activity) => + var task = new EntryActivity.WriteBinaryTask(App.Kp2a, new ActionOnOperationFinished(App.Kp2a, (success, message, context) => { if (!success) - App.Kp2a.ShowMessage(activity, message, MessageSeverity.Error); + App.Kp2a.ShowMessage(context, message, MessageSeverity.Error); } ), ((EntryActivity)_activity).Entry.Binaries.Get(_binaryToSave), ioc); BlockingOperationRunner pt = new BlockingOperationRunner(App.Kp2a, task); @@ -90,6 +90,7 @@ namespace keepass2android public override void OnSaveInstanceState(Bundle outState) { outState.PutString("BinaryToSave", _binaryToSave); + base.OnSaveInstanceState(outState); } @@ -1494,7 +1495,7 @@ namespace keepass2android return true; case Resource.Id.menu_delete: DeleteEntry task = new DeleteEntry(App.Kp2a, Entry, - new ActionOnOperationFinished(App.Kp2a, (success, message, activity) => { if (success) { RequiresRefresh(); Finish();}})); + new ActionOnOperationFinished(App.Kp2a, (success, message, context) => { if (success) { RequiresRefresh(); Finish();}})); task.Start(); break; case Resource.Id.menu_toggle_pass: @@ -1557,10 +1558,10 @@ namespace keepass2android //save the entry: - ActionOnOperationFinished closeOrShowError = new ActionOnOperationFinished(App.Kp2a, (success, message, activity) => + ActionOnOperationFinished closeOrShowError = new ActionOnOperationFinished(App.Kp2a, (success, message, context) => { OnOperationFinishedHandler.DisplayMessage(this, message, true); - finishAction((EntryActivity)activity); + finishAction(context as EntryActivity); }); diff --git a/src/keepass2android-app/GroupActivity.cs b/src/keepass2android-app/GroupActivity.cs index d0c7d5dd..6c7fd4b9 100644 --- a/src/keepass2android-app/GroupActivity.cs +++ b/src/keepass2android-app/GroupActivity.cs @@ -225,7 +225,7 @@ namespace keepass2android //yes BlockingOperationRunner pt = new BlockingOperationRunner(App.Kp2a, new AddTemplateEntries(App.Kp2a, new ActionOnOperationFinished(App.Kp2a, - (success, message, activity) => ((GroupActivity)activity)?.StartAddEntry()))); + (success, message, context) => (context as GroupActivity)?.StartAddEntry()))); pt.Run(); }, (o, args) => diff --git a/src/keepass2android-app/GroupBaseActivity.cs b/src/keepass2android-app/GroupBaseActivity.cs index b5a419fa..017b5c0c 100644 --- a/src/keepass2android-app/GroupBaseActivity.cs +++ b/src/keepass2android-app/GroupBaseActivity.cs @@ -929,11 +929,11 @@ namespace keepass2android var moveElement = new MoveElements(elementsToMove.ToList(), Group, App.Kp2a, new ActionOnOperationFinished(App.Kp2a, - (success, message, activity) => + (success, message, context) => { - ((GroupBaseActivity)activity)?.StopMovingElements(); + (context as GroupBaseActivity)?.StopMovingElements(); if (!String.IsNullOrEmpty(message)) - App.Kp2a.ShowMessage(activity, message, MessageSeverity.Error); + App.Kp2a.ShowMessage(context, message, MessageSeverity.Error); })); var progressTask = new BlockingOperationRunner(App.Kp2a, moveElement); progressTask.Run(); @@ -1726,7 +1726,7 @@ namespace keepass2android int dbIndex = 0; Action action = null; - action = (success, message, activeActivity) => + action = (success, message, context) => { if (success) { diff --git a/src/keepass2android-app/SyncUtil.cs b/src/keepass2android-app/SyncUtil.cs index 8f526362..da79a760 100644 --- a/src/keepass2android-app/SyncUtil.cs +++ b/src/keepass2android-app/SyncUtil.cs @@ -54,15 +54,15 @@ namespace keepass2android { var filestorage = App.Kp2a.GetFileStorage(App.Kp2a.CurrentDb.Ioc); OperationWithFinishHandler task; - OnOperationFinishedHandler onOperationFinishedHandler = new ActionOnOperationFinished(App.Kp2a, (success, message, activity) => + OnOperationFinishedHandler onOperationFinishedHandler = new ActionOnOperationFinished(App.Kp2a, (success, message, context) => { new Handler(Looper.MainLooper).Post(() => { if (!String.IsNullOrEmpty(message)) - App.Kp2a.ShowMessage(activity, message, success ? MessageSeverity.Info : MessageSeverity.Error); + App.Kp2a.ShowMessage(context, message, success ? MessageSeverity.Info : MessageSeverity.Error); // Tell the adapter to refresh it's list - BaseAdapter adapter = (activity as GroupBaseActivity)?.ListAdapter; + BaseAdapter adapter = (context as GroupBaseActivity)?.ListAdapter; adapter?.NotifyDataSetChanged(); }); diff --git a/src/keepass2android-app/settings/AppSettingsActivity.cs b/src/keepass2android-app/settings/AppSettingsActivity.cs index 14fa4d67..3c7454a0 100644 --- a/src/keepass2android-app/settings/AppSettingsActivity.cs +++ b/src/keepass2android-app/settings/AppSettingsActivity.cs @@ -117,13 +117,13 @@ namespace keepass2android var previousUsername = db.KpDatabase.DefaultUserName; db.KpDatabase.DefaultUserName = e.NewValue.ToString(); - SaveDb save = new SaveDb(App.Kp2a, App.Kp2a.CurrentDb, new ActionOnOperationFinished(App.Kp2a, (success, message, activity) => + SaveDb save = new SaveDb(App.Kp2a, App.Kp2a.CurrentDb, new ActionOnOperationFinished(App.Kp2a, (success, message, context) => { if (!success) { db.KpDatabase.DefaultUserName = previousUsername; db.KpDatabase.DefaultUserNameChanged = previousUsernameChanged; - App.Kp2a.ShowMessage(activity, message, MessageSeverity.Error); + App.Kp2a.ShowMessage(context, message, MessageSeverity.Error); } })); BlockingOperationRunner pt = new BlockingOperationRunner(App.Kp2a, save); @@ -183,13 +183,13 @@ namespace keepass2android String previousName = db.KpDatabase.Name; db.KpDatabase.Name = e.NewValue.ToString(); - SaveDb save = new SaveDb(App.Kp2a, App.Kp2a.CurrentDb, new ActionOnOperationFinished(App.Kp2a, (success, message, activity) => + SaveDb save = new SaveDb(App.Kp2a, App.Kp2a.CurrentDb, new ActionOnOperationFinished(App.Kp2a, (success, message, context) => { if (!success) { db.KpDatabase.Name = previousName; db.KpDatabase.NameChanged = previousNameChanged; - App.Kp2a.ShowMessage(activity, message, MessageSeverity.Error); + App.Kp2a.ShowMessage(context, message, MessageSeverity.Error); } else { @@ -410,12 +410,12 @@ namespace keepass2android var previousCipher = db.KpDatabase.DataCipherUuid; db.KpDatabase.DataCipherUuid = new PwUuid(MemUtil.HexStringToByteArray((string)preferenceChangeEventArgs.NewValue)); - SaveDb save = new SaveDb(App.Kp2a, App.Kp2a.CurrentDb, new ActionOnOperationFinished(App.Kp2a, (success, message, activity) => + SaveDb save = new SaveDb(App.Kp2a, App.Kp2a.CurrentDb, new ActionOnOperationFinished(App.Kp2a, (success, message, context) => { if (!success) { db.KpDatabase.DataCipherUuid = previousCipher; - App.Kp2a.ShowMessage(activity, message, MessageSeverity.Error); + App.Kp2a.ShowMessage(context, message, MessageSeverity.Error); return; } preferenceChangeEventArgs.Preference.Summary = @@ -1071,12 +1071,12 @@ namespace keepass2android Kp2aLog.Log("--new kdf: " + KdfPool.Get(db.KpDatabase.KdfParameters.KdfUuid) + " " + db.KpDatabase.KdfParameters.KdfUuid.ToHexString()); - SaveDb save = new SaveDb(App.Kp2a, App.Kp2a.CurrentDb, new ActionOnOperationFinished(App.Kp2a, (success, message, activity) => + SaveDb save = new SaveDb(App.Kp2a, App.Kp2a.CurrentDb, new ActionOnOperationFinished(App.Kp2a, (success, message, context) => { if (!success) { db.KpDatabase.KdfParameters = previousKdfParams; - App.Kp2a.ShowMessage(activity, message, MessageSeverity.Error); + App.Kp2a.ShowMessage(context, message, MessageSeverity.Error); return; } UpdateKdfScreen();