Restore Repeater support

gujjwal00 · Feb 18, 2024 · 9417ccf · 9417ccf
1 parent 7e840ff
commit 9417ccf
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 6 deletions.
diff --git a/app/src/main/java/com/gaurav/avnc/model/ServerProfile.kt b/app/src/main/java/com/gaurav/avnc/model/ServerProfile.kt
@@ -147,8 +147,16 @@ data class ServerProfile(
          */
         var useCount: Int = 0,
 
-        // These fields are not used, as repeater support has been removed
+        /**
+         * Whether UltraVNC Repeater is used for connections.
+         * When repeater is used, [host] & [port] identifies the repeater.
+         */
         var useRepeater: Boolean = false,
+
+        /**
+         * When using a repeater, this value identifies the VNC server.
+         * Valid IDs: [0, 999999999].
+         */
         var idOnRepeater: Int = 0,
 
         /**

diff --git a/app/src/main/java/com/gaurav/avnc/ui/home/ProfileEditor.kt b/app/src/main/java/com/gaurav/avnc/ui/home/ProfileEditor.kt
@@ -192,6 +192,9 @@ class AdvancedProfileEditor : Fragment() {
     private fun validate(): Boolean {
         var result = validateNotEmpty(binding.host) and validateNotEmpty(binding.port)
 
+        if (binding.useRepeater.isChecked)
+            result = result and validateNotEmpty(binding.idOnRepeater)
+
         if (binding.useSshTunnel.isChecked) {
             result = result and
                     validateNotEmpty(binding.sshHost) and

diff --git a/app/src/main/java/com/gaurav/avnc/viewmodel/EditorViewModel.kt b/app/src/main/java/com/gaurav/avnc/viewmodel/EditorViewModel.kt
@@ -31,6 +31,8 @@ class EditorViewModel(app: Application, state: SavedStateHandle, initialProfile:
      * more complex handling, and live feedback in UI.
      * For these, we have to use dedicated LiveData fields.
      */
+    val useRepeater = state.getLiveData("useRepeater", profile.useRepeater)
+    val idOnRepeater = state.getLiveData("idOnRepeater", if (profile.useRepeater) profile.idOnRepeater.toString() else "")
     val useRawEncoding = state.getLiveData("useRawEncoding", profile.useRawEncoding)
     val useSshTunnel = state.getLiveData("useSshTunnel", profile.channelType == ServerProfile.CHANNEL_SSH_TUNNEL)
     val sshUsePassword = state.getLiveData("sshUsePassword", profile.sshAuthType == ServerProfile.SSH_AUTH_PASSWORD)
@@ -39,6 +41,8 @@ class EditorViewModel(app: Application, state: SavedStateHandle, initialProfile:
 
 
     fun prepareProfileForSave(): ServerProfile {
+        profile.useRepeater = useRepeater.value ?: false
+        profile.idOnRepeater = idOnRepeater.value?.toIntOrNull() ?: 0
         profile.useRawEncoding = useRawEncoding.value ?: false
         profile.channelType = if (useSshTunnel.value == true) ServerProfile.CHANNEL_SSH_TUNNEL else ServerProfile.CHANNEL_TCP
         profile.sshAuthType = if (sshUsePassword.value == true) ServerProfile.SSH_AUTH_PASSWORD else ServerProfile.SSH_AUTH_KEY

diff --git a/app/src/main/java/com/gaurav/avnc/viewmodel/VncViewModel.kt b/app/src/main/java/com/gaurav/avnc/viewmodel/VncViewModel.kt
@@ -205,6 +205,9 @@ class VncViewModel(val profile: ServerProfile, app: Application) : BaseViewModel
 
         client.configure(profile.viewOnly, profile.securityType, true  /* Hardcoded to true */,
                          profile.imageQuality, profile.useRawEncoding)
+
+        if (profile.useRepeater)
+            client.setupRepeater(profile.idOnRepeater)
     }
 
     private fun connect() {

diff --git a/app/src/main/res/layout/fragment_profile_editor.xml b/app/src/main/res/layout/fragment_profile_editor.xml
@@ -47,8 +47,8 @@
                     android:id="@+id/host"
                     style="@style/FormField.EditText"
                     android:layout_weight=".8"
-                    android:drawableStart="@drawable/ic_computer"
-                    android:hint="@string/hint_host"
+                    android:drawableStart="@{profile.useRepeater ? @drawable/ic_swap :  @drawable/ic_computer}"
+                    android:hint="@{profile.useRepeater ? @string/hint_repeater_host : @string/hint_host}"
                     android:importantForAutofill="no"
                     android:inputType="textUri"
                     android:text="@={profile.host}" />

diff --git a/app/src/main/res/layout/fragment_profile_editor_advanced.xml b/app/src/main/res/layout/fragment_profile_editor_advanced.xml
@@ -84,8 +84,8 @@
                 <EditText
                     android:id="@+id/host"
                     style="@style/FormField.EditText"
-                    android:drawableStart="@drawable/ic_computer"
-                    android:hint="@string/hint_host"
+                    android:drawableStart="@{viewModel.useRepeater ? @drawable/ic_swap :  @drawable/ic_computer}"
+                    android:hint="@{viewModel.useRepeater ? @string/hint_repeater_host : @string/hint_host}"
                     android:importantForAutofill="no"
                     android:inputType="textUri"
                     android:text="@={viewModel.profile.host}"
@@ -109,6 +109,29 @@
                     app:layout_constraintTop_toTopOf="@id/host"
                     app:layout_constraintWidth_percent=".2" />
 
+                <!--Repeater-->
+                <CheckBox
+                    android:id="@+id/use_repeater"
+                    style="@style/FormField.CheckBox"
+                    android:checked="@={viewModel.useRepeater}"
+                    android:text="@string/title_use_repeater"
+                    app:layout_constraintEnd_toStartOf="@id/id_on_repeater"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/host" />
+
+                <EditText
+                    android:id="@+id/id_on_repeater"
+                    style="@style/FormField.EditText"
+                    android:hint="@string/hint_server_id"
+                    android:importantForAutofill="no"
+                    android:inputType="number"
+                    android:minWidth="100dp"
+                    android:text="@={viewModel.idOnRepeater}"
+                    app:isVisible="@{viewModel.useRepeater}"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/use_repeater"
+                    app:layout_constraintTop_toBottomOf="@id/host" />
+
 
                 <!--View-only mode-->
                 <CheckBox
@@ -118,7 +141,7 @@
                     android:text="@string/title_view_only_mode"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/host" />
+                    app:layout_constraintTop_toBottomOf="@id/use_repeater" />
 
                 <!--Key Compatibility mode-->
                 <CheckBox