From d7eefa8066b8e2ac70e0a4080c52bce20da24a23 Mon Sep 17 00:00:00 2001 From: Joel Klinghed Date: Thu, 22 Aug 2024 00:10:26 +0200 Subject: samba: Add docker server run by tests Current user needs to be in docker group (or in some other way have access to the docker.socket) for this to work. Two current problems: * listRoot() fails, no directories are found. * gradle hangs after running the samba tests --- .../main/java/org/the_jk/cleversync/io/samba/SambaConnection.kt | 1 + .../src/main/java/org/the_jk/cleversync/io/samba/SambaTree.kt | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'libs/samba/src/main/java') diff --git a/libs/samba/src/main/java/org/the_jk/cleversync/io/samba/SambaConnection.kt b/libs/samba/src/main/java/org/the_jk/cleversync/io/samba/SambaConnection.kt index 0b62b61..d7302cd 100644 --- a/libs/samba/src/main/java/org/the_jk/cleversync/io/samba/SambaConnection.kt +++ b/libs/samba/src/main/java/org/the_jk/cleversync/io/samba/SambaConnection.kt @@ -1,6 +1,7 @@ package org.the_jk.cleversync.io.samba internal class SambaConnection(uri: String, credentials: SambaCredentials) { + val description = uri private val context = NativeSamba.newContext() private val url = context.parseUrl(uri) private var destroyed = false diff --git a/libs/samba/src/main/java/org/the_jk/cleversync/io/samba/SambaTree.kt b/libs/samba/src/main/java/org/the_jk/cleversync/io/samba/SambaTree.kt index 3667a74..91dee56 100644 --- a/libs/samba/src/main/java/org/the_jk/cleversync/io/samba/SambaTree.kt +++ b/libs/samba/src/main/java/org/the_jk/cleversync/io/samba/SambaTree.kt @@ -3,9 +3,12 @@ package org.the_jk.cleversync.io.samba import android.content.res.Resources import org.the_jk.cleversync.io.ModifiableTree -internal class SambaTree(conn: SambaConnection, root: String) : SambaDirectory(conn, root, ""), ModifiableTree { +internal class SambaTree( + private val conn: SambaConnection, + root: String, +) : SambaDirectory(conn, root, ""), ModifiableTree { override fun description(resources: Resources): CharSequence { - TODO("Not yet implemented") + return conn.description } override fun close() { -- cgit v1.2.3-70-g09d2