Merge remote-tracking branch 'upstream/master'

app/build.gradle.kts

@@ -139,18 +139,18 @@ dependencies {
     val glideVersion = "4.14.2"
     val navVersion: String by project
     annotationProcessor("com.github.bumptech.glide:compiler:$glideVersion")
-    implementation("androidx.activity:activity:1.6.0")
+    implementation("androidx.activity:activity:1.6.1")
     implementation("androidx.browser:browser:1.4.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.core:core:1.9.0")
-    implementation("androidx.fragment:fragment:1.5.3")
+    implementation("androidx.fragment:fragment:1.5.4")
     implementation("androidx.navigation:navigation-fragment:$navVersion")
     implementation("androidx.navigation:navigation-ui:$navVersion")
     implementation("androidx.preference:preference:1.2.0")
     implementation("androidx.recyclerview:recyclerview:1.2.1")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
     implementation("com.github.bumptech.glide:glide:$glideVersion")
-    implementation("com.google.android.material:material:1.7.0-rc01")
+    implementation("com.google.android.material:material:1.7.0")
     implementation("com.google.code.gson:gson:2.10")
     implementation(platform("com.squareup.okhttp3:okhttp-bom:4.10.0"))
     implementation("com.squareup.okhttp3:okhttp")
@@ -170,7 +170,7 @@ dependencies {
     implementation("org.lsposed.hiddenapibypass:hiddenapibypass:4.3")
     implementation(projects.services.managerService)
 
-    val appCenter = "4.4.5"
+    val appCenter = "5.0.0"
     debugImplementation("com.microsoft.appcenter:appcenter-crashes:${appCenter}")
     debugImplementation("com.microsoft.appcenter:appcenter-analytics:${appCenter}")
 }

app/src/main/res/values-de/strings.xml

@@ -23,7 +23,7 @@
     <string name="overview">Übersicht</string>
     <string name="Modules">Module</string>
     <plurals name="modules_enabled_count">
-        <item quantity="one">%d Modul aktiviert</item>
+        <item quantity="one">%d Module aktiviert</item>
         <item quantity="other">%d Module aktiviert</item>
     </plurals>
     <string name="Logs">Protokolle</string>
@@ -57,7 +57,7 @@ JJ108</string>
     <string name="system_prop_incorrect"><![CDATA[Einige notwendige Systemeigenschaften wurden gelöscht oder geändert.<br/>Module können gelegentlich außer Kraft gesetzt werden.]]></string>
     <string name="need_update">Aktualisierung erforderlich</string>
     <string name="please_update_summary">Bitte installieren Sie die neueste Version von LSPosed</string>
-    <string name="lsposed_not_active">LSPosed ist derzeit nicht installiert oder läuft nicht.</string>
+    <string name="lsposed_not_active">LSPosed ist derzeit nicht installiert oder aktiv.</string>
     <string name="info_api_version">API Version</string>
     <string name="info_framework_version">Framework Version</string>
     <string name="info_manager_version">Manager Version</string>

app/src/main/res/values-fr/strings.xml

@@ -236,7 +236,7 @@ https://github.com/tclement0922</string>
     <string name="color_brown">Marron</string>
     <string name="color_blue_grey">Bleu grisâtre</string>
     <plurals name="module_release_assets_download_count">
-        <item quantity="one">%d télécharger</item>
+        <item quantity="one">%d téléchargé</item>
         <item quantity="other">%d téléchargés</item>
     </plurals>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -235,7 +235,7 @@
     <string name="color_brown">Marrom</string>
     <string name="color_blue_grey">Azul-acinzentado</string>
     <plurals name="module_release_assets_download_count">
-        <item quantity="one">%d descarregar</item>
-        <item quantity="other">%d transferências</item>
+        <item quantity="one">%d Descarregar</item>
+        <item quantity="other">%d Transferências</item>
     </plurals>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -241,7 +241,7 @@
     <plurals name="module_release_assets_download_count">
         <item quantity="one">%d скачивание</item>
         <item quantity="few">%d скачивается</item>
-        <item quantity="many">%d загрузки</item>
+        <item quantity="many">%d скачиваются</item>
         <item quantity="other">%d скачано</item>
     </plurals>
 </resources>

app/src/main/res/values-tr/strings.xml

@@ -24,24 +24,24 @@
     <string name="Modules">Modüller</string>
     <plurals name="modules_enabled_count">
         <item quantity="one">%d modül etkin</item>
-        <item quantity="other">%d modül etkin</item>
+        <item quantity="other">%d modülleri etkin</item>
     </plurals>
     <string name="Logs">Günlükler</string>
     <string name="Settings">Ayarlar</string>
     <string name="feedback_or_suggestion">Geri bildirim veya öneri</string>
     <string name="About">Hakkında</string>
-    <string name="report_issue">Hata raporla</string>
+    <string name="report_issue">Hata bildir</string>
     <string name="module_repo">Modül deposu</string>
     <string name="module_repo_loading">Yükleniyor…</string>
     <string name="module_repo_up_to_date">Bütün modüller güncel</string>
-    <string name="module_repo_published_time">%syayınlandı</string>
-    <string name="module_repo_updated_time">%sgüncellendi</string>
+    <string name="module_repo_published_time">%s yayınlandı</string>
+    <string name="module_repo_updated_time">%s güncellendi</string>
     <plurals name="module_repo_upgradable">
-        <item quantity="one">%d modül güncellenebilir</item>
-        <item quantity="other">%d modül güncellenebilir</item>
+        <item quantity="one">%d modülü güncellenebilir</item>
+        <item quantity="other">%d modülleri güncellenebilir</item>
     </plurals>
-    <string name="about_view_source_code"><![CDATA[%1$s adresindeki kaynak kodunu görüntüle<br/>%2$s kanalımıza katılın]]></string>
-    <string name="translators" comment="Dear translators, please add your home page here following the format. There can be more than one translator. So feel free to append yourself.">Bedircan AYAYDIN, Furkan KARCIOĞLU, Ahmet AÇIKGÖZ</string>
+    <string name="about_view_source_code"><![CDATA[%1$s adresinden kaynak kodu görüntüleyin<br/>%2$s kanalımıza katılın]]></string>
+    <string name="translators" comment="Dear translators, please add your home page here following the format. There can be more than one translator. So feel free to append yourself.">Bedircan AYAYDIN, Furkan KARCIOĞLU, Ahmet AÇIKGÖZ, Sir-C</string>
     <string name="install">Yükle</string>
     <string name="install_summary">LSPosed\'i yüklemek için dokunun</string>
     <string name="not_installed">Yüklenmedi</string>
@@ -64,13 +64,13 @@
     <string name="info_device">Cihaz</string>
     <string name="info_system_abi">Sistem ABI\'si</string>
     <string name="info_api">Enjeksiyon Arayüzü</string>
-    <string name="info_dex2oat_wrapper">Dex Optimize Edici Sarıcı</string>
+    <string name="info_dex2oat_wrapper">Dex Optimize Edici Sarıcısı</string>
     <string name="supported">Desteklenen</string>
-    <string name="unsupported">desteklenmiyor</string>
+    <string name="unsupported">Desteklenmiyor</string>
     <string name="android_version_unsatisfied">Android sürümü tatmin edici değil</string>
     <string name="crashed">çöktü</string>
-    <string name="mount_failed">Montaj başarısız</string>
-    <string name="selinux_permissive">SELinux izinlidir</string>
+    <string name="mount_failed">Bağlama başarısız</string>
+    <string name="selinux_permissive">SELinux\'a izin verildi</string>
     <string name="sepolicy_incorrect">SELinux politikası yanlış</string>
     <string name="parasitic_recommend">Parazit Yönetici Önerilir</string>
     <string name="parasitic_recommend_summary">LSPosed şu an sisteme parazit olarak yerleşip denetlemeleri önlemeyi destekliyor. Parazit yönetici kısayolunu ana ekrana ekledikten sonra güvenle bu yöneticiyi kaldırabilirsiniz. Eğer eski yöneticiyi geri isterseniz /data/adb/lspd/manager.apk konumunda bulabilirsiniz.</string>

build.gradle.kts

@@ -50,7 +50,7 @@ val injectedPackageUid by extra(2000)
 val defaultManagerPackageName by extra("org.lsposed.manager")
 val apiCode by extra(93)
 val verCode by extra(commitCount + 4200)
-val verName by extra("1.8.4")
+val verName by extra("1.8.5")
 val androidTargetSdkVersion by extra(33)
 val androidMinSdkVersion by extra(27)
 val androidBuildToolsVersion by extra("32.0.0")

core/src/main/java/android/content/res/XResources.java

@@ -1771,6 +1771,14 @@ private static XC_LayoutInflated.Unhook hookLayoutInternal(String resDir, int id
 		if (id == 0)
 			throw new IllegalArgumentException("id 0 is not an allowed resource identifier");
 
+		if (resDir == null) {
+			try {
+				XposedInit.hookResources();
+			} catch (Throwable throwable) {
+				throw new IllegalStateException("Failed to initialize resources hook", throwable);
+			}
+		}
+
 		HashMap<String, CopyOnWriteSortedSet<XC_LayoutInflated>> inner;
 		synchronized (sLayoutCallbacks) {
 			inner = sLayoutCallbacks.get(id);

daemon/src/main/res/values-de/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Notification -->
-    <string name="module_is_not_activated_yet">Das LSPosed-Modul wurde noch nicht aktiviert</string>
+    <string name="module_is_not_activated_yet">Das Xposed-Modul ist noch nicht aktiviert</string>
     <string name="module_is_not_activated_yet_main_user_detailed">%1$s wurde installiert, ist aber noch nicht aktiviert</string>
     <string name="module_is_not_activated_yet_multi_user_detailed">%1$s wurde unter dem Benutzer %2$sinstalliert, ist aber noch nicht aktiviert</string>
     <string name="xposed_module_updated_notification_title">Xposed-Modul aktualisiert</string>

gradle.properties

@@ -19,4 +19,4 @@ android.enableR8.fullMode=true
 android.useAndroidX=true
 
 agpVersion=7.3.1
-navVersion=2.5.2
+navVersion=2.5.3