Skip to content

Add SMB support #650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Goldmaster wants to merge 9 commits into
base: develop
Choose a base branch
from
+1,250 −29
Draft

Add SMB support #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4b474eb
Start work on SMB implementation.
Goldmaster Jul 19, 2026
50fde8d
Add SMB settings interface.
Goldmaster Jul 19, 2026
24f41f3
Ensured SMB options show up in the correct order.
Goldmaster Jul 19, 2026
e766cec
Fixed SMB connections naming.
Goldmaster Jul 19, 2026
441c9fb
Fixed SMB connection error.
Goldmaster Jul 22, 2026
7a4637c
Fixed password input prompt not showing up.
Goldmaster Jul 22, 2026
811406a
Ability to create file within a vault.
Goldmaster Jul 22, 2026
ae2d5f3
Recreated icons as best as from current files.
Goldmaster Jul 22, 2026
13f4bdf
Comments added and code clean up.
Goldmaster Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions .idea/appInsightsSettings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions .idea/deploymentTargetSelector.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/planningMode.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions buildsystem/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ ext {

scaleImageViewVersion = '3.10.1-dev.0002'

slf4jAndroidVersion = '1.7.36'

lruFileCacheVersion = '1.2'

// KEEP IN SYNC WITH GENERATOR VERSION IN root build.gradle
Expand All @@ -100,6 +102,7 @@ ext {

minIoVersion = '9.0.3'
pcloudVersion = '1.10.0-dev.0001'
smbjVersion = '0.13.0'
staxVersion = '1.2.0' // needed for minIO
commonsCodecVersion = '1.22.0'

Expand Down Expand Up @@ -193,6 +196,8 @@ ext {
rxJava : "io.reactivex.rxjava2:rxjava:${rxJavaVersion}",
rxAndroid : "io.reactivex.rxjava2:rxandroid:${rxAndroidVersion}",
rxBinding : "com.jakewharton.rxbinding2:rxbinding:${rxBindingVersion}",
slf4jAndroid : "org.slf4j:slf4j-android:${slf4jAndroidVersion}",
smbj : "com.hierynomus:smbj:${smbjVersion}",
stax : "stax:stax:${staxVersion}",
testingSupportLib : "com.android.support.test:testing-support-lib:${testingSupportLibVersion}",
timber : "com.jakewharton.timber:timber:${timberVersion}",
Expand Down
1 change: 1 addition & 0 deletions data/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ dependencies {

addToFlavors(cloudFlavors, dependencies.pcloud)

implementation dependencies.smbj
implementation dependencies.stax
api dependencies.minIo

Expand Down
3 changes: 3 additions & 0 deletions ...rc/apkStorePlaystore/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.cryptomator.data.cloud.onedrive.OnedriveCloudContentRepositoryFactory;
import org.cryptomator.data.cloud.pcloud.PCloudContentRepositoryFactory;
import org.cryptomator.data.cloud.s3.S3CloudContentRepositoryFactory;
import org.cryptomator.data.cloud.smb.SmbCloudContentRepositoryFactory;
import org.cryptomator.data.cloud.webdav.WebDavCloudContentRepositoryFactory;
import org.cryptomator.data.repository.CloudContentRepositoryFactory;
import org.jetbrains.annotations.NotNull;
Expand All @@ -29,6 +30,7 @@ public CloudContentRepositoryFactories(DropboxCloudContentRepositoryFactory drop
OnedriveCloudContentRepositoryFactory oneDriveFactory, //
PCloudContentRepositoryFactory pCloudFactory, //
S3CloudContentRepositoryFactory s3Factory, //
SmbCloudContentRepositoryFactory smbFactory, //
CryptoCloudContentRepositoryFactory cryptoFactory, //
LocalStorageContentRepositoryFactory localStorageFactory, //
WebDavCloudContentRepositoryFactory webDavFactory) {
Expand All @@ -38,6 +40,7 @@ public CloudContentRepositoryFactories(DropboxCloudContentRepositoryFactory drop
oneDriveFactory, //
pCloudFactory, //
s3Factory, //
smbFactory, //
cryptoFactory, //
localStorageFactory, //
webDavFactory);
Expand Down
3 changes: 3 additions & 0 deletions ...src/fdroidAccrescent/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.cryptomator.data.cloud.onedrive.OnedriveCloudContentRepositoryFactory;
import org.cryptomator.data.cloud.pcloud.PCloudContentRepositoryFactory;
import org.cryptomator.data.cloud.s3.S3CloudContentRepositoryFactory;
import org.cryptomator.data.cloud.smb.SmbCloudContentRepositoryFactory;
import org.cryptomator.data.cloud.webdav.WebDavCloudContentRepositoryFactory;
import org.cryptomator.data.repository.CloudContentRepositoryFactory;
import org.jetbrains.annotations.NotNull;
Expand All @@ -27,6 +28,7 @@ public CloudContentRepositoryFactories(DropboxCloudContentRepositoryFactory drop
OnedriveCloudContentRepositoryFactory oneDriveFactory, //
PCloudContentRepositoryFactory pCloudFactory, //
S3CloudContentRepositoryFactory s3Factory, //
SmbCloudContentRepositoryFactory smbFactory, //
CryptoCloudContentRepositoryFactory cryptoFactory, //
LocalStorageContentRepositoryFactory localStorageFactory, //
WebDavCloudContentRepositoryFactory webDavFactory) {
Expand All @@ -35,6 +37,7 @@ public CloudContentRepositoryFactories(DropboxCloudContentRepositoryFactory drop
oneDriveFactory, //
pCloudFactory, //
s3Factory, //
smbFactory, //
cryptoFactory, //
localStorageFactory, //
webDavFactory);
Expand Down
7 changes: 5 additions & 2 deletions data/src/lite/java/org/cryptomator/data/cloud/CloudContentRepositoryFactories.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.cryptomator.data.cloud.crypto.CryptoCloudContentRepositoryFactory;
import org.cryptomator.data.cloud.local.LocalStorageContentRepositoryFactory;
import org.cryptomator.data.cloud.s3.S3CloudContentRepositoryFactory;
import org.cryptomator.data.cloud.smb.SmbCloudContentRepositoryFactory;
import org.cryptomator.data.cloud.webdav.WebDavCloudContentRepositoryFactory;
import org.cryptomator.data.repository.CloudContentRepositoryFactory;
import org.jetbrains.annotations.NotNull;
Expand All @@ -23,12 +24,14 @@ public class CloudContentRepositoryFactories implements Iterable<CloudContentRep
public CloudContentRepositoryFactories(S3CloudContentRepositoryFactory s3Factory, //
CryptoCloudContentRepositoryFactory cryptoFactory, //
LocalStorageContentRepositoryFactory localStorageFactory, //
WebDavCloudContentRepositoryFactory webDavFactory) {
WebDavCloudContentRepositoryFactory webDavFactory, //
SmbCloudContentRepositoryFactory smbFactory) {

factories = asList(s3Factory, //
cryptoFactory, //
localStorageFactory, //
webDavFactory);
webDavFactory, //
smbFactory);
}

@NotNull
Expand Down
Loading