Android: add specifying port number for SSH

Closes #220

Author: bk138

android/app/src/main/cpp/vncconn.c

@@ -468,6 +468,7 @@ JNIEXPORT jboolean JNICALL Java_com_coboltforge_dontmind_multivnc_VNCConn_rfbIni
                                                                                   jint compressLevel,
                                                                                   jint qualityLevel,
                                                                                   jstring ssh_host,
+                                                                                  jint ssh_port,
                                                                                   jstring ssh_user,
                                                                                   jstring ssh_password,
                                                                                   jbyteArray ssh_priv_key,
@@ -507,10 +508,10 @@ JNIEXPORT jboolean JNICALL Java_com_coboltforge_dontmind_multivnc_VNCConn_rfbIni
         // ssh-tunneling, check whether it's password- or key-based
         if(cSshPassword) {
             // password-based
-            tunnel = ssh_tunnel_open_with_password(cSshHost, 22, cSshUser, cSshPassword, cHost, port, cl, onSshFingerprintCheck, onSshError);
+            tunnel = ssh_tunnel_open_with_password(cSshHost, ssh_port, cSshUser, cSshPassword, cHost, port, cl, onSshFingerprintCheck, onSshError);
         } else {
             // key-based
-            tunnel = ssh_tunnel_open_with_privkey(cSshHost, 22, cSshUser, (char*)cSshPrivKey, cSshPrivKeyLen, cSshPrivKeyPassword, cHost, port, cl, onSshFingerprintCheck, onSshError);
+            tunnel = ssh_tunnel_open_with_privkey(cSshHost, ssh_port, cSshUser, (char*)cSshPrivKey, cSshPrivKeyLen, cSshPrivKeyPassword, cHost, port, cl, onSshFingerprintCheck, onSshError);
         }
 
         cl->serverHost = strdup("127.0.0.1");

android/app/src/main/java/com/coboltforge/dontmind/multivnc/VNCConn.java

@@ -223,6 +223,7 @@ public void run() {
 						COMPRESSMODEL.valueOf(connSettings.compressModel).toParameter(),
 						QUALITYMODEL.valueOf(connSettings.qualityModel).toParameter(),     
 						connSettings.sshHost,
+				        connSettings.sshPort != null ? connSettings.sshPort : 22,
 						connSettings.sshUsername,
 						connSettings.sshPassword,
 						connSettings.sshPrivkey,
@@ -400,6 +401,7 @@ private boolean sendCutText(String text) {
 	private native boolean rfbInit(String host, int port, int repeaterId, int bytesPerPixel,
                    String encodingsString, boolean hasCompress, boolean enableJPEG, int compressLevel, int qualityLevel,
 								   String ssh_host,
+								   int ssh_port,
 								   String ssh_user,
 								   String ssh_password,
 								   byte[] ssh_priv_key,

android/app/src/main/java/com/coboltforge/dontmind/multivnc/db/ConnectionBean.kt

@@ -115,6 +115,10 @@ data class ConnectionBean(
         @ColumnInfo(name = "SSH_HOST")
         var sshHost: String? = null,
 
+    @JvmField
+        @ColumnInfo(name = "SSH_PORT")
+        var sshPort: Int? = 22,
+
     @JvmField
         @ColumnInfo(name = "SSH_USERNAME")
         var sshUsername: String? = null,

android/app/src/main/java/com/coboltforge/dontmind/multivnc/db/VncDatabase.java

@@ -19,7 +19,7 @@
 @Database(entities = {ConnectionBean.class, MetaKeyBean.class, MetaList.class, SshKnownHost.class}, version = VncDatabase.VERSION, exportSchema = false)
 public abstract class VncDatabase extends RoomDatabase {
 
-    public static final int VERSION = 14;
+    public static final int VERSION = 15;
     public static final String NAME = "VncDatabase";
 
     public abstract MetaListDao getMetaListDao();
@@ -39,6 +39,7 @@ public static VncDatabase getInstance(Context context) {
                     .allowMainThreadQueries()
                     .addMigrations(MIGRATION_12_13)
                     .addMigrations(MIGRATION_13_14)
+                    .addMigrations(MIGRATION_14_15)
                     .build();
 
             setupDefaultMetaList(instance);
@@ -153,4 +154,16 @@ public void migrate(@NonNull SupportSQLiteDatabase database) {
                              ")");
         }
     };
+
+    // this adds an SSH_PORT column to CONNECTION_BEAN table
+    private static final Migration MIGRATION_14_15 = new Migration(14, 15) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            Log.i("VncDatabase", "Migrating to Room [14 -> 15]");
+
+            // add new SSH_PORT column to CONNECTION_BEAN, nullable as we don't want pre-v15
+            // entries to show any value
+            database.execSQL("ALTER TABLE CONNECTION_BEAN ADD SSH_PORT INTEGER");
+        }
+    };
 }

android/app/src/main/java/com/coboltforge/dontmind/multivnc/ui/ConnectionEditFragment.java

@@ -60,6 +60,7 @@ public class ConnectionEditFragment extends Fragment {
     private EditText textUsername;
     private SwitchMaterial sshSwitch;
     private EditText sshHostText;
+    private EditText sshPortText;
     private EditText sshUsernameText;
     private RadioGroup sshCredentialsRadioGroup;
     private EditText sshPasswordText;
@@ -147,6 +148,7 @@ public void onClick(View v) {
         repeaterText = (TextView)view.findViewById(R.id.textRepeaterId);
 
         sshHostText = view.findViewById(R.id.ssh_host_input);
+        sshPortText = view.findViewById(R.id.ssh_port_input);
         sshUsernameText = view.findViewById(R.id.ssh_username_input);
         sshPasswordText = view.findViewById(R.id.ssh_password_input);
         sshPrivkeyImportButton = view.findViewById(R.id.ssh_privkey_import_button);
@@ -158,6 +160,7 @@ public void onClick(View v) {
             // and clear contents if disabled again
             if(!isChecked) {
                 sshHostText.setText("");
+                sshPortText.setText("");
                 sshUsernameText.setText("");
                 sshPasswordText.setText("");
                 sshPrivkeyPasswordText.setText("");
@@ -274,6 +277,11 @@ public ConnectionBean getConnection() {
         conn.sshHost = sshHostText.getText().toString().trim();
         if(conn.sshHost.isEmpty())
             conn.sshHost = null;
+        try {
+            conn.sshPort = Integer.parseInt(sshPortText.getText().toString().trim());
+        }
+        catch (NumberFormatException ignored) {
+        }
         conn.sshUsername = sshUsernameText.getText().toString().trim();
         if(conn.sshUsername.isEmpty())
             conn.sshUsername = null;
@@ -348,6 +356,8 @@ private void updateViews(View view, ConnectionBean conn) {
 
         sshSwitch.setChecked(conn.sshHost != null);
         sshHostText.setText(conn.sshHost);
+        if (conn.sshPort != null)
+            sshPortText.setText(Integer.toString(conn.sshPort));
         sshUsernameText.setText(conn.sshUsername);
         if(conn.sshPrivkey != null) {
             sshCredentialsRadioGroup.check(R.id.ssh_privkey_radiobutton);

android/app/src/main/res/layout/connection_edit_fragment.xml

@@ -231,6 +231,16 @@
                 android:hint="@string/ssh_host_hint"
                 android:singleLine="true" />
 
+
+            <EditText
+                android:id="@+id/ssh_port_input"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:hint="@string/ssh_port_hint"
+                android:inputType="number"
+                android:singleLine="true" />
+
             <EditText
                 android:id="@+id/ssh_username_input"
                 android:layout_width="fill_parent"

android/app/src/main/res/values-ca/strings.xml

@@ -44,6 +44,7 @@
 <string name="repeater_hint">Identificació del servidor quan es connecta a un repetidor UltraVNC</string>
     <string name="ssh_caption">Túneles SSH</string>
     <string name="ssh_host_hint">Servidor SSH</string>
+    <string name="ssh_port_hint">Port SSH</string>
     <string name="ssh_username_hint">Nom d\'usuari SSH</string>
     <string name="ssh_password">Contrasenya</string>
     <string name="ssh_privkey">Clau privada</string>

android/app/src/main/res/values-de/strings.xml

@@ -42,6 +42,7 @@
 <string name="repeater_hint">"Server-ID bei Verbindung zu einem UltraVNC-Repeater"</string>
     <string name="ssh_caption">SSH-Tunnel</string>
     <string name="ssh_host_hint">SSH-Server</string>
+    <string name="ssh_port_hint">SSH-Port</string>
     <string name="ssh_username_hint">SSH-Username</string>
     <string name="ssh_password">Passwort</string>
     <string name="ssh_privkey">Privater Schlüssel</string>

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

@@ -44,6 +44,7 @@
 <string name="repeater_hint">Identificación del servidor cuando se conecta a un repetidor UltraVNC</string>
     <string name="ssh_caption">Tunelización SSH</string>
     <string name="ssh_host_hint">Servidor SSH</string>
+    <string name="ssh_port_hint">Puerto SSH</string>
     <string name="ssh_username_hint">Nombre de usuario SSH</string>
     <string name="ssh_password">Clave</string>
     <string name="ssh_privkey">Llave privada</string>

android/app/src/main/res/values-gl/strings.xml

@@ -44,6 +44,7 @@
 <string name="repeater_hint">Identificación do servidor cando se conecta a un repetidor UltraVNC</string>
     <string name="ssh_caption">Túneles SSH</string>
     <string name="ssh_host_hint">Servidor SSH</string>
+    <string name="ssh_port_hint">Porto SSH</string>
     <string name="ssh_username_hint">Nome de usuario SSH</string>
     <string name="ssh_password">Contrasinal</string>
     <string name="ssh_privkey">Chave privada</string>