chore: Merge branch dev to main

.github/workflows/back_merge.yml

@@ -15,13 +15,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set Git user
+      - name: Merge main into dev
         run: |
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
-      - name: Merge main into dev
-        run: |
           git fetch origin dev
 
           git checkout dev

build.gradle

@@ -83,8 +83,8 @@ allprojects {
     apply plugin: 'idea'
 
     group = 'org.microg.gms'
-    ext.appVersionName = '6.1.2'
-    ext.appVersionCode = 255034002
+    ext.appVersionName = '6.1.3'
+    ext.appVersionCode = 255034003
     ext.baseVersion = ext.appVersionCode.toString()[0..1] + '.' + ext.appVersionCode.toString()[2..3] + '.' + ext.appVersionCode.toString()[4..5]
     version = ext.appVersionName
     ext.isReleaseVersion = false

play-services-base/core/src/main/java/org/microg/gms/common/PackageUtils.java

@@ -118,7 +118,6 @@ public static boolean callerHasExtendedAccess(Context context) {
         String[] packagesForUid = context.getPackageManager().getPackagesForUid(Binder.getCallingUid());
         if (packagesForUid != null && packagesForUid.length != 0) {
             for (String packageName : packagesForUid) {
-                packageName = PackageSpoofUtils.spoofPackageName(context.getPackageManager(), packageName);
                 if (isGooglePackage(context, packageName) || GMS_PACKAGE_NAME.equals(packageName))
                     return true;
             }

play-services-base/core/src/main/res/values-da-rDK/values/strings.xml

@@ -9,9 +9,9 @@
     <!-- %1$s is a notification text such as "Exposure Notification" -->
     <string name="foreground_service_notification_text" formatted="true">%1$s kører i baggrunden</string>
     <!-- %1$s is a notification text such as "mnicroG Services" -->
-    <string name="foreground_service_notification_big_text">Fjern %1$s fra batteri-optimeringer eller ændre notifikationsindstillinger for at skjule denne notifikation</string>
+    <string name="foreground_service_notification_big_text">Fjern %1$s fra batterioptimeringer eller ændre notifikationsindstillinger for at skjule denne notifikation</string>
     <!--foreground service: notification actions-->
-    <string name="foreground_action_battery_optimization">Batterioptimalisering</string>
+    <string name="foreground_action_battery_optimization">Batterioptimering</string>
     <string name="foreground_action_notification_settings">Indstillinger</string>
     <!--Actionbar menu-->
     <string name="menu_settings">Indstillinger</string>

play-services-base/core/src/main/res/values-tr-rTR/values/strings.xml

@@ -5,13 +5,13 @@
   -->
 <resources>
     <!--Foreground service notification-->
-    <string name="foreground_service_notification_title">Arka plan çalışır</string>
+    <string name="foreground_service_notification_title">Arka planda aktif</string>
     <!-- %1$s is a notification text such as "Exposure Notification" -->
-    <string name="foreground_service_notification_text" formatted="true">%1$s arka plan çalışıyor</string>
+    <string name="foreground_service_notification_text" formatted="true">%1$s arka planda çalışıyor</string>
     <!-- %1$s is a notification text such as "mnicroG Services" -->
     <string name="foreground_service_notification_big_text">Ayarlar için %1$s\'yi batarya optimizasyonlarından hariç tutun ya da bildirim ayarlarını değiştirin ve bu bildirimi gizleyin</string>
     <!--foreground service: notification actions-->
-    <string name="foreground_action_battery_optimization">Batarya optimizasyonu</string>
+    <string name="foreground_action_battery_optimization">Pil optimizasyonu</string>
     <string name="foreground_action_notification_settings">Ayarlar</string>
     <!--Actionbar menu-->
     <string name="menu_settings">Ayarlar</string>

play-services-core/microg-ui-tools/src/main/res/values-da-rDK/strings.xml

@@ -31,7 +31,7 @@
     <!--self-check: permission-->
     <string name="self_check_cat_permissions">Tilladelser</string>
     <string name="self_check_name_permission">Tilladelse til %1$s:</string>
-    <string name="self_check_resolution_permission">Tryk her for at give tilladelse. Ikke at give tilladelsen kan resultere i misbragende applikationer</string>
+    <string name="self_check_resolution_permission">Tryk her for at give tilladelse. Ikke at give tilladelsen kan resultere i at applikationer opfører sig mærkeligt</string>
     <!--Settings Preferences-->
     <!--preferences: self-check-->
     <string name="self_check_title">Selvkontrol</string>

play-services-core/microg-ui-tools/src/main/res/values-tr-rTR/strings.xml

@@ -16,28 +16,28 @@
   -->
 <resources>
     <!--Updater-->
-    <string name="update_checker_button">Güncelleştirmeleri kontrol et</string>
+    <string name="update_checker_button">Güncellemeleri kontrol et</string>
     <string name="update_checker_download_button">İndir</string>
     <!--updater: messages-->
-    <string name="update_checker_no_update">Yeni güncelleme yok</string>
+    <string name="update_checker_no_update">Güncelleme yok</string>
     <string name="update_checker_update_available">Yeni güncelleme mevcut: %s</string>
     <string name="update_checker_no_internet">İnternet bağlantısı yok</string>
     <string name="update_checker_generic_error">Bir hata oluştu... Lütfen daha sonra tekrar deneyin</string>
     <!--Settings About-->
-    <string name="about_morphe_description">Morphe, Android uygulamaları için açılış kodları yoluyla değiştirmek üzere tasarlanmış açık kaynaklı bir projedir</string>
+    <string name="about_morphe_description">Morphe, yamalar aracılığıyla Android uygulamalarını değiştirmek için tasarlanmış açık kaynaklı bir projedir</string>
     <string name="about_version_str">Sürüm %1$s</string>
     <string name="about_default_license">Tüm hakları saklıdır</string>
     <!--Self Check-->
     <!--self-check: permission-->
     <string name="self_check_cat_permissions">İzinler</string>
-    <string name="self_check_name_permission">İzin %1$s için:</string>
+    <string name="self_check_name_permission">%1$s\'a izin:</string>
     <string name="self_check_resolution_permission">İzin vermek için buraya dokun. İzin verilmediğinde uygulama sorunları yaşanabilir</string>
     <!--Settings Preferences-->
     <!--preferences: self-check-->
-    <string name="self_check_title">Öz Kontrol</string>
+    <string name="self_check_title">Öz kontrol</string>
     <string name="self_check_desc">Cihazın microG kullanımı için doğru olarak yapılandırıldığından emin olun</string>
     <!--UI preview-->
     <string name="about_root_title">microG Kullanıcı Arayüzü Demo</string>
     <string name="about_root_version">Sürüm v0.1.0</string>
-    <string name="about_root_libraries">İçeren kütüphaneler</string>
+    <string name="about_root_libraries">İçerilen kütüphaneler</string>
 </resources>