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

make parameter naming more consistent

Browse Source
This commit is contained in:
Philipp Crocoll
2025-05-27 11:53:46 +02:00
parent 324fc1f2ee
commit 000d1254ec
9 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Kp2aBusinessLogic/database/edit/DeleteRunnable.cs
View File

@@ -214,7 +214,7 @@ namespace keepass2android
Android.Util.Log.Debug("KP2A", "Calling PerformDelete.."); Android.Util.Log.Debug("KP2A", "Calling PerformDelete..");
PerformDelete(touchedGroups, permanentlyDeletedGroups); PerformDelete(touchedGroups, permanentlyDeletedGroups);
_operationFinishedHandler = new ActionOnOperationFinished(App,(success, message, activity) => _operationFinishedHandler = new ActionOnOperationFinished(App,(success, message, context) =>
{ {
if (success) if (success)
{ {

4
src/Kp2aBusinessLogic/database/edit/LoadDB.cs
View File

@@ -202,10 +202,10 @@ namespace keepass2android
if (requiresSubsequentSync) if (requiresSubsequentSync)
{ {
var syncTask = new SynchronizeCachedDatabase(_app, new ActionOnOperationFinished(_app, var syncTask = new SynchronizeCachedDatabase(_app, new ActionOnOperationFinished(_app,
(success, message, activeActivity) => (success, message, context) =>
{ {
if (!String.IsNullOrEmpty(message)) if (!String.IsNullOrEmpty(message))
_app.ShowMessage(activeActivity, message, _app.ShowMessage(context, message,
success ? MessageSeverity.Info : MessageSeverity.Error); success ? MessageSeverity.Info : MessageSeverity.Error);
}), new BackgroundDatabaseModificationLocker(_app) }), new BackgroundDatabaseModificationLocker(_app)

4
src/Kp2aBusinessLogic/database/edit/SaveDB.cs
View File

@@ -236,10 +236,10 @@ namespace keepass2android
if (requiresSubsequentSync) if (requiresSubsequentSync)
{ {
var syncTask = new SynchronizeCachedDatabase(_app, new ActionOnOperationFinished(_app, var syncTask = new SynchronizeCachedDatabase(_app, new ActionOnOperationFinished(_app,
(success, message, activeActivity) => (success, message, context) =>
{ {
if (!System.String.IsNullOrEmpty(message)) 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) }), new BackgroundDatabaseModificationLocker(_app)
); );

6
src/keepass2android-app/ConfigureChildDatabasesActivity.cs
View File

@@ -228,7 +228,7 @@ namespace keepass2android
newEntry.SetUuid(new PwUuid(true), true); // Create new UUID newEntry.SetUuid(new PwUuid(true), true); // Create new UUID
string strTitle = newEntry.Strings.ReadSafe(PwDefs.TitleField); string strTitle = newEntry.Strings.ReadSafe(PwDefs.TitleField);
newEntry.Strings.Set(PwDefs.TitleField, new ProtectedString(false, strTitle + " (" + Android.OS.Build.Model + ")")); 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); BlockingOperationRunner pt = new BlockingOperationRunner(App.Kp2a, addTask);
pt.Run(); pt.Run();
@@ -260,7 +260,7 @@ namespace keepass2android
private void Save(AutoExecItem item) 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); BlockingOperationRunner pt = new BlockingOperationRunner(App.Kp2a, addTask);
pt.Run(); pt.Run();
@@ -367,7 +367,7 @@ namespace keepass2android
{KeeAutoExecExt.ThisDeviceId, true} {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); BlockingOperationRunner pt = new BlockingOperationRunner(App.Kp2a, addTask);
pt.Run(); pt.Run();

11
src/keepass2android-app/EntryActivity.cs
View File

@@ -76,10 +76,10 @@ namespace keepass2android
protected override void SaveFile(IOConnectionInfo ioc) 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) if (!success)
App.Kp2a.ShowMessage(activity, message, MessageSeverity.Error); App.Kp2a.ShowMessage(context, message, MessageSeverity.Error);
} }
), ((EntryActivity)_activity).Entry.Binaries.Get(_binaryToSave), ioc); ), ((EntryActivity)_activity).Entry.Binaries.Get(_binaryToSave), ioc);
BlockingOperationRunner pt = new BlockingOperationRunner(App.Kp2a, task); BlockingOperationRunner pt = new BlockingOperationRunner(App.Kp2a, task);
@@ -90,6 +90,7 @@ namespace keepass2android
public override void OnSaveInstanceState(Bundle outState) public override void OnSaveInstanceState(Bundle outState)
{ {
outState.PutString("BinaryToSave", _binaryToSave); outState.PutString("BinaryToSave", _binaryToSave);
base.OnSaveInstanceState(outState);
} }
@@ -1494,7 +1495,7 @@ namespace keepass2android
return true; return true;
case Resource.Id.menu_delete: case Resource.Id.menu_delete:
DeleteEntry task = new DeleteEntry(App.Kp2a, Entry, 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(); task.Start();
break; break;
case Resource.Id.menu_toggle_pass: case Resource.Id.menu_toggle_pass:
@@ -1557,10 +1558,10 @@ namespace keepass2android
//save the entry: //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); OnOperationFinishedHandler.DisplayMessage(this, message, true);
finishAction((EntryActivity)activity); finishAction(context as EntryActivity);
}); });

2
src/keepass2android-app/GroupActivity.cs
View File

@@ -225,7 +225,7 @@ namespace keepass2android
//yes //yes
BlockingOperationRunner pt = new BlockingOperationRunner(App.Kp2a, BlockingOperationRunner pt = new BlockingOperationRunner(App.Kp2a,
new AddTemplateEntries(App.Kp2a, new ActionOnOperationFinished(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(); pt.Run();
}, },
(o, args) => (o, args) =>

8
src/keepass2android-app/GroupBaseActivity.cs
View File

@@ -929,11 +929,11 @@ namespace keepass2android
var moveElement = new MoveElements(elementsToMove.ToList(), Group, App.Kp2a, new ActionOnOperationFinished(App.Kp2a, 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)) 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); var progressTask = new BlockingOperationRunner(App.Kp2a, moveElement);
progressTask.Run(); progressTask.Run();
@@ -1726,7 +1726,7 @@ namespace keepass2android
int dbIndex = 0; int dbIndex = 0;
Action<bool, string, Context> action = null; Action<bool, string, Context> action = null;
action = (success, message, activeActivity) => action = (success, message, context) =>
{ {
if (success) if (success)
{ {

6
src/keepass2android-app/SyncUtil.cs
View File

@@ -54,15 +54,15 @@ namespace keepass2android
{ {
var filestorage = App.Kp2a.GetFileStorage(App.Kp2a.CurrentDb.Ioc); var filestorage = App.Kp2a.GetFileStorage(App.Kp2a.CurrentDb.Ioc);
OperationWithFinishHandler task; 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(() => new Handler(Looper.MainLooper).Post(() =>
{ {
if (!String.IsNullOrEmpty(message)) 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 // Tell the adapter to refresh it's list
BaseAdapter adapter = (activity as GroupBaseActivity)?.ListAdapter; BaseAdapter adapter = (context as GroupBaseActivity)?.ListAdapter;
adapter?.NotifyDataSetChanged(); adapter?.NotifyDataSetChanged();
}); });

16
src/keepass2android-app/settings/AppSettingsActivity.cs
View File

@@ -117,13 +117,13 @@ namespace keepass2android
var previousUsername = db.KpDatabase.DefaultUserName; var previousUsername = db.KpDatabase.DefaultUserName;
db.KpDatabase.DefaultUserName = e.NewValue.ToString(); 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) if (!success)
{ {
db.KpDatabase.DefaultUserName = previousUsername; db.KpDatabase.DefaultUserName = previousUsername;
db.KpDatabase.DefaultUserNameChanged = previousUsernameChanged; 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); BlockingOperationRunner pt = new BlockingOperationRunner(App.Kp2a, save);
@@ -183,13 +183,13 @@ namespace keepass2android
String previousName = db.KpDatabase.Name; String previousName = db.KpDatabase.Name;
db.KpDatabase.Name = e.NewValue.ToString(); 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) if (!success)
{ {
db.KpDatabase.Name = previousName; db.KpDatabase.Name = previousName;
db.KpDatabase.NameChanged = previousNameChanged; db.KpDatabase.NameChanged = previousNameChanged;
App.Kp2a.ShowMessage(activity, message, MessageSeverity.Error); App.Kp2a.ShowMessage(context, message, MessageSeverity.Error);
} }
else else
{ {
@@ -410,12 +410,12 @@ namespace keepass2android
var previousCipher = db.KpDatabase.DataCipherUuid; var previousCipher = db.KpDatabase.DataCipherUuid;
db.KpDatabase.DataCipherUuid = new PwUuid(MemUtil.HexStringToByteArray((string)preferenceChangeEventArgs.NewValue)); 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) if (!success)
{ {
db.KpDatabase.DataCipherUuid = previousCipher; db.KpDatabase.DataCipherUuid = previousCipher;
App.Kp2a.ShowMessage(activity, message, MessageSeverity.Error); App.Kp2a.ShowMessage(context, message, MessageSeverity.Error);
return; return;
} }
preferenceChangeEventArgs.Preference.Summary = preferenceChangeEventArgs.Preference.Summary =
@@ -1071,12 +1071,12 @@ namespace keepass2android
Kp2aLog.Log("--new kdf: " + KdfPool.Get(db.KpDatabase.KdfParameters.KdfUuid) + " " + db.KpDatabase.KdfParameters.KdfUuid.ToHexString()); 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) if (!success)
{ {
db.KpDatabase.KdfParameters = previousKdfParams; db.KpDatabase.KdfParameters = previousKdfParams;
App.Kp2a.ShowMessage(activity, message, MessageSeverity.Error); App.Kp2a.ShowMessage(context, message, MessageSeverity.Error);
return; return;
} }
UpdateKdfScreen(); UpdateKdfScreen();