Connect to localhost server dialog (#213)

* Implemented connect to localhost with ssh-tunneling warning dialog

* Updated README.md & strings.xml

* Fix Chinese Simplified version

* Fixed strings declaration

* Updated url validation & strings.xml + refactoring

* Fix workflow

---------

Co-authored-by: ShiftHackZ <[email protected]>
Co-authored-by: ShiftHackZ <[email protected]>

Author: ComicSAS

.github/workflows/android_test.yml

@@ -10,8 +10,6 @@ jobs:
   test-feature:
     runs-on: ubuntu-latest
 
-    needs: build
-
     steps:
       - name: Checkout code
         uses: actions/[email protected]

README.md

@@ -112,6 +112,7 @@ User interface of the app is translated for languages listed in this table:
 | Ukrainian | 0.1.0 | `Translated` |
 | Turkish | 0.4.1 | `Translated` |
 | Russian | 0.5.5 | `Translated` |
+| Chinese (Simplified) | 0.6.2 | `Translated` |
 
 Any contributions to the translations are welcome.
 

app/build.gradle

@@ -14,8 +14,8 @@ android {
     namespace 'com.shifthackz.aisdv1.app'
     defaultConfig {
         applicationId "com.shifthackz.aisdv1.app"
-        versionName "0.6.1"
-        versionCode 180
+        versionName "0.6.2"
+        versionCode 182
 
         buildConfigField "String", "IMAGE_CDN_URL", "\"https://random.imagecdn.app/\""
         buildConfigField "String", "HUGGING_FACE_URL", "\"https://huggingface.co/\""

core/validation/src/main/java/com/shifthackz/aisdv1/core/validation/url/UrlValidator.kt

@@ -9,6 +9,7 @@ interface UrlValidator {
     sealed interface Error {
         data object Empty : Error
         data object BadScheme : Error
+        data object BadPort : Error
         data object Invalid : Error
         data object Localhost : Error
     }

core/validation/src/main/java/com/shifthackz/aisdv1/core/validation/url/UrlValidatorImpl.kt

@@ -3,6 +3,7 @@ package com.shifthackz.aisdv1.core.validation.url
 import android.util.Patterns
 import android.webkit.URLUtil
 import com.shifthackz.aisdv1.core.validation.ValidationResult
+import java.net.URI
 
 internal class UrlValidatorImpl : UrlValidator {
 
@@ -19,7 +20,11 @@ internal class UrlValidatorImpl : UrlValidator {
             isValid = false,
             validationError = UrlValidator.Error.BadScheme,
         )
-        input.contains(LOCALHOST_IPV4) -> ValidationResult(
+        !isPortValid(input) -> ValidationResult(
+            isValid = false,
+            validationError = UrlValidator.Error.BadPort,
+        )
+        isLocalhostUrl(input) -> ValidationResult(
             isValid = false,
             validationError = UrlValidator.Error.Localhost,
         )
@@ -34,9 +39,29 @@ internal class UrlValidatorImpl : UrlValidator {
         else -> ValidationResult(isValid = true)
     }
 
+    private fun isPortValid(url: String): Boolean = try {
+        val uri = URI(url)
+        val port = uri.port
+        port in 1..65535 || port == -1
+    } catch (e: Exception) {
+        false
+    }
+
+    private fun isLocalhostUrl(url: String): Boolean = try {
+        val uri = URI(url)
+        val host = uri.host
+        host.equals(LOCALHOST_ALIAS, true)
+                || host.equals(LOCALHOST_IPV4, true)
+                || host.equals(LOCALHOST_IPV6, true)
+    } catch (e: Exception) {
+        false
+    }
+
     companion object {
         private const val SCHEME_HTTPS = "https://"
         private const val SCHEME_HTTP = "http://"
+        private const val LOCALHOST_ALIAS = "localhost"
         private const val LOCALHOST_IPV4 = "127.0.0.1"
+        private const val LOCALHOST_IPV6 = "[::1]"
     }
 }

presentation/src/main/java/com/shifthackz/aisdv1/presentation/modal/ModalRenderer.kt

@@ -192,7 +192,7 @@ fun ModalRenderer(
             onDismissRequest = dismiss,
         )
 
-        Modal.ExportInProgress ->  ProgressDialog(
+        Modal.ExportInProgress -> ProgressDialog(
             titleResId = R.string.exporting_progress_title,
             subTitleResId = R.string.exporting_progress_sub_title,
             canDismiss = false,
@@ -242,5 +242,14 @@ fun ModalRenderer(
             onDismissRequest = dismiss,
             onResult = { processIntent(ImageToImageIntent.UpdateImage(it)) }
         )
+
+        Modal.ConnectLocalHost -> DecisionInteractiveDialog(
+            title = R.string.interaction_warning_title.asUiText(),
+            text = R.string.interaction_warning_localhost_sub_title.asUiText(),
+            confirmActionResId = R.string.action_connect,
+            dismissActionResId = R.string.cancel,
+            onConfirmAction = { processIntent(ServerSetupIntent.ConnectToLocalHost) },
+            onDismissRequest = dismiss,
+        )
     }
 }

presentation/src/main/java/com/shifthackz/aisdv1/presentation/model/Modal.kt

@@ -22,6 +22,8 @@ sealed interface Modal {
 
     data object ExportInProgress : Modal
 
+    data object ConnectLocalHost : Modal
+
 
     @Immutable
     data class SelectSdModel(val models: List<String>, val selected: String) : Modal
@@ -64,13 +66,13 @@ sealed interface Modal {
     sealed interface Image : Modal {
 
         @Immutable
-        data class Single(val result: AiGenerationResult, val autoSaveEnabled: Boolean): Image
+        data class Single(val result: AiGenerationResult, val autoSaveEnabled: Boolean) : Image
 
         @Immutable
-        data class Batch(val results: List<AiGenerationResult>, val autoSaveEnabled: Boolean): Image
+        data class Batch(val results: List<AiGenerationResult>, val autoSaveEnabled: Boolean) : Image
 
         @Immutable
-        data class Crop(val bitmap: Bitmap): Image
+        data class Crop(val bitmap: Bitmap) : Image
 
         companion object {
             fun create(list: List<AiGenerationResult>, autoSaveEnabled: Boolean): Image =

presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/setup/ServerSetupIntent.kt

@@ -46,6 +46,8 @@ sealed interface ServerSetupIntent : MviIntent {
 
     data object LaunchManageStoragePermission : ServerSetupIntent
 
+    data object ConnectToLocalHost : ServerSetupIntent
+
     sealed class LaunchUrl : ServerSetupIntent, KoinComponent {
 
         protected val linksProvider: LinksProvider by inject()

presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/setup/ServerSetupViewModel.kt

@@ -129,7 +129,7 @@ class ServerSetupViewModel(
                 it.copy(step = ServerSetupState.Step.CONFIGURE)
             }
 
-            ServerSetupState.Step.CONFIGURE -> connectToServer()
+            ServerSetupState.Step.CONFIGURE -> validateAndConnectToServer()
         }
 
         is ServerSetupIntent.UpdateAuthType -> updateState {
@@ -200,10 +200,16 @@ class ServerSetupViewModel(
         is ServerSetupIntent.UpdateStabilityAiApiKey -> updateState {
             it.copy(stabilityAiApiKey = intent.key)
         }
+
+        ServerSetupIntent.ConnectToLocalHost -> connectToServer()
     }
 
-    private fun connectToServer() {
+    private fun validateAndConnectToServer() {
         if (!validate()) return
+        connectToServer()
+    }
+
+    private fun connectToServer() {
         emitEffect(ServerSetupEffect.HideKeyboard)
         !when (currentState.mode) {
             ServerSource.HORDE -> connectToHorde()
@@ -212,8 +218,10 @@ class ServerSetupViewModel(
             ServerSource.HUGGING_FACE -> connectToHuggingFace()
             ServerSource.OPEN_AI -> connectToOpenAi()
             ServerSource.STABILITY_AI -> connectToStabilityAi()
-        }.doOnSubscribe { setScreenModal(Modal.Communicating(canCancel = false)) }
-            .subscribeOnMainThread(schedulersProvider).subscribeBy(::errorLog) { result ->
+        }
+            .doOnSubscribe { setScreenModal(Modal.Communicating(canCancel = false)) }
+            .subscribeOnMainThread(schedulersProvider)
+            .subscribeBy(::errorLog) { result ->
                 result.fold(
                     onSuccess = { onSetupComplete() },
                     onFailure = { t ->
@@ -230,8 +238,8 @@ class ServerSetupViewModel(
             else {
                 val serverUrlValidation = urlValidator(currentState.serverUrl)
                 var isValid = serverUrlValidation.isValid
-                updateState {
-                    var newState = it.copy(
+                updateState { state ->
+                    var newState = state.copy(
                         serverUrlValidationError = serverUrlValidation.mapToUi()
                     )
                     if (currentState.authType == ServerSetupState.AuthType.HTTP_BASIC) {
@@ -243,6 +251,12 @@ class ServerSetupViewModel(
                         )
                         isValid = isValid && loginValidation.isValid && passwordValidation.isValid
                     }
+                    if (serverUrlValidation.validationError is UrlValidator.Error.Localhost
+                        && newState.loginValidationError == null
+                        && newState.passwordValidationError == null
+                    ) {
+                        newState = newState.copy(screenModal = Modal.ConnectLocalHost)
+                    }
                     newState
                 }
                 isValid

presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/setup/forms/Automatic1111Form.kt

@@ -66,11 +66,12 @@ fun Automatic1111Form(
             supportingText = state.serverUrlValidationError
                 ?.takeIf { !state.demoMode }
                 ?.let { { Text(it.asString(), color = MaterialTheme.colorScheme.error) } },
+            maxLines = 1,
         )
         if (!state.demoMode) {
             DropdownTextField(
                 modifier = fieldModifier,
-                label = "Authorization".asUiText(),
+                label = R.string.auth_title.asUiText(),
                 items = ServerSetupState.AuthType.entries,
                 value = state.authType,
                 onItemSelected = {
@@ -85,7 +86,6 @@ fun Automatic1111Form(
             )
             when (state.authType) {
                 ServerSetupState.AuthType.HTTP_BASIC -> {
-
                     TextField(
                         modifier = fieldModifier,
                         value = state.login,
@@ -97,6 +97,7 @@ fun Automatic1111Form(
                         supportingText = state.loginValidationError?.let {
                             { Text(it.asString(), color = MaterialTheme.colorScheme.error) }
                         },
+                        maxLines = 1,
                     )
                     TextField(
                         modifier = fieldModifier,
@@ -107,8 +108,11 @@ fun Automatic1111Form(
                         label = { Text(stringResource(id = R.string.hint_password)) },
                         isError = state.passwordValidationError != null,
                         keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
-                        visualTransformation = if (state.passwordVisible) VisualTransformation.None
-                        else PasswordVisualTransformation(),
+                        visualTransformation = if (state.passwordVisible) {
+                            VisualTransformation.None
+                        } else {
+                            PasswordVisualTransformation()
+                        },
                         supportingText = state.passwordValidationError?.let {
                             { Text(it.asString(), color = MaterialTheme.colorScheme.error) }
                         },
@@ -126,7 +130,8 @@ fun Automatic1111Form(
                                 },
                                 content = { Icon(image, description) },
                             )
-                        }
+                        },
+                        maxLines = 1,
                     )
                 }
                 else -> Unit
@@ -171,4 +176,4 @@ fun Automatic1111Form(
             style = MaterialTheme.typography.bodyMedium,
         )
     }
-}
+}