improve Samba dialog. fix NoNet build

This commit is contained in:
Philipp Crocoll
2025-07-15 11:51:15 +02:00
parent f03c11381e
commit b83c4b3772
4 changed files with 11 additions and 2 deletions

View File

@@ -8,7 +8,7 @@ using SMBLibrary;
using FileAttributes = SMBLibrary.FileAttributes; using FileAttributes = SMBLibrary.FileAttributes;
using KeePassLib.Utility; using KeePassLib.Utility;
using Java.Nio.FileNio; using Java.Nio.FileNio;
#if !NoNet
namespace Kp2aBusinessLogic.Io namespace Kp2aBusinessLogic.Io
{ {
public class SmbFileStorage : IFileStorage public class SmbFileStorage : IFileStorage
@@ -613,3 +613,4 @@ namespace Kp2aBusinessLogic.Io
} }
} }
} }
#endif

View File

@@ -4,6 +4,7 @@ using System.Linq;
using System.Net; using System.Net;
#if !NoNet #if !NoNet
using FluentFTP; using FluentFTP;
using static Kp2aBusinessLogic.Io.SmbFileStorage;
#endif #endif
using System.Text; using System.Text;
@@ -22,7 +23,7 @@ using Keepass2android.Javafilestorage;
#endif #endif
using KeePassLib.Serialization; using KeePassLib.Serialization;
using KeePassLib.Utility; using KeePassLib.Utility;
using static Kp2aBusinessLogic.Io.SmbFileStorage;
namespace keepass2android namespace keepass2android
{ {
@@ -384,6 +385,8 @@ namespace keepass2android
string fullPath = SmbConnectionInfo.FromUrlAndCredentials(url, user, password, domain).ToPath(); string fullPath = SmbConnectionInfo.FromUrlAndCredentials(url, user, password, domain).ToPath();
onStartBrowse(fullPath); onStartBrowse(fullPath);
}); });
builder.SetCancelable(false);
EventHandler<DialogClickEventArgs> evtH = new EventHandler<DialogClickEventArgs>((sender, e) => onCancel()); EventHandler<DialogClickEventArgs> evtH = new EventHandler<DialogClickEventArgs>((sender, e) => onCancel());
builder.SetNegativeButton(Android.Resource.String.Cancel, evtH); builder.SetNegativeButton(Android.Resource.String.Cancel, evtH);

View File

@@ -3,8 +3,12 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="12dp"
android:layout_margin="12dip" android:layout_margin="12dip"
> >
<TextView android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/hint_smb_credentials" />
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"

View File

@@ -734,6 +734,7 @@
<string name="EntryChannel_name">Entry notifications</string> <string name="EntryChannel_name">Entry notifications</string>
<string name="EntryChannel_desc">Notification to simplify access to the currently selected entry.</string> <string name="EntryChannel_desc">Notification to simplify access to the currently selected entry.</string>
<string name="CloseDbAfterFailedAttempts">Close database after three failed biometric unlock attempts.</string> <string name="CloseDbAfterFailedAttempts">Close database after three failed biometric unlock attempts.</string>
<string name="hint_smb_credentials">If you want to access files from your personal Windows computer, use the computer name or local IP address as host URL; enter the computer name as domain and the Windows login (often the same as your Microsoft account) as username and password.</string>
<string name="WarnFingerprintInvalidated">Warning! Biometric authentication can be invalidated by Android, e.g. after adding a new fingerprint in your device settings. Make sure you always know how to unlock with your master password!</string> <string name="WarnFingerprintInvalidated">Warning! Biometric authentication can be invalidated by Android, e.g. after adding a new fingerprint in your device settings. Make sure you always know how to unlock with your master password!</string>
<string-array name="ChangeLog_1_13"> <string-array name="ChangeLog_1_13">