From df1d27da6eea6014e77cc4c54fd3b10b72289e03 Mon Sep 17 00:00:00 2001
From: Yonle <yonle@protonmail.com>
Date: Fri, 27 Aug 2021 09:05:56 +0000
Subject: [PATCH 1/3] Change package name

---
 app/src/main/AndroidManifest.xml                       |  4 ++--
 app/src/main/aidl/com/termux/x11/ITermuxService.aidl   |  2 +-
 .../java/com/termux/x11/AdditionalKeyboardView.java    |  2 +-
 app/src/main/java/com/termux/x11/KeyboardUtils.java    |  2 +-
 app/src/main/java/com/termux/x11/LoriePreferences.java |  4 ++--
 app/src/main/java/com/termux/x11/LorieService.java     | 10 +++++-----
 app/src/main/java/com/termux/x11/LorieTestService.java |  2 +-
 app/src/main/java/com/termux/x11/MainActivity.java     |  2 +-
 app/src/main/java/com/termux/x11/TouchParser.java      |  2 +-
 app/src/main/jni/lorie/backend/android/android-app.cpp |  2 +-
 app/src/main/res/layout/main_activity.xml              |  2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9d34d3847..49fd0998e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.termux.x11"
+    package="com.termux.wayland"
     android:installLocation="internalOnly"
     android:sharedUserId="com.termux">
 
@@ -27,7 +27,7 @@
             android:name=".LorieTestService"
             android:enabled="true"
             android:exported="true"
-            android:process="com.termux.x11.separated"/>
+            android:process="com.termux.wayland.separated"/>
         <activity android:name=".MainActivity"
             android:theme="@style/NoActionBar"
             android:launchMode="singleInstance"
diff --git a/app/src/main/aidl/com/termux/x11/ITermuxService.aidl b/app/src/main/aidl/com/termux/x11/ITermuxService.aidl
index dc2aaf876..3a31fae5e 100644
--- a/app/src/main/aidl/com/termux/x11/ITermuxService.aidl
+++ b/app/src/main/aidl/com/termux/x11/ITermuxService.aidl
@@ -1,5 +1,5 @@
 // ITermuxService.aidl
-package com.termux.x11;
+package com.termux.wayland;
 
 import android.view.Surface;
 
diff --git a/app/src/main/java/com/termux/x11/AdditionalKeyboardView.java b/app/src/main/java/com/termux/x11/AdditionalKeyboardView.java
index 5436afa54..31518f7da 100644
--- a/app/src/main/java/com/termux/x11/AdditionalKeyboardView.java
+++ b/app/src/main/java/com/termux/x11/AdditionalKeyboardView.java
@@ -1,4 +1,4 @@
-package com.termux.x11;
+package com.termux.wayland;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/app/src/main/java/com/termux/x11/KeyboardUtils.java b/app/src/main/java/com/termux/x11/KeyboardUtils.java
index 6eb9d6f92..3fd14358f 100644
--- a/app/src/main/java/com/termux/x11/KeyboardUtils.java
+++ b/app/src/main/java/com/termux/x11/KeyboardUtils.java
@@ -1,4 +1,4 @@
-package com.termux.x11;
+package com.termux.wayland;
 
 import android.app.Activity;
 import android.graphics.Rect;
diff --git a/app/src/main/java/com/termux/x11/LoriePreferences.java b/app/src/main/java/com/termux/x11/LoriePreferences.java
index fe58d6d02..3dbf354ed 100644
--- a/app/src/main/java/com/termux/x11/LoriePreferences.java
+++ b/app/src/main/java/com/termux/x11/LoriePreferences.java
@@ -1,4 +1,4 @@
-package com.termux.x11;
+package com.termux.wayland;
 
 import android.content.SharedPreferences;
 import android.inputmethodservice.Keyboard;
@@ -105,7 +105,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                                 .setTitle("Permission denied")
                                 .setMessage("Android requires WRITE_SECURE_SETTINGS permission to change this setting.\n" +
                                             "Please, launch this command using ADB:\n" +
-                                            "adb shell pm grant com.termux.x11 android.permission.WRITE_SECURE_SETTINGS")
+                                            "adb shell pm grant com.termux.wayland android.permission.WRITE_SECURE_SETTINGS")
                                 .setNegativeButton("OK", null)
                                 .create()
                                 .show();
diff --git a/app/src/main/java/com/termux/x11/LorieService.java b/app/src/main/java/com/termux/x11/LorieService.java
index 4e5aaae18..96415ad15 100644
--- a/app/src/main/java/com/termux/x11/LorieService.java
+++ b/app/src/main/java/com/termux/x11/LorieService.java
@@ -1,4 +1,4 @@
-package com.termux.x11;
+package com.termux.wayland;
 
 import android.annotation.SuppressLint;
 import android.app.ActivityManager;
@@ -37,10 +37,10 @@
 @SuppressLint({"ClickableViewAccessibility", "StaticFieldLeak"})
 public class LorieService extends Service {
 
-    static final String ACTION_STOP_SERVICE = "com.termux.x11.service_stop";
-    static final String ACTION_START_FROM_ACTIVITY = "com.termux.x11.start_from_activity";
-    static final String ACTION_START_PREFERENCES_ACTIVITY = "com.termux.x11.start_preferences_activity";
-    static final String ACTION_PREFERENCES_CHAGED = "com.termux.x11.preferences_changed";
+    static final String ACTION_STOP_SERVICE = "com.termux.wayland.service_stop";
+    static final String ACTION_START_FROM_ACTIVITY = "com.termux.wayland.start_from_activity";
+    static final String ACTION_START_PREFERENCES_ACTIVITY = "com.termux.wayland.start_preferences_activity";
+    static final String ACTION_PREFERENCES_CHAGED = "com.termux.wayland.preferences_changed";
 
     private static LorieService instance = null;
     //private
diff --git a/app/src/main/java/com/termux/x11/LorieTestService.java b/app/src/main/java/com/termux/x11/LorieTestService.java
index b7d63f9d0..5f1642533 100644
--- a/app/src/main/java/com/termux/x11/LorieTestService.java
+++ b/app/src/main/java/com/termux/x11/LorieTestService.java
@@ -1,4 +1,4 @@
-package com.termux.x11;
+package com.termux.wayland;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
diff --git a/app/src/main/java/com/termux/x11/MainActivity.java b/app/src/main/java/com/termux/x11/MainActivity.java
index d51843468..aa5173abf 100644
--- a/app/src/main/java/com/termux/x11/MainActivity.java
+++ b/app/src/main/java/com/termux/x11/MainActivity.java
@@ -1,4 +1,4 @@
-package com.termux.x11;
+package com.termux.wayland;
 
 import android.app.Activity;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/com/termux/x11/TouchParser.java b/app/src/main/java/com/termux/x11/TouchParser.java
index 00fdaf448..245265e7b 100644
--- a/app/src/main/java/com/termux/x11/TouchParser.java
+++ b/app/src/main/java/com/termux/x11/TouchParser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.termux.x11;
+package com.termux.wayland;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/app/src/main/jni/lorie/backend/android/android-app.cpp b/app/src/main/jni/lorie/backend/android/android-app.cpp
index 1d5d3a662..be9e2d732 100644
--- a/app/src/main/jni/lorie/backend/android/android-app.cpp
+++ b/app/src/main/jni/lorie/backend/android/android-app.cpp
@@ -166,7 +166,7 @@ void LorieBackendAndroid::layout_change_callback(char *layout) {
 #define JNI_DECLARE_INNER(package, classname, methodname ) \
      Java_ ## package ## _ ## classname  ## _ ## methodname
 #define JNI_DECLARE(classname, methodname) \
-     JNI_DECLARE_INNER(com_termux_x11, classname, methodname)
+     JNI_DECLARE_INNER(com.termux.wayland, classname, methodname)
 
 #define WL_POINTER_MOTION 2
 
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 029994187..2986d870d 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -15,7 +15,7 @@
 
     </FrameLayout>
 
-    <com.termux.x11.AdditionalKeyboardView
+    <com.termux.wayland.AdditionalKeyboardView
         android:id="@+id/additionalKbd"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

From 20c02d4f7d49d9288201a2f7106cb01d8d8747ae Mon Sep 17 00:00:00 2001
From: Yonle <yonle@protonmail.com>
Date: Fri, 27 Aug 2021 09:14:52 +0000
Subject: [PATCH 2/3] Change package name

---
 app/src/main/aidl/com/termux/{x11 => wayland}/ITermuxService.aidl | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/src/main/aidl/com/termux/{x11 => wayland}/ITermuxService.aidl (100%)

diff --git a/app/src/main/aidl/com/termux/x11/ITermuxService.aidl b/app/src/main/aidl/com/termux/wayland/ITermuxService.aidl
similarity index 100%
rename from app/src/main/aidl/com/termux/x11/ITermuxService.aidl
rename to app/src/main/aidl/com/termux/wayland/ITermuxService.aidl

From 9cb350783181f8e207492372e162a7bce0721260 Mon Sep 17 00:00:00 2001
From: Yonle <yonle@protonmail.com>
Date: Fri, 27 Aug 2021 09:55:33 +0000
Subject: [PATCH 3/3] Change package name as com.termux.wayland

---
 app/build.gradle                                       | 2 +-
 app/src/main/jni/lorie/backend/android/android-app.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 276eb689f..c123450fe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 28
     defaultConfig {
-        applicationId "com.termux.x11"
+        applicationId "com.termux.wayland"
         minSdkVersion 24
         targetSdkVersion 28
         versionCode 7
diff --git a/app/src/main/jni/lorie/backend/android/android-app.cpp b/app/src/main/jni/lorie/backend/android/android-app.cpp
index be9e2d732..bd03c0070 100644
--- a/app/src/main/jni/lorie/backend/android/android-app.cpp
+++ b/app/src/main/jni/lorie/backend/android/android-app.cpp
@@ -166,7 +166,7 @@ void LorieBackendAndroid::layout_change_callback(char *layout) {
 #define JNI_DECLARE_INNER(package, classname, methodname ) \
      Java_ ## package ## _ ## classname  ## _ ## methodname
 #define JNI_DECLARE(classname, methodname) \
-     JNI_DECLARE_INNER(com.termux.wayland, classname, methodname)
+     JNI_DECLARE_INNER(com_termux_wayland, classname, methodname)
 
 #define WL_POINTER_MOTION 2