Implemented ability to specify custom resolution for Opaque.

iiordanov · iiordanov · commit aa5ed99527f1 · 2021-04-03T13:40:26.000-04:00
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="115043" android:versionName="v5.0.4">
+          android:versionCode="115044" android:versionName="v5.0.4">
 
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>
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="115043" android:versionName="v5.0.4">
+    android:versionCode="115044" android:versionName="v5.0.4">
 
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>
     <uses-permission android:name="android.permission.VIBRATE" />
diff --git a/aRDP-app/src/main/AndroidManifest.xml b/aRDP-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.iiordanov.aRDP" android:installLocation="auto"
-          android:versionCode="115043" android:versionName="v5.0.4">
+          android:versionCode="115044" android:versionName="v5.0.4">
 
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>
diff --git a/aSPICE-app/src/main/AndroidManifest.xml b/aSPICE-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.iiordanov.aSPICE" android:installLocation="auto"
-          android:versionCode="115043" android:versionName="v5.0.4">
+          android:versionCode="115044" android:versionName="v5.0.4">
 
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>
diff --git a/bVNC-app/src/main/AndroidManifest.xml b/bVNC-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.iiordanov.bVNC" android:installLocation="auto"
-          android:versionCode="115043" android:versionName="v5.0.4">
+          android:versionCode="115044" android:versionName="v5.0.4">
 
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>
diff --git a/bVNC/src/main/java/com/iiordanov/bVNC/RemoteCanvas.java b/bVNC/src/main/java/com/iiordanov/bVNC/RemoteCanvas.java
@@ -258,7 +258,8 @@ void init(final Connection settings, final Handler handler, final Runnable setMo
         checkNetworkConnectivity();
         initializeClipboardMonitor();
         spicecomm = new SpiceCommunicator(getContext(), handler, this,
-                settings.isRequestingNewDisplayResolution(), settings.isUsbEnabled(), App.debugLog);
+                settings.isRequestingNewDisplayResolution() || settings.getRdpResType() == Constants.RDP_GEOM_SELECT_CUSTOM,
+                settings.isUsbEnabled(), App.debugLog);
         rfbconn = spicecomm;
         pointer = new RemoteSpicePointer(spicecomm, this, handler);
         try {
@@ -460,6 +461,9 @@ private void handleUncaughtException(Throwable e) {
     @Override
     public int getDesiredWidth() {
         int w = getWidth();
+        if (connection.getRdpResType() == Constants.RDP_GEOM_SELECT_CUSTOM) {
+            w = connection.getRdpWidth();
+        }
         android.util.Log.d(TAG, "Width requested: " + w);
         return w;
     }
@@ -470,6 +474,9 @@ public int getDesiredWidth() {
     @Override
     public int getDesiredHeight() {
         int h = getHeight();
+        if (connection.getRdpResType() == Constants.RDP_GEOM_SELECT_CUSTOM) {
+            h = connection.getRdpHeight();
+        }
         android.util.Log.d(TAG, "Height requested: " + h);
         return h;
     }
diff --git a/bVNC/src/main/java/com/undatech/opaque/AdvancedSettingsActivity.java b/bVNC/src/main/java/com/undatech/opaque/AdvancedSettingsActivity.java
@@ -20,9 +20,11 @@
 package com.undatech.opaque;
 
 import java.io.IOException;
+import java.text.ParseException;
 import java.util.Arrays;
 import java.util.List;
 
+import com.iiordanov.bVNC.Constants;
 import com.iiordanov.util.PermissionsManager;
 import com.undatech.opaque.dialogs.ManageCustomCaFragment;
 
@@ -33,12 +35,15 @@
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -55,13 +60,18 @@ public class AdvancedSettingsActivity extends FragmentActivity implements Manage
     private ToggleButton toggleAudioPlayback;
     private ToggleButton toggleAutoRotation;
     private ToggleButton toggleAutoRequestDisplayResolution;
+    private ToggleButton toggleCustomDisplayResolution;
     private ToggleButton toggleSslStrict;
     private ToggleButton toggleUsbEnabled;
     private ToggleButton toggleUsingCustomOvirtCa;
     private Button buttonManageOvirtCa;
     private Spinner layoutMapSpinner;
     private LinearLayout layoutManageOvirtCa;
     private LinearLayout layoutToggleUsingCustomOvirtCa;
+    private LinearLayout layoutCustomRemoteResolution;
+    private LinearLayout layoutToggleCustomRemoteResolution;
+    private EditText rdpWidth;
+    private EditText rdpHeight;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -79,10 +89,13 @@ public void onCreate(Bundle icicle) {
         
         toggleAutoRotation = (ToggleButton)findViewById(R.id.toggleAutoRotation);
         toggleAutoRotation.setChecked(currentConnection.isRotationEnabled());
-        
+
         toggleAutoRequestDisplayResolution = (ToggleButton)findViewById(R.id.toggleAutoRequestDisplayResolution);
         toggleAutoRequestDisplayResolution.setChecked(currentConnection.isRequestingNewDisplayResolution());
 
+        toggleCustomDisplayResolution = (ToggleButton)findViewById(R.id.toggleCustomDisplayResolution);
+        toggleCustomDisplayResolution.setChecked(currentConnection.getRdpResType() == Constants.RDP_GEOM_SELECT_CUSTOM);
+
         toggleSslStrict = (ToggleButton)findViewById(R.id.toggleSslStrict);
         toggleSslStrict.setChecked(currentConnection.isSslStrict());
 
@@ -119,7 +132,64 @@ public void onItemSelected(AdapterView<?> parent, View view,
             @Override
             public void onNothingSelected(AdapterView<?> parent) { }
         });
-        
+
+        layoutToggleCustomRemoteResolution = (LinearLayout)findViewById(R.id.layoutToggleCustomRemoteResolution);
+        layoutCustomRemoteResolution = findViewById(R.id.layoutCustomRemoteResolution);
+
+        if (toggleCustomDisplayResolution.isChecked()) {
+            layoutCustomRemoteResolution.setVisibility(View.VISIBLE);
+        } else {
+            layoutCustomRemoteResolution.setVisibility(View.GONE);
+        }
+
+        if (!toggleAutoRequestDisplayResolution.isChecked()) {
+            layoutToggleCustomRemoteResolution.setVisibility(View.VISIBLE);
+        } else {
+            layoutToggleCustomRemoteResolution.setVisibility(View.GONE);
+            layoutCustomRemoteResolution.setVisibility(View.GONE);
+        }
+
+        rdpWidth = findViewById(R.id.rdpWidth);
+        rdpWidth.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {}
+            @Override
+            public void afterTextChanged(Editable s) {
+                int res = 0;
+                if (!s.toString().isEmpty()) {
+                    try {
+                        res = Integer.parseInt(s.toString());
+                    } catch (NumberFormatException e) {
+                        res = currentConnection.getRdpWidth();
+                    }
+                }
+                currentConnection.setRdpWidth(res);
+            }
+        });
+        rdpWidth.setText(Integer.toString(currentConnection.getRdpWidth()));
+        rdpHeight = findViewById(R.id.rdpHeight);
+        rdpHeight.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {}
+            @Override
+            public void afterTextChanged(Editable s) {
+                int res = 0;
+                if (!s.toString().isEmpty()) {
+                    try {
+                        res = Integer.parseInt(s.toString());
+                    } catch (NumberFormatException e) {
+                        res = currentConnection.getRdpHeight();
+                    }
+                }
+                currentConnection.setRdpHeight(res);
+            }
+        });
+        rdpHeight.setText(Integer.toString(currentConnection.getRdpHeight()));
+
         // Send the generated data back to the calling activity.
         Intent databackIntent = new Intent();
         databackIntent.putExtra("com.undatech.opaque.ConnectionSettings", currentConnection);
@@ -163,9 +233,36 @@ public void toggleAutoRotation (View view) {
      */
     public void toggleAutoRequestDisplayResolution (View view) {
         ToggleButton s = (ToggleButton) view;
-        currentConnection.setRequestingNewDisplayResolution(s.isChecked());
-    }    
-    
+        boolean autoDisplayResolution = s.isChecked();
+        currentConnection.setRequestingNewDisplayResolution(autoDisplayResolution);
+        if (autoDisplayResolution) {
+            layoutToggleCustomRemoteResolution.setVisibility(View.GONE);
+            layoutCustomRemoteResolution.setVisibility(View.GONE);
+        } else {
+            layoutToggleCustomRemoteResolution.setVisibility(View.VISIBLE);
+            layoutCustomRemoteResolution.setVisibility(View.VISIBLE);
+        }
+    }
+
+    /**
+     * Automatically linked with android:onClick to the toggleRotation button.
+     * @param view
+     */
+    public void toggleCustomDisplayResolution (View view) {
+        ToggleButton s = (ToggleButton) view;
+        boolean customDisplayResolution = s.isChecked();
+        int resType = 0;
+        if (customDisplayResolution) {
+            resType = Constants.RDP_GEOM_SELECT_CUSTOM;
+        }
+        currentConnection.setRdpResType(resType);
+        if (customDisplayResolution) {
+            layoutCustomRemoteResolution.setVisibility(View.VISIBLE);
+        } else {
+            layoutCustomRemoteResolution.setVisibility(View.GONE);
+        }
+    }
+
     /**
      * Automatically linked with android:onClick to the toggleSslStrict button.
      * @param view
diff --git a/bVNC/src/main/java/com/undatech/opaque/ConnectionSettings.java b/bVNC/src/main/java/com/undatech/opaque/ConnectionSettings.java
@@ -28,6 +28,8 @@
 import android.util.Log;
 import android.widget.ImageView;
 
+import com.iiordanov.bVNC.Constants;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -72,7 +74,11 @@ public class ConnectionSettings implements Connection, Serializable {
     private String x509KeySignature = "";
 
     private int extraKeysToggleType = RemoteClientLibConstants.EXTRA_KEYS_ON;
-    
+
+    private int rdpWidth = 0;
+    private int rdpHeight = 0;
+    private int rdpResType = Constants.RDP_GEOM_SELECT_CUSTOM;
+
     public ConnectionSettings(String filename) {
         super();
         this.filename = filename;
@@ -365,6 +371,8 @@ public void saveToSharedPreferences(Context context) {
         editor.putString("scaleMode", scaleMode);
         editor.putString("x509KeySignature", x509KeySignature);
         editor.putString("screenshotFilename", screenshotFilename);
+        editor.putInt("rdpWidth", rdpWidth);
+        editor.putInt("rdpHeight", rdpHeight);
         editor.apply();
         // Make sure the CA gets saved to a file if necessary.
         ovirtCaFile = saveCaToFile (context, ovirtCaData);
@@ -416,12 +424,12 @@ public void setScaleMode(ImageView.ScaleType value) {
 
     @Override
     public int getRdpResType() {
-        return 0;
+        return rdpResType;
     }
 
     @Override
     public void setRdpResType(int rdpResType) {
-
+        this.rdpResType = rdpResType;
     }
 
     @Override
@@ -560,6 +568,8 @@ public void loadAdvancedSettings (Context context, String file) {
         ovirtCaData = sp.getString("ovirtCaData", "").trim();
         layoutMap = sp.getString("layoutMap", RemoteClientLibConstants.DEFAULT_LAYOUT_MAP).trim();
         scaleMode = sp.getString("scaleMode", ImageView.ScaleType.MATRIX.toString()).trim();
+        rdpWidth = sp.getInt("rdpWidth", 0);
+        rdpHeight = sp.getInt("rdpHeight", 0);
         // Make sure the CAs get saved to files if necessary.
         ovirtCaFile = saveCaToFile (context, ovirtCaData);
     }
@@ -656,22 +666,22 @@ public void setRdpDomain(String rdpDomain) {
 
     @Override
     public int getRdpWidth() {
-        return 0;
+        return rdpWidth;
     }
 
     @Override
     public void setRdpWidth(int rdpWidth) {
-
+        this.rdpWidth = rdpWidth;
     }
 
     @Override
     public int getRdpHeight() {
-        return 0;
+        return rdpHeight;
     }
 
     @Override
     public void setRdpHeight(int rdpHeight) {
-
+        this.rdpHeight = rdpHeight;
     }
 
     @Override
diff --git a/bVNC/src/main/res/layout/advanced_settings_activity.xml b/bVNC/src/main/res/layout/advanced_settings_activity.xml
@@ -115,6 +115,60 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/layoutToggleCustomRemoteResolution"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="10dip">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="4"
+                android:text="@string/resolution_custom"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
+            <ToggleButton
+                android:id="@+id/toggleCustomDisplayResolution"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:onClick="toggleCustomDisplayResolution" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/layoutCustomRemoteResolution"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="5dp"
+                android:visibility="gone">
+
+                <EditText
+                    android:id="@+id/rdpWidth"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.3"
+                    android:singleLine="true"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="x"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
+
+                <EditText
+                    android:id="@+id/rdpHeight"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.3"
+                    android:singleLine="true"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
+            </LinearLayout>
+
             <LinearLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
diff --git a/freeaRDP-app/src/main/AndroidManifest.xml b/freeaRDP-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.iiordanov.freeaRDP" android:installLocation="auto"
-          android:versionCode="115043" android:versionName="v5.0.4">
+          android:versionCode="115044" android:versionName="v5.0.4">
 
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>
diff --git a/freeaSPICE-app/src/main/AndroidManifest.xml b/freeaSPICE-app/src/main/AndroidManifest.xml
diff --git a/freebVNC-app/src/main/AndroidManifest.xml b/freebVNC-app/src/main/AndroidManifest.xml
