aRDP - Fix for ipv6 addresses not to require enclosing square brackets

iiordanov · iiordanov · commit 2bc4798d1bb0 · 2022-08-14T00:25:33.000-04:00
Build 115109.
diff --git a/CustomVnc-app/src/main/AndroidManifest.xml b/CustomVnc-app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.CUSTOM_VNC_APP_PACKAGE_NAME"
     android:installLocation="auto"
-    android:versionCode="115108"
+    android:versionCode="115109"
     android:versionName="v5.1.0">
 
     <uses-permission tools:node="removeAll" />
diff --git a/Opaque-app/src/main/AndroidManifest.xml b/Opaque-app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.undatech.opaque"
-    android:versionCode="115108"
+    android:versionCode="115109"
     android:versionName="v5.1.0">
 
     <uses-feature
diff --git a/aRDP-app/src/main/AndroidManifest.xml b/aRDP-app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.aRDP"
     android:installLocation="auto"
-    android:versionCode="115108"
+    android:versionCode="115109"
     android:versionName="v5.1.0">
 
     <uses-permission tools:node="removeAll" />
diff --git a/aSPICE-app/src/main/AndroidManifest.xml b/aSPICE-app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.aSPICE"
     android:installLocation="auto"
-    android:versionCode="115108"
+    android:versionCode="115109"
     android:versionName="v5.1.0">
 
     <uses-feature
diff --git a/bVNC-app/src/main/AndroidManifest.xml b/bVNC-app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.bVNC"
     android:installLocation="auto"
-    android:versionCode="115108"
+    android:versionCode="115109"
     android:versionName="v5.1.0">
 
     <uses-permission tools:node="removeAll" />
diff --git a/bVNC/CHANGELOG-aRDP b/bVNC/CHANGELOG-aRDP
@@ -7,6 +7,7 @@ v5.1.0
 - Support for app resizing
 - Fix for drag&drop bug in Direct Drag Pan Mode
 - Improvement to Direct Drag Pan Mode in Fit-To-Screen mode
+- Fix for ipv6 addresses not to require enclosing square brackets
 v5.0.9
 - Android localization: Updated translatations for ko, ja, zh-rCN, and zh-rTW
 - Removed Import/Export Button from Connection Setup Layout
diff --git a/freeaRDP-app/src/main/AndroidManifest.xml b/freeaRDP-app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.freeaRDP"
     android:installLocation="auto"
-    android:versionCode="115108"
+    android:versionCode="115109"
     android:versionName="v5.1.0">
 
     <uses-permission tools:node="removeAll" />
diff --git a/freeaSPICE-app/src/main/AndroidManifest.xml b/freeaSPICE-app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.freeaSPICE"
     android:installLocation="auto"
-    android:versionCode="115108"
+    android:versionCode="115109"
     android:versionName="v5.1.0">
 
     <uses-permission tools:node="removeAll" />
diff --git a/freebVNC-app/src/main/AndroidManifest.xml b/freebVNC-app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.freebVNC"
     android:installLocation="auto"
-    android:versionCode="115108"
+    android:versionCode="115109"
     android:versionName="v5.1.0">
 
     <uses-permission tools:node="removeAll" />
diff --git a/remoteClientLib/build.gradle b/remoteClientLib/build.gradle
@@ -67,5 +67,6 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'org.apache.httpcomponents:httpcore:4.4.10'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation group: 'commons-validator', name: 'commons-validator', version: '1.7'
 }
 
diff --git a/remoteClientLib/src/main/java/com/undatech/opaque/RdpCommunicator.java b/remoteClientLib/src/main/java/com/undatech/opaque/RdpCommunicator.java
@@ -12,12 +12,13 @@
 import com.freerdp.freerdpcore.domain.BookmarkBase;
 import com.freerdp.freerdpcore.domain.ManualBookmark;
 import com.freerdp.freerdpcore.services.LibFreeRDP;
-import com.undatech.opaque.input.RemoteKeyboard;
 import com.undatech.opaque.input.RdpKeyboardMapper;
-import com.undatech.opaque.input.RemoteKeyboardState;
+import com.undatech.opaque.input.RemoteKeyboard;
 import com.undatech.opaque.input.RemotePointer;
 import com.undatech.opaque.util.GeneralUtils;
 
+import org.apache.commons.validator.routines.InetAddressValidator;
+
 import java.lang.reflect.Field;
 import java.util.Collections;
 import java.util.HashMap;
@@ -296,7 +297,7 @@ public void setConnectionParameters(String address, int rdpPort, String nickname
         //LibFreeRDP.setDataDirectory(session.getInstance(), getContext().getFilesDir().toString());
         // Get the address and port (based on whether an SSH tunnel is being established or not).
         bookmark.<ManualBookmark>get().setLabel(nickname);
-        bookmark.<ManualBookmark>get().setHostname(address);
+        bookmark.<ManualBookmark>get().setHostname(addBracketsToIpv6Address(address));
         bookmark.<ManualBookmark>get().setPort(rdpPort);
 
         BookmarkBase.DebugSettings debugSettings = bookmark.getDebugSettings();
@@ -331,6 +332,19 @@ public void setConnectionParameters(String address, int rdpPort, String nickname
         advancedSettings.setSecurity(0); // Automatic negotiation
     }
 
+    /**
+     * Adds brackets around a valid IPv6 address that does not already start with [.
+     * @param address
+     * @return
+     */
+    private String addBracketsToIpv6Address(String address) {
+        InetAddressValidator validator = InetAddressValidator.getInstance();
+        if (validator.isValidInet6Address(address) && !address.startsWith("[")) {
+            address = "[" + address + "]";
+        }
+        return address;
+    }
+
     public void connect() {
         session.connect(context);
     }

Original file line number	Diff line number	Diff line change
`@@ -67,5 +67,6 @@ dependencies {`
`67`	`67`	`implementation 'com.android.support:appcompat-v7:28.0.0'`
`68`	`68`	`implementation 'org.apache.httpcomponents:httpcore:4.4.10'`
`69`	`69`	`implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"`
	`70`	`+ implementation group: 'commons-validator', name: 'commons-validator', version: '1.7'`
`70`	`71`	`}`
`71`	`72`