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

refactor SftpFileStorage creation

Browse Source
This commit is contained in:
Philipp Crocoll
2023-11-13 09:18:39 +01:00
parent c19b8d2238
commit 30d45e086c
3 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Kp2aBusinessLogic/Io/JavaFileStorage.cs
View File

@@ -25,7 +25,7 @@ namespace keepass2android.Io
public abstract bool UserShouldBackup { get; } public abstract bool UserShouldBackup { get; }
private readonly IJavaFileStorage _jfs; protected readonly IJavaFileStorage _jfs;
private readonly IKp2aApp _app; private readonly IKp2aApp _app;
public JavaFileStorage(IJavaFileStorage jfs, IKp2aApp app) public JavaFileStorage(IJavaFileStorage jfs, IKp2aApp app)

28
src/Kp2aBusinessLogic/Io/SftpFileStorage.cs
View File

@@ -1,17 +1,39 @@
using Android.Content; using Android.Content;
using Java.Nio.FileNio;
#if !EXCLUDE_JAVAFILESTORAGE #if !EXCLUDE_JAVAFILESTORAGE
namespace keepass2android.Io namespace keepass2android.Io
{ {
public class SftpFileStorage: JavaFileStorage public class SftpFileStorage: JavaFileStorage
{ {
public SftpFileStorage(Context ctx, IKp2aApp app) : public SftpFileStorage(Context ctx, IKp2aApp app, bool debugEnabled) :
base(new Keepass2android.Javafilestorage.SftpStorage(ctx.ApplicationContext), app) base(new Keepass2android.Javafilestorage.SftpStorage(ctx.ApplicationContext), app)
{ {
} var storage = BaseStorage;
if (debugEnabled)
{
string? logFilename = null;
if (Kp2aLog.LogToFile)
{
logFilename = Kp2aLog.LogFilename;
}
storage.SetJschLogging(true, logFilename);
}
else
{
storage.SetJschLogging(false, null);
}
}
private Keepass2android.Javafilestorage.SftpStorage BaseStorage
{
get
{
return _jfs as Keepass2android.Javafilestorage.SftpStorage;
}
}
public override bool UserShouldBackup public override bool UserShouldBackup
{ {
get { return true; } get { return true; }
} }

29
src/keepass2android/app/App.cs
View File

@@ -832,7 +832,7 @@ namespace keepass2android
new OneDrive2FullFileStorage(), new OneDrive2FullFileStorage(),
new OneDrive2MyFilesFileStorage(), new OneDrive2MyFilesFileStorage(),
new OneDrive2AppFolderFileStorage(), new OneDrive2AppFolderFileStorage(),
CreateSftpFileStorage(), new SftpFileStorage(LocaleManager.LocalizedAppContext, this, IsFtpDebugEnabled()),
new NetFtpFileStorage(LocaleManager.LocalizedAppContext, this, IsFtpDebugEnabled), new NetFtpFileStorage(LocaleManager.LocalizedAppContext, this, IsFtpDebugEnabled),
new WebDavFileStorage(this), new WebDavFileStorage(this),
new PCloudFileStorage(LocaleManager.LocalizedAppContext, this), new PCloudFileStorage(LocaleManager.LocalizedAppContext, this),
@@ -854,33 +854,8 @@ namespace keepass2android
return PreferenceManager.GetDefaultSharedPreferences(LocaleManager.LocalizedAppContext) return PreferenceManager.GetDefaultSharedPreferences(LocaleManager.LocalizedAppContext)
.GetBoolean(LocaleManager.LocalizedAppContext.GetString(Resource.String.FtpDebug_key), false); .GetBoolean(LocaleManager.LocalizedAppContext.GetString(Resource.String.FtpDebug_key), false);
} }
#if !EXCLUDE_JAVAFILESTORAGE
#if !NoNet
private IFileStorage CreateSftpFileStorage()
{
Context ctx = LocaleManager.LocalizedAppContext;
SftpFileStorage fileStorage = new SftpFileStorage(ctx, this);
var storage = new SftpStorage(ctx); public void TriggerReload(Context ctx, Action<bool> actionOnResult)
if (IsFtpDebugEnabled())
{
string? logFilename = null;
if (Kp2aLog.LogToFile)
{
logFilename = Kp2aLog.LogFilename;
}
storage.SetJschLogging(true, logFilename);
} else
{
storage.SetJschLogging(false, null);
}
return fileStorage;
}
#endif
#endif
public void TriggerReload(Context ctx, Action<bool> actionOnResult)
{ {
Handler handler = new Handler(Looper.MainLooper); Handler handler = new Handler(Looper.MainLooper);
handler.Post(() => handler.Post(() =>