diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c351166bac..2cd24756d1 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -67,7 +67,7 @@
         android:theme="@style/Theme.AndroidIDE"
         android:usesCleartextTraffic="true"
         tools:ignore="DiscouragedApi,MediaCapabilities,UnusedAttribute"
-        tools:replace="android:icon,android:name,android:allowBackup, android:supportsRtl, android:theme">
+        tools:replace="android:supportsRtl,android:theme">
         <activity
             android:name=".activities.CrashHandlerActivity"
             android:exported="true"
diff --git a/resources/src/main/res/values-ar-rSA/strings.xml b/resources/src/main/res/values-ar-rSA/strings.xml
index b7fa427192..36ed509f2f 100644
--- a/resources/src/main/res/values-ar-rSA/strings.xml
+++ b/resources/src/main/res/values-ar-rSA/strings.xml
@@ -242,7 +242,6 @@
   <string name="idepref_buildnrun_summary">تكوين بناء Gradle.</string>
   <string name="configure">تهيئة</string>
   <string name="about">عن التطبيق</string>
-  <string name="idepref_github_summary">Code on the Go مفتوح المصدر!</string>
   <string name="idepref_channel_summary">اشترك للحصول على أحدث تحديثات.</string>
   <string name="idepref_group_summary">مناقشة الميزات، الأخطاء والتحسينات هنا.</string>
   <string name="idepref_changelog_summary">ما الجديد في هذا الإصدار؟ </string>
@@ -340,12 +339,6 @@
   <string name="msg_tasks_to_run">سيتم تشغيل المهام التالية، بالترتيب. انقر فوق الزر \'تشغيل\' مرة أخرى للتأكيد.\n\n%1$s</string>
   <string name="msg_loading_tasks">جارٍ تحميل المهام...</string>
   <!-- GIT -->
-  <string name="git_clone">نسخ</string>
-  <string name="git_clone_repo">نسخ مشروع Git</string>
-  <string name="git_clone_repo_url">رابط المشروع</string>
-  <string name="git_clone_in_progress">نسخ مشروع Git...</string>
-  <string name="git_clone_success">تم نسخ مشروع Git بنجاح</string>
-  <string name="git_clone_failed">فشل في استنساخ مشروع git</string>
   <string name="msg_select_attr">حدد سمة من القائمة أدناه</string>
   <string name="action_show_hierarchy">عرض التسلسل الهرمي للتخطيط</string>
   <string name="idepref_editor_colorScheme">نظام الألوان</string>
diff --git a/resources/src/main/res/values-bn-rIN/strings.xml b/resources/src/main/res/values-bn-rIN/strings.xml
index e37d50cf8a..fa5326e467 100644
--- a/resources/src/main/res/values-bn-rIN/strings.xml
+++ b/resources/src/main/res/values-bn-rIN/strings.xml
@@ -242,7 +242,6 @@
   <string name="idepref_buildnrun_summary">Gradle বিল্ড কনফিগার করুন।</string>
   <string name="configure">কনফিগার করুন</string>
   <string name="about">সম্বন্ধে</string>
-  <string name="idepref_github_summary">Code on the Go হল ওপেন সোর্স!</string>
   <string name="idepref_channel_summary">সাম্প্রতিক আপডেটের জন্য সাবস্ক্রাইব করুন।</string>
   <string name="idepref_group_summary">এখানে বৈশিষ্ট্য, বাগ এবং উন্নতি নিয়ে আলোচনা করুন৷</string>
   <string name="idepref_changelog_summary">এই সংস্করণে নতুন কি আছে?</string>
@@ -340,12 +339,6 @@
   <string name="msg_tasks_to_run">নিম্নলিখিত প্রক্রিয়া গুলি চালানো হবে, ক্রমানুসারে। নিশ্চিত করার জন্য \'Run\' বাটনটিতে আবার ক্লিক করুন.\n\n%1$s</string>
   <string name="msg_loading_tasks">প্রক্রিয়া লোড করা হচ্ছে...</string>
   <!-- GIT -->
-  <string name="git_clone">ক্লোন</string>
-  <string name="git_clone_repo">গিট রেপোসিটরি ক্লোন করুন</string>
-  <string name="git_clone_repo_url">রেপোসিটরি URL</string>
-  <string name="git_clone_in_progress">রেপোসিটরি ক্লোন করা হচ্ছে</string>
-  <string name="git_clone_success">গিট ক্লোন সফল হয়েছে</string>
-  <string name="git_clone_failed">গিট রেপোসিটরি ক্লোন করতে ব্যর্থ</string>
   <string name="msg_select_attr">নীচের লিস্ট থেকে অ্যাট্রিবিউট নির্বাচন করুন</string>
   <string name="action_show_hierarchy">লেআউট-এর শ্রেণিবিন্যাস দেখান</string>
   <string name="idepref_editor_colorScheme">কালার স্কিম</string>
diff --git a/resources/src/main/res/values-de-rDE/strings.xml b/resources/src/main/res/values-de-rDE/strings.xml
index 9858deae51..0515c92c59 100644
--- a/resources/src/main/res/values-de-rDE/strings.xml
+++ b/resources/src/main/res/values-de-rDE/strings.xml
@@ -241,7 +241,6 @@
   <string name="idepref_buildnrun_summary">Gradle-Build konfigurieren.</string>
   <string name="configure">Konfigurieren</string>
   <string name="about">Über</string>
-  <string name="idepref_github_summary">AndriodIDE ist Open Source!</string>
   <string name="idepref_channel_summary">Abonnieren sie für die neuesten Updates.</string>
   <string name="idepref_group_summary">Diskutieren Sie hier über Features, Bugs und Verbesserungen.</string>
   <string name="idepref_changelog_summary">Was ist neu in der Version?</string>
@@ -339,12 +338,6 @@
   <string name="msg_tasks_to_run">Die folgenden Aufgaben werden in der Reihenfolge ausgeführt. Zum Bestätigen erneut auf \'Ausführen\' klicken.\n\n%1$s</string>
   <string name="msg_loading_tasks">Aufgaben werden geladen...</string>
   <!-- GIT -->
-  <string name="git_clone">Klonen</string>
-  <string name="git_clone_repo">Repository klonen</string>
-  <string name="git_clone_repo_url">Repository URL</string>
-  <string name="git_clone_in_progress">Repository wird geklont</string>
-  <string name="git_clone_success">Git Klon erfolgreich</string>
-  <string name="git_clone_failed">Fehler beim Klonen des Git-Repositorys</string>
   <string name="msg_select_attr">Wählen Sie ein Attribut aus der folgenden Liste</string>
   <string name="action_show_hierarchy">Layout Hierarchie anzeigen</string>
   <string name="idepref_editor_colorScheme">Farbschema</string>
diff --git a/resources/src/main/res/values-es-rES/strings.xml b/resources/src/main/res/values-es-rES/strings.xml
index 9fbc85ad62..4cd2bf7775 100644
--- a/resources/src/main/res/values-es-rES/strings.xml
+++ b/resources/src/main/res/values-es-rES/strings.xml
@@ -242,7 +242,6 @@
   <string name="idepref_buildnrun_summary">Configurar la compilación de Gradle.</string>
   <string name="configure">Configurar</string>
   <string name="about">Acerca de</string>
-  <string name="idepref_github_summary">¡Code on the Go es de código abierto!</string>
   <string name="idepref_channel_summary">Suscríbete para las últimas actualizaciones.</string>
   <string name="idepref_group_summary">Discuta las funcionalidades, bugs y mejoras aquí.</string>
   <string name="idepref_changelog_summary">¿Qué hay de nuevo?</string>
@@ -340,12 +339,6 @@
   <string name="msg_tasks_to_run">Las siguientes tareas se ejecutarán, en orden. Haga clic en el botón \'Ejecutar\' otra vez para confirmar.\n\n%1$s</string>
   <string name="msg_loading_tasks">Cargando tareas...</string>
   <!-- GIT -->
-  <string name="git_clone">Clonar</string>
-  <string name="git_clone_repo">Clonar repositorio git</string>
-  <string name="git_clone_repo_url">URL del repositorio</string>
-  <string name="git_clone_in_progress">Clonando repositorio</string>
-  <string name="git_clone_success">Clon de Git exitoso</string>
-  <string name="git_clone_failed">Error al clonar el repositorio git</string>
   <string name="msg_select_attr">Seleccione un atributo de la lista de abajo</string>
   <string name="action_show_hierarchy">Mostrar jerarquía de diseño</string>
   <string name="idepref_editor_colorScheme">Paleta de colores</string>
diff --git a/resources/src/main/res/values-fr-rFR/strings.xml b/resources/src/main/res/values-fr-rFR/strings.xml
index e47bb4bbcf..4758a6bf70 100644
--- a/resources/src/main/res/values-fr-rFR/strings.xml
+++ b/resources/src/main/res/values-fr-rFR/strings.xml
@@ -243,7 +243,6 @@ Dernier projet ouvert : \n%s</string>
   <string name="idepref_buildnrun_summary">Configure the Gradle build.</string>
   <string name="configure">Configure</string>
   <string name="about">À propos</string>
-  <string name="idepref_github_summary">Code on the Go est open source !</string>
   <string name="idepref_channel_summary">Subscribe for latest updates.</string>
   <string name="idepref_group_summary">Discuss featues, bugs and improvements here.</string>
   <string name="idepref_changelog_summary">What\'s new in this version?</string>
@@ -341,12 +340,6 @@ Dernier projet ouvert : \n%s</string>
   <string name="msg_tasks_to_run">The following tasks will be run, in order. Click the \'Run\' button again to confirm.\n\n%1$s</string>
   <string name="msg_loading_tasks">Loading tasks...</string>
   <!-- GIT -->
-  <string name="git_clone">Clone</string>
-  <string name="git_clone_repo">Clone git repository</string>
-  <string name="git_clone_repo_url">Repository URL</string>
-  <string name="git_clone_in_progress">Cloning repository</string>
-  <string name="git_clone_success">Git clone successful</string>
-  <string name="git_clone_failed">Failed to clone git repository</string>
   <string name="msg_select_attr">Select an attribute from the below list</string>
   <string name="action_show_hierarchy">Show layout hierarchy</string>
   <string name="idepref_editor_colorScheme">Color Scheme</string>
diff --git a/resources/src/main/res/values-hi-rIN/strings.xml b/resources/src/main/res/values-hi-rIN/strings.xml
index a817bad664..1680217779 100644
--- a/resources/src/main/res/values-hi-rIN/strings.xml
+++ b/resources/src/main/res/values-hi-rIN/strings.xml
@@ -241,7 +241,6 @@
   <string name="idepref_buildnrun_summary">ग्रेडल बिल्ड को कॉन्फ़िगर करें।</string>
   <string name="configure">कॉन्फ़िगर</string>
   <string name="about">विवरण</string>
-  <string name="idepref_github_summary">Code on the Go ओपन सोर्स है!</string>
   <string name="idepref_channel_summary">नवीनतम अपडेट के लिए सदस्यता लें |</string>
   <string name="idepref_group_summary">सुविधाओं, बगों और सुधारों पर यहां चर्चा करें।</string>
   <string name="idepref_changelog_summary">इस वर्शन में क्या नया है?</string>
@@ -339,12 +338,6 @@
   <string name="msg_tasks_to_run">क्रमानुसार निम्न कार्य चलाये जायेंगे। पुष्टि करने के लिए \'चलाएं\' बटन पर फिर से क्लिक करें.\n\n%1$s</string>
   <string name="msg_loading_tasks">टास्क लोड हो रहे हैं...</string>
   <!-- GIT -->
-  <string name="git_clone">क्लोन</string>
-  <string name="git_clone_repo">Git रिपॉजिटरी क्लोन करें</string>
-  <string name="git_clone_repo_url">रिपॉजिटरी URL</string>
-  <string name="git_clone_in_progress">रिपॉजिटरी क्लोन हो रही है</string>
-  <string name="git_clone_success">Git क्लोन सफल हुआ</string>
-  <string name="git_clone_failed">Git रिपॉजिटरी क्लोन करने में विफल</string>
   <string name="msg_select_attr">नीचे दी गई सूची से एक एट्रिब्यूट का चयन करें</string>
   <string name="action_show_hierarchy">लेआउट हायरार्की दिखाएं</string>
   <string name="idepref_editor_colorScheme">कलर स्कीम</string>
diff --git a/resources/src/main/res/values-pt-rBR/strings.xml b/resources/src/main/res/values-pt-rBR/strings.xml
index 6c94153aa7..9b1131b50b 100644
--- a/resources/src/main/res/values-pt-rBR/strings.xml
+++ b/resources/src/main/res/values-pt-rBR/strings.xml
@@ -242,7 +242,6 @@
   <string name="idepref_buildnrun_summary">Configurar a compilação do Gradle.</string>
   <string name="configure">Configurações</string>
   <string name="about">Sobre</string>
-  <string name="idepref_github_summary">Code on the Go é de código aberto!</string>
   <string name="idepref_channel_summary">Inscreva-se para receber as últimas atualizações.</string>
   <string name="idepref_group_summary">Discuta aqui recursos, bugs e melhorias.</string>
   <string name="idepref_changelog_summary">O que há de novo nesta versão?</string>
@@ -340,12 +339,6 @@
   <string name="msg_tasks_to_run">As seguintes tarefas serão executadas, em ordem. Clique no botão \'Executar\' novamente para confirmar.\n\n%1$s</string>
   <string name="msg_loading_tasks">Carregando tarefas...</string>
   <!-- GIT -->
-  <string name="git_clone">Clonar</string>
-  <string name="git_clone_repo">Clonar repositório git</string>
-  <string name="git_clone_repo_url">URL do repositório</string>
-  <string name="git_clone_in_progress">Clonando repositório</string>
-  <string name="git_clone_success">Git clonado com sucesso</string>
-  <string name="git_clone_failed">Falha ao clonar repositório git</string>
   <string name="msg_select_attr">Selecione um atributo da lista abaixo</string>
   <string name="action_show_hierarchy">Mostrar hierarquia do layout</string>
   <string name="idepref_editor_colorScheme">Esquema de cores</string>
diff --git a/resources/src/main/res/values-ro-rRO/strings.xml b/resources/src/main/res/values-ro-rRO/strings.xml
index ff5af19f18..e8abc836ef 100644
--- a/resources/src/main/res/values-ro-rRO/strings.xml
+++ b/resources/src/main/res/values-ro-rRO/strings.xml
@@ -242,7 +242,6 @@
   <string name="idepref_buildnrun_summary">Configure the Gradle build.</string>
   <string name="configure">Configure</string>
   <string name="about">About</string>
-  <string name="idepref_github_summary">Code on the Go is open source!</string>
   <string name="idepref_channel_summary">Subscribe for latest updates.</string>
   <string name="idepref_group_summary">Discuss featues, bugs and improvements here.</string>
   <string name="idepref_changelog_summary">What\'s new in this version?</string>
@@ -340,12 +339,6 @@
   <string name="msg_tasks_to_run">Următoarele activități vor fi rulate, în ordine. Faceți clic pe butonul \'Rulare\' pentru confirmare.\n\n%1$s</string>
   <string name="msg_loading_tasks">Încarc sarcinile…</string>
   <!-- GIT -->
-  <string name="git_clone">Clonare</string>
-  <string name="git_clone_repo">CClonează repozitoriu Git</string>
-  <string name="git_clone_repo_url">URL repozitoriu</string>
-  <string name="git_clone_in_progress">Clonează repozitoriu</string>
-  <string name="git_clone_success">Clona Git cu succes</string>
-  <string name="git_clone_failed">Nu a reușit să cloneze depozitul git</string>
   <string name="msg_select_attr">Selectați un atribut din lista de mai jos</string>
   <string name="action_show_hierarchy">Arată ierarhia layout-ului</string>
   <string name="idepref_editor_colorScheme">Schema de culori</string>
diff --git a/resources/src/main/res/values-ru-rRU/strings.xml b/resources/src/main/res/values-ru-rRU/strings.xml
index 2ae29ceb54..b8c0798af1 100644
--- a/resources/src/main/res/values-ru-rRU/strings.xml
+++ b/resources/src/main/res/values-ru-rRU/strings.xml
@@ -241,7 +241,6 @@
   <string name="idepref_buildnrun_summary">Настройте сборку Gradle.</string>
   <string name="configure">Настройки</string>
   <string name="about">О приложении</string>
-  <string name="idepref_github_summary">Code on the Go - проект с открытым исходным кодом!</string>
   <string name="idepref_channel_summary">Узнавайте о новых обновлениях!</string>
   <string name="idepref_group_summary">Сообщайте об ошибках, предлагайте новые функции и обсуждайте нововведения здесь.</string>
   <string name="idepref_changelog_summary">Что нового в этой версии?</string>
@@ -342,12 +341,6 @@
   <string name="close_without_saving">Закрыть без сохранения файлов</string>
   <string name="save_and_close">Сохранить файлы и закрыть проект</string>
   <!-- GIT -->
-  <string name="git_clone">Клонировать</string>
-  <string name="git_clone_repo">Клонировать репозиторий Git</string>
-  <string name="git_clone_repo_url">URL репозитория</string>
-  <string name="git_clone_in_progress">Клонирования репозитория</string>
-  <string name="git_clone_success">Клонирование Git успешно завершено</string>
-  <string name="git_clone_failed">Ошибка клонирования репозитория Git</string>
   <string name="msg_select_attr">Выберите атрибут из списка ниже</string>
   <string name="action_show_hierarchy">Показать иерархию разметки</string>
   <string name="idepref_editor_colorScheme">Цветовая схема</string>
diff --git a/resources/src/main/res/values-tr-rTR/strings.xml b/resources/src/main/res/values-tr-rTR/strings.xml
index 96fd1cbc54..bcafea2fb8 100644
--- a/resources/src/main/res/values-tr-rTR/strings.xml
+++ b/resources/src/main/res/values-tr-rTR/strings.xml
@@ -242,7 +242,6 @@
   <string name="idepref_buildnrun_summary">Gradle inşasını yapılandırın.</string>
   <string name="configure">Yapılandır</string>
   <string name="about">Hakkında</string>
-  <string name="idepref_github_summary">Code on the Go açık kaynaktır!</string>
   <string name="idepref_channel_summary">Son güncellemeler için abone olun.</string>
   <string name="idepref_group_summary">Özellikleri, sorunları ve iyileştirmeleri burada tartışın.</string>
   <string name="idepref_changelog_summary">Bu sürümde yeni ne var?</string>
@@ -340,12 +339,6 @@
   <string name="msg_tasks_to_run">Takip eden görevler sırayla çalıştırılacak. Tekrar \'Çalıştır\' tuşuna basarak doğrulayın.\n\n%1$s</string>
   <string name="msg_loading_tasks">Görevler yükleniyor...</string>
   <!-- GIT -->
-  <string name="git_clone">Kopya oluştur</string>
-  <string name="git_clone_repo">Git deposu klonla</string>
-  <string name="git_clone_repo_url">Depo Linki</string>
-  <string name="git_clone_in_progress">Depo klonlanıyor</string>
-  <string name="git_clone_success">Depo başarıyla klonlandı</string>
-  <string name="git_clone_failed">Depo klonlama başarısız</string>
   <string name="msg_select_attr">Aşağıdaki listeden bir öznitelik seç</string>
   <string name="action_show_hierarchy">Düzen aşamalarını göster</string>
   <string name="idepref_editor_colorScheme">Renk Şeması</string>
diff --git a/resources/src/main/res/values-zh-rCN/strings.xml b/resources/src/main/res/values-zh-rCN/strings.xml
index fe97267052..95a65d2e4c 100644
--- a/resources/src/main/res/values-zh-rCN/strings.xml
+++ b/resources/src/main/res/values-zh-rCN/strings.xml
@@ -241,7 +241,6 @@
   <string name="idepref_buildnrun_summary">Gradle 构建配置。</string>
   <string name="configure">配置</string>
   <string name="about">关于</string>
-  <string name="idepref_github_summary">Code on the Go 是开源的！</string>
   <string name="idepref_channel_summary">订阅以获取最新更新</string>
   <string name="idepref_group_summary">在这里讨论功能、错误和改进。</string>
   <string name="idepref_changelog_summary">此版本有什么新内容?</string>
@@ -339,12 +338,6 @@
   <string name="msg_tasks_to_run">将按顺序运行以下任务，再次单击“运行”按钮进行确认。\n\n%1$s</string>
   <string name="msg_loading_tasks">正在加载任务…</string>
   <!-- GIT -->
-  <string name="git_clone">克隆</string>
-  <string name="git_clone_repo">克隆 git 仓库</string>
-  <string name="git_clone_repo_url">存储库 URL</string>
-  <string name="git_clone_in_progress">克隆存储库</string>
-  <string name="git_clone_success">git 克隆成功</string>
-  <string name="git_clone_failed">无法克隆 git 存储库</string>
   <string name="msg_select_attr">从下面的列表中选择一个属性</string>
   <string name="action_show_hierarchy">显示布局层次</string>
   <string name="idepref_editor_colorScheme">配色方案</string>
diff --git a/subprojects/shizuku-manager/src/main/jni/adb_pairing.cpp b/subprojects/shizuku-manager/src/main/jni/adb_pairing.cpp
index 1a44981e28..8c9365f460 100644
--- a/subprojects/shizuku-manager/src/main/jni/adb_pairing.cpp
+++ b/subprojects/shizuku-manager/src/main/jni/adb_pairing.cpp
@@ -215,12 +215,12 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
         return -1;
 
     JNINativeMethod methods_PairingContext[] = {
-            {"nativeConstructor", "(Z[B)J",  (void *) PairingContext_Constructor},
-            {"nativeMsg",         "(J)[B",   (void *) PairingContext_Msg},
-            {"nativeInitCipher",  "(J[B)Z",  (void *) PairingContext_InitCipher},
-            {"nativeEncrypt",     "(J[B)[B", (void *) PairingContext_Encrypt},
-            {"nativeDecrypt",     "(J[B)[B", (void *) PairingContext_Decrypt},
-            {"nativeDestroy",     "(J)V",    (void *) PairingContext_Destroy},
+            {(char *) "nativeConstructor", (char *) "(Z[B)J",  (void *) PairingContext_Constructor},
+            {(char *) "nativeMsg",         (char *) "(J)[B",   (void *) PairingContext_Msg},
+            {(char *) "nativeInitCipher",  (char *) "(J[B)Z",  (void *) PairingContext_InitCipher},
+            {(char *) "nativeEncrypt",     (char *) "(J[B)[B", (void *) PairingContext_Encrypt},
+            {(char *) "nativeDecrypt",     (char *) "(J[B)[B", (void *) PairingContext_Decrypt},
+            {(char *) "nativeDestroy",     (char *) "(J)V",    (void *) PairingContext_Destroy},
     };
 
     env->RegisterNatives(env->FindClass("moe/shizuku/manager/adb/PairingContext"), methods_PairingContext,