Add support for custom SMB port (default 445)

Author: Andrey

app/src/main/java/com/raival/compose/file/explorer/screen/main/MainActivityManager.kt

@@ -227,14 +227,15 @@ class MainActivityManager {
 
     fun addSmbDrive(
         host: String,
+        port: Int,
         username: String,
         password: String,
         anonymous: Boolean,
         domain: String,
         context: Context
     ): Boolean {
         return try {
-            openSMBFile(SMBFileHolder(host, username, password, anonymous, domain, ""), context)
+            openSMBFile(SMBFileHolder(host, port, username, password, anonymous, domain, ""), context)
         } catch (e: Exception) {
             false
         }

app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/holder/SMBFileHolder.kt

@@ -24,6 +24,7 @@ import kotlinx.coroutines.withContext
 
 class SMBFileHolder(
     val host: String,
+    val port: Int = 445,
     val username: String?,
     val password: String?,
     val anonymous: Boolean,
@@ -95,8 +96,15 @@ class SMBFileHolder(
         val client = SMBClient()
         try {
             client.connect(host).use { connection ->
-                val session = SMBConnectionManager.getSession(host, username, password, domain, anonymous)
-
+                val session = SMBConnectionManager.getSession(
+                    host = host,
+                    port = port,
+                    username = username,
+                    password = password,
+                    domain = domain,
+                    anonymous = anonymous
+                )
+                
                 if (shareName.isNotBlank()) {
                     val share = session.connectShare(shareName) as DiskShare
                     share.list("").isNotEmpty()
@@ -121,7 +129,14 @@ class SMBFileHolder(
 
         try {
             client.connect(host).use { connection: Connection ->
-                val session = SMBConnectionManager.getSession(host, username, password, domain, anonymous)
+                val session = SMBConnectionManager.getSession(
+                    host = host,
+                    port = port,
+                    username = username,
+                    password = password,
+                    domain = domain,
+                    anonymous = anonymous
+                )
 
                 if (shareName.isNullOrBlank() || shareName == "/") {
                     val transport = SMBTransportFactories.SRVSVC.getTransport(session)
@@ -184,7 +199,7 @@ class SMBFileHolder(
     override suspend fun getParent(): SMBFileHolder? {
         if (pathInsideShare.isBlank()) return null //
         val parentPath = pathInsideShare.substringBeforeLast("/", "")
-        return SMBFileHolder(host, username, password, anonymous, domain, shareName, parentPath)
+        return SMBFileHolder(host, port, username, password, anonymous, domain, shareName, parentPath)
     }
 
     override fun open(context: Context, anonymous: Boolean, skipSupportedExtensions: Boolean, customMimeType: String?) {
@@ -197,7 +212,14 @@ class SMBFileHolder(
         val client = SMBClient()
         try {
             client.connect(host).use { connection ->
-                val session = SMBConnectionManager.getSession(host, username, password, domain, anonymous)
+                val session = SMBConnectionManager.getSession(
+                    host = host,
+                    port = port,
+                    username = username,
+                    password = password,
+                    domain = domain,
+                    anonymous = anonymous
+                )
 
                 val share = session.connectShare(shareName) as DiskShare
                 val newFilePath = if (pathInsideShare.isBlank()) name else "$pathInsideShare/$name"
@@ -235,7 +257,14 @@ class SMBFileHolder(
         val client = SMBClient()
         try {
             client.connect(host).use { connection ->
-                val session = SMBConnectionManager.getSession(host, username, password, domain, anonymous)
+                val session = SMBConnectionManager.getSession(
+                    host = host,
+                    port = port,
+                    username = username,
+                    password = password,
+                    domain = domain,
+                    anonymous = anonymous
+                )
 
                 val share = session.connectShare(shareName) as DiskShare
 
@@ -265,7 +294,14 @@ class SMBFileHolder(
         val client = SMBClient()
         try {
             client.connect(host).use { connection ->
-                val session = SMBConnectionManager.getSession(host, username, password, domain, anonymous)
+                val session = SMBConnectionManager.getSession(
+                    host = host,
+                    port = port,
+                    username = username,
+                    password = password,
+                    domain = domain,
+                    anonymous = anonymous
+                )
 
                 val share = session.connectShare(shareName) as DiskShare
                 for (entry in share.list(pathInsideShare)) {

app/src/main/java/com/raival/compose/file/explorer/screen/main/tab/files/smb/SMBConnectionManager.kt

@@ -9,15 +9,16 @@ object SMBConnectionManager {
 
     fun getSession(
         host: String,
+        port: Int = 445, // default smb port 445
         username: String?,
         password: String?,
         domain: String?,
         anonymous: Boolean
     ): Session {
-        val key = "$host|${username ?: "anon"}"
+        val key = "$domain|$host|$port|${username ?: "anon"}"
         return clients[key] ?: run {
             val client = SMBClient()
-            val connection = client.connect(host)
+            val connection = client.connect(host, port)
             val session = if (anonymous || username.isNullOrBlank()) {
                 connection.authenticate(null)
             } else {

app/src/main/java/com/raival/compose/file/explorer/screen/main/ui/AddSMBDriveDialog.kt

@@ -27,6 +27,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.OutlinedButton
@@ -54,6 +55,7 @@ fun AddSMBDriveDialog(
     val context = LocalContext.current
     val mainActivityManager = globalClass.mainActivityManager
     var host by remember { mutableStateOf("") }
+    var portText by remember { mutableStateOf("") }
     var username by remember { mutableStateOf("") }
     var password by remember { mutableStateOf("") }
     var anonymous by remember { mutableStateOf(false) }
@@ -100,6 +102,31 @@ fun AddSMBDriveDialog(
                     modifier = Modifier.fillMaxWidth()
                 )
 
+                if (showMore) {
+                    OutlinedTextField(
+                        value = portText,
+                        onValueChange = { newValue ->
+                            if (newValue.all { it.isDigit() }) {
+                                portText = newValue
+                            }
+                        },
+                        label = { Text(stringResource(R.string.port)) },
+                        placeholder = { Text("445") },
+                        singleLine = true,
+                        shape = RoundedCornerShape(6.dp),
+                        colors = TextFieldDefaults.colors(
+                            focusedIndicatorColor = Color.Transparent,
+                            unfocusedIndicatorColor = Color.Transparent,
+                            disabledIndicatorColor = Color.Transparent,
+                            errorIndicatorColor = Color.Transparent
+                        ),
+                        keyboardOptions = KeyboardOptions.Default.copy(
+                            keyboardType = androidx.compose.ui.text.input.KeyboardType.Number
+                        ),
+                        modifier = Modifier.fillMaxWidth()
+                    )
+                }
+
                 OutlinedTextField(
                     value = username,
                     onValueChange = { username = it },
@@ -189,8 +216,10 @@ fun AddSMBDriveDialog(
                         modifier = Modifier.weight(1f),
                         onClick = {
                             CoroutineScope(Dispatchers.IO).launch {
+                                val port = portText.toIntOrNull() ?: 445
+
                                 val success = mainActivityManager.addSmbDrive(
-                                    host, username, password, anonymous, domain, context
+                                    host, port, username, password, anonymous, domain, context
                                 )
 
                                 withContext(Dispatchers.Main) {

app/src/main/res/values-es/strings.xml

@@ -465,4 +465,5 @@
     <string name="optional">Opcional</string>
     <string name="cant_connect_smb">No se pudo conectar. Por favor, verifica tus datos.</string>
     <string name="connect">Conectar</string>
+    <string name="port">Puerto</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -465,4 +465,5 @@
     <string name="optional">Optional</string>
     <string name="cant_connect_smb">Could not connect. Please check your details.</string>
     <string name="connect">Connect</string>
+    <string name="port">Port</string>
 </resources>