Skip to content

Commit

Permalink
Bugfix for not detecting certain META states from soft keyboards.
Browse files Browse the repository at this point in the history
  • Loading branch information
@iiordanov
iiordanov committed Mar 20, 2021
1 parent 78958ae commit b40938e
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CustomVnc-app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.iiordanov.CUSTOM_VNC_APP_PACKAGE_NAME"
android:installLocation="auto"
android:versionCode="115039" android:versionName="v5.0.3">
android:versionCode="115040" android:versionName="v5.0.4">

<uses-permission tools:node="removeAll"/>
<uses-permission android:name="android.permission.INTERNET"> </uses-permission>
Expand Down
2 changes: 1 addition & 1 deletion Opaque-app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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="115039" android:versionName="v5.0.3">
android:versionCode="115040" android:versionName="v5.0.4">

<uses-permission android:name="android.permission.INTERNET"></uses-permission>
<uses-permission android:name="android.permission.VIBRATE" />
Expand Down
2 changes: 1 addition & 1 deletion aRDP-app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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="115039" android:versionName="v5.0.3">
android:versionCode="115040" android:versionName="v5.0.4">

<uses-permission tools:node="removeAll"/>
<uses-permission android:name="android.permission.INTERNET"> </uses-permission>
Expand Down
2 changes: 1 addition & 1 deletion aSPICE-app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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="115039" android:versionName="v5.0.3">
android:versionCode="115040" android:versionName="v5.0.4">

<uses-permission tools:node="removeAll"/>
<uses-permission android:name="android.permission.INTERNET"> </uses-permission>
Expand Down
2 changes: 1 addition & 1 deletion bVNC-app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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="115039" android:versionName="v5.0.3">
android:versionCode="115040" android:versionName="v5.0.4">

<uses-permission tools:node="removeAll"/>
<uses-permission android:name="android.permission.INTERNET"> </uses-permission>
Expand Down
6 changes: 6 additions & 0 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@ allprojects {
google()
}
}

ext {
compileApi = properties.get('COMPILE_API', 30)
targetApi = properties.get('TARGET_API', 30)
minApi = properties.get('MIN_API', 21)
}
2 changes: 1 addition & 1 deletion freeaRDP-app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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="115039" android:versionName="v5.0.3">
android:versionCode="115040" android:versionName="v5.0.4">

<uses-permission tools:node="removeAll"/>
<uses-permission android:name="android.permission.INTERNET"> </uses-permission>
Expand Down
2 changes: 1 addition & 1 deletion freeaSPICE-app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.iiordanov.freeaSPICE" android:installLocation="auto"
android:versionCode="115039" android:versionName="v5.0.3">
android:versionCode="115040" android:versionName="v5.0.4">

<uses-permission tools:node="removeAll"/>
<uses-permission android:name="android.permission.INTERNET"> </uses-permission>
Expand Down
2 changes: 1 addition & 1 deletion freebVNC-app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.iiordanov.freebVNC" android:installLocation="auto"
android:versionCode="115039" android:versionName="v5.0.3">
android:versionCode="115040" android:versionName="v5.0.4">

<uses-permission tools:node="removeAll"/>
<uses-permission android:name="android.permission.INTERNET"> </uses-permission>
Expand Down
16 changes: 16 additions & 0 deletions remoteClientLib/src/main/java/com/undatech/opaque/input/RemoteKeyboard.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@ protected int convertEventMetaState (KeyEvent event, int eventMetaState) {
}

// Add shift, ctrl, alt, and super to metaState if necessary.
if ((eventMetaState & KeyEvent.META_SHIFT_ON) != 0) {
GeneralUtils.debugLog(debugLog, TAG, "convertEventMetaState: KeyEvent.META_SHIFT_ON");
metaState |= SHIFT_MASK;
}
if ((eventMetaState & KeyEvent.META_SHIFT_LEFT_ON) != 0) {
GeneralUtils.debugLog(debugLog, TAG, "convertEventMetaState: KeyEvent.META_SHIFT_LEFT_ON");
metaState |= SHIFT_MASK;
Expand All @@ -304,6 +308,10 @@ protected int convertEventMetaState (KeyEvent event, int eventMetaState) {
GeneralUtils.debugLog(debugLog, TAG, "convertEventMetaState: KeyEvent.META_SHIFT_RIGHT_ON");
metaState |= RSHIFT_MASK;
}
if ((eventMetaState & KeyEvent.META_CTRL_ON) != 0) {
GeneralUtils.debugLog(debugLog, TAG, "convertEventMetaState: KeyEvent.META_CTRL_ON");
metaState |= CTRL_MASK;
}
if ((eventMetaState & KeyEvent.META_CTRL_LEFT_ON) != 0) {
GeneralUtils.debugLog(debugLog, TAG, "convertEventMetaState: KeyEvent.META_CTRL_LEFT_ON");
metaState |= CTRL_MASK;
Expand All @@ -312,6 +320,10 @@ protected int convertEventMetaState (KeyEvent event, int eventMetaState) {
GeneralUtils.debugLog(debugLog, TAG, "convertEventMetaState: KeyEvent.META_CTRL_RIGHT_ON");
metaState |= RCTRL_MASK;
}
if ((eventMetaState & KeyEvent.META_ALT_ON) != 0) {
GeneralUtils.debugLog(debugLog, TAG, "convertEventMetaState: KeyEvent.META_ALT_ON");
metaState |= ALT_MASK;
}
if ((eventMetaState & leftAltMetaStateMask) !=0) {
GeneralUtils.debugLog(debugLog, TAG, "convertEventMetaState: KeyEvent.META_ALT_LEFT_ON");
metaState |= ALT_MASK;
Expand All @@ -320,6 +332,10 @@ protected int convertEventMetaState (KeyEvent event, int eventMetaState) {
GeneralUtils.debugLog(debugLog, TAG, "convertEventMetaState: KeyEvent.META_ALT_RIGHT_ON");
metaState |= RALT_MASK;
}
if ((eventMetaState & KeyEvent.META_META_ON) != 0) {
GeneralUtils.debugLog(debugLog, TAG, "convertEventMetaState: KeyEvent.META_META_ON");
metaState |= SUPER_MASK;
}
if ((eventMetaState & KeyEvent.META_META_LEFT_ON) != 0) {
GeneralUtils.debugLog(debugLog, TAG, "convertEventMetaState: KeyEvent.META_META_LEFT_ON");
metaState |= SUPER_MASK;
Expand Down

0 comments on commit b40938e

Please sign in to comment.