chore: Merge branch dev to main

.github/workflows/back_merge.yml

@@ -0,0 +1,34 @@
+name: Back Merge Main to Dev
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  back-merge:
+    name: Back Merge Main to Dev
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set Git user
+        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
+
+          if git merge origin/main -m "chore: merge main back into dev [skip ci]"; then
+            git push origin dev
+          else
+            echo "Merge conflicts detected. Manual intervention required."
+            exit 1
+          fi

.github/workflows/release.yml

@@ -61,8 +61,9 @@ jobs:
           buildToolsVersion: 36.0.0
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: MicroG-RE
+          archive: false
           path: ${{steps.sign_app.outputs.signedFile}}
 

build.gradle

@@ -83,8 +83,8 @@ allprojects {
     apply plugin: 'idea'
 
     group = 'org.microg.gms'
-    ext.appVersionName = '6.1.1'
-    ext.appVersionCode = 255034001
+    ext.appVersionName = '6.1.2'
+    ext.appVersionCode = 255034002
     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-auth/build.gradle

@@ -42,4 +42,6 @@ dependencies {
     api project(':play-services-base')
     api project(':play-services-basement')
     api project(':play-services-tasks')
+
+    annotationProcessor project(':safe-parcel-processor')
 }

play-services-base/core/src/main/res/values-ckb-rIR/values/strings.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ SPDX-FileCopyrightText: 2020, microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+<resources>
+    <!--Foreground service notification-->
+    <!-- %1$s is a notification text such as "Exposure Notification" -->
+    <!-- %1$s is a notification text such as "mnicroG Services" -->
+    <!--foreground service: notification actions-->
+    <!--Actionbar menu-->
+    <!--Google Cloud Messaging-->
+    <!--gcm: network status-->
+    <!--Patchers names-->
+</resources>

play-services-base/core/src/main/res/values-de-rDE/values/strings.xml

@@ -9,7 +9,7 @@
     <!-- %1$s is a notification text such as "Exposure Notification" -->
     <string name="foreground_service_notification_text" formatted="true">%1$s läuft im Hintergrund</string>
     <!-- %1$s is a notification text such as "mnicroG Services" -->
-    <string name="foreground_service_notification_big_text">Schließe %1$s von Batterieoptimierungen aus oder ändere die Benachrichtigungseinstellungen, um diese Benachrichtigung zu verbergen.</string>
+    <string name="foreground_service_notification_big_text">Schließen Sie %1$s von Batterieoptimierungen aus oder ändern Sie die Benachrichtigungseinstellungen, um diese Benachrichtigung zu verbergen</string>
     <!--foreground service: notification actions-->
     <string name="foreground_action_battery_optimization">Batterieoptimierung</string>
     <string name="foreground_action_notification_settings">Einstellungen</string>

play-services-base/core/src/main/res/values-el-rGR/values/strings.xml

@@ -5,25 +5,25 @@
   -->
 <resources>
     <!--Foreground service notification-->
-    <string name="foreground_service_notification_title">Ενεργός στο παρασκήνιο</string>
+    <string name="foreground_service_notification_title">Ενεργό στο παρασκήνιο</string>
     <!-- %1$s is a notification text such as "Exposure Notification" -->
     <string name="foreground_service_notification_text" formatted="true">%1$s τρέχει στο παρασκήνιο</string>
     <!-- %1$s is a notification text such as "mnicroG Services" -->
-    <string name="foreground_service_notification_big_text">Εξαιρέστε το %1$s από τις βελτιώσεις της μπαταρίας ή αλλάξτε τις ρυθμίσεις ειδοποιήσεων για να κρυφθεί αυτή η ειδοποίηση</string>
+    <string name="foreground_service_notification_big_text">Εξαιρέστε το %1$s από τις βελτιστοποιήσεις μπαταρίας ή αλλάξτε τις ρυθμίσεις ειδοποιήσεων για να αποκρυφτεί αυτή η ειδοποίηση</string>
     <!--foreground service: notification actions-->
-    <string name="foreground_action_battery_optimization">Οικονομία ενέργειας</string>
+    <string name="foreground_action_battery_optimization">Βελτιστοποίηση μπαταρίας</string>
     <string name="foreground_action_notification_settings">Ρυθμίσεις</string>
     <!--Actionbar menu-->
     <string name="menu_settings">Ρυθμίσεις</string>
     <!--Google Cloud Messaging-->
-    <string name="list_no_item_none">Καμία</string>
-    <string name="list_item_see_all">Δείξε όλα</string>
+    <string name="list_no_item_none">Κανένα</string>
+    <string name="list_item_see_all">Προβολή όλων</string>
     <!--gcm: network status-->
     <string name="service_status_disabled">Απενεργοποιημένη</string>
-    <string name="service_status_enabled">Ενεργοποιημένο</string>
+    <string name="service_status_enabled">Ενεργοποιημένη</string>
     <string name="service_status_automatic">Αυτόματο</string>
     <string name="service_status_manual">Χειροκίνητο</string>
     <string name="service_status_enabled_short">Ενεργό</string>
-    <string name="service_status_disabled_short">Απενεργοποιημένο</string>
+    <string name="service_status_disabled_short">Ανενεργό</string>
     <!--Patchers names-->
 </resources>

play-services-base/core/src/main/res/values-fa-rIR/values/strings.xml

@@ -5,11 +5,25 @@
   -->
 <resources>
     <!--Foreground service notification-->
+    <string name="foreground_service_notification_title">فعال در پس‌زمینه</string>
     <!-- %1$s is a notification text such as "Exposure Notification" -->
+    <string name="foreground_service_notification_text" formatted="true">در پس‌زمینه در حال اجراست  %1$s</string>
     <!-- %1$s is a notification text such as "mnicroG Services" -->
+    <string name="foreground_service_notification_big_text">%1$s را از بهینه‌سازی باتری مستثنی کنید یا تنظیمات اعلان را تغییر دهید تا این اعلان پنهان شود</string>
     <!--foreground service: notification actions-->
+    <string name="foreground_action_battery_optimization">بهینه‌سازی باتری</string>
+    <string name="foreground_action_notification_settings">تنظیمات</string>
     <!--Actionbar menu-->
+    <string name="menu_settings">تنظیمات</string>
     <!--Google Cloud Messaging-->
+    <string name="list_no_item_none">موردی وجود ندارد</string>
+    <string name="list_item_see_all">مشاهده همه</string>
     <!--gcm: network status-->
+    <string name="service_status_disabled">غیرفعال</string>
+    <string name="service_status_enabled">فعال</string>
+    <string name="service_status_automatic">خودکار</string>
+    <string name="service_status_manual">دستی</string>
+    <string name="service_status_enabled_short">روشن</string>
+    <string name="service_status_disabled_short">خاموش</string>
     <!--Patchers names-->
 </resources>

play-services-base/core/src/main/res/values-fi-rFI/values/strings.xml

@@ -5,13 +5,13 @@
   -->
 <resources>
     <!--Foreground service notification-->
-    <string name="foreground_service_notification_title">Toimii taustalla</string>
+    <string name="foreground_service_notification_title">Tominnassa taustalla</string>
     <!-- %1$s is a notification text such as "Exposure Notification" -->
-    <string name="foreground_service_notification_text" formatted="true">%1$s on käynnistää taustalla</string>
+    <string name="foreground_service_notification_text" formatted="true">%1$s toimii taustalla</string>
     <!-- %1$s is a notification text such as "mnicroG Services" -->
-    <string name="foreground_service_notification_big_text">Poista %1$s akkukäytön optimoinnista tai muuta ilmoitussäätöjä piilottaaksesi tämän ilmoituksen</string>
+    <string name="foreground_service_notification_big_text">Poista %1$s akun käytön optimoinnista tai piilota tämä ilmoitus muuttamalla ilmoitusasetuksia</string>
     <!--foreground service: notification actions-->
-    <string name="foreground_action_battery_optimization">Akkulimittaus</string>
+    <string name="foreground_action_battery_optimization">Akun käytön optimointi</string>
     <string name="foreground_action_notification_settings">Asetukset</string>
     <!--Actionbar menu-->
     <string name="menu_settings">Asetukset</string>
@@ -22,8 +22,8 @@
     <string name="service_status_disabled">Pois käytöstä</string>
     <string name="service_status_enabled">Käytössä</string>
     <string name="service_status_automatic">Automaattinen</string>
-    <string name="service_status_manual">Manuaali</string>
-    <string name="service_status_enabled_short">Päälle</string>
+    <string name="service_status_manual">Manuaalinen</string>
+    <string name="service_status_enabled_short">Päällä</string>
     <string name="service_status_disabled_short">Pois</string>
     <!--Patchers names-->
 </resources>

play-services-base/core/src/main/res/values-fil-rPH/values/strings.xml

@@ -5,11 +5,25 @@
   -->
 <resources>
     <!--Foreground service notification-->
+    <string name="foreground_service_notification_title">Aktibo sa likuran</string>
     <!-- %1$s is a notification text such as "Exposure Notification" -->
+    <string name="foreground_service_notification_text" formatted="true">Tumatakbo ang %1$s sa likuran</string>
     <!-- %1$s is a notification text such as "mnicroG Services" -->
+    <string name="foreground_service_notification_big_text">Huwag isama ang %1$s mula sa pag-optimize ng baterya o baguhin ang pagpipilian sa notipikasyon upang itago ang notipikasyon na ito</string>
     <!--foreground service: notification actions-->
+    <string name="foreground_action_battery_optimization">Pag-optimize sa baterya</string>
+    <string name="foreground_action_notification_settings">Pagpipilian</string>
     <!--Actionbar menu-->
+    <string name="menu_settings">Pagpipilian</string>
     <!--Google Cloud Messaging-->
+    <string name="list_no_item_none">Wala</string>
+    <string name="list_item_see_all">Ipakita lahat</string>
     <!--gcm: network status-->
+    <string name="service_status_disabled">Nakapatay</string>
+    <string name="service_status_enabled">Pinagana</string>
+    <string name="service_status_automatic">Awtomatiko</string>
+    <string name="service_status_manual">Manu-mano</string>
+    <string name="service_status_enabled_short">Naka-on</string>
+    <string name="service_status_disabled_short">Naka-off</string>
     <!--Patchers names-->
 </resources>

play-services-base/core/src/main/res/values-ga-rIE/values/strings.xml

@@ -5,25 +5,25 @@
   -->
 <resources>
     <!--Foreground service notification-->
-    <string name="foreground_service_notification_title">Gníomhtha sa dteagasc</string>
+    <string name="foreground_service_notification_title">Gníomhach sa chúlra</string>
     <!-- %1$s is a notification text such as "Exposure Notification" -->
-    <string name="foreground_service_notification_text" formatted="true">%1$s tá ag rith sa chúlra</string>
+    <string name="foreground_service_notification_text" formatted="true">Tá %1$s ag rith sa chúlra</string>
     <!-- %1$s is a notification text such as "mnicroG Services" -->
-    <string name="foreground_service_notification_big_text">Exclude %1$s from battery optimizations or change notification settings to hide this notification</string>
+    <string name="foreground_service_notification_big_text">Eisiamh %1$s ó uasmhéaduithe ceallraí nó athraigh socruithe fógra chun an fógra seo a cheilt</string>
     <!--foreground service: notification actions-->
-    <string name="foreground_action_battery_optimization">Gníomhartha le battéire</string>
+    <string name="foreground_action_battery_optimization">Uasmhéadú ceallraí</string>
     <string name="foreground_action_notification_settings">Socruithe</string>
     <!--Actionbar menu-->
     <string name="menu_settings">Socruithe</string>
     <!--Google Cloud Messaging-->
     <string name="list_no_item_none">Dada</string>
-    <string name="list_item_see_all">Téagasc gach</string>
+    <string name="list_item_see_all">Féach ar gach rud</string>
     <!--gcm: network status-->
     <string name="service_status_disabled">Díchumasaithe</string>
-    <string name="service_status_enabled">Ábhartha</string>
-    <string name="service_status_automatic">Dúchasach</string>
-    <string name="service_status_manual">Dúchas</string>
+    <string name="service_status_enabled">Cumasaithe</string>
+    <string name="service_status_automatic">Uathoibríoch</string>
+    <string name="service_status_manual">Láimhe</string>
     <string name="service_status_enabled_short">Ar</string>
-    <string name="service_status_disabled_short">Ar</string>
+    <string name="service_status_disabled_short">As</string>
     <!--Patchers names-->
 </resources>

play-services-base/core/src/main/res/values-gl-rES/values/strings.xml

@@ -5,11 +5,25 @@
   -->
 <resources>
     <!--Foreground service notification-->
+    <string name="foreground_service_notification_title">Activo en segundo plano</string>
     <!-- %1$s is a notification text such as "Exposure Notification" -->
+    <string name="foreground_service_notification_text" formatted="true">%1$s está executándose en segundo plano</string>
     <!-- %1$s is a notification text such as "mnicroG Services" -->
+    <string name="foreground_service_notification_big_text">Exclúa %1$s das optimizacións de batería ou modifique os axustes de notificación para ocultar esta notificación</string>
     <!--foreground service: notification actions-->
+    <string name="foreground_action_battery_optimization">Optimización de batería</string>
+    <string name="foreground_action_notification_settings">Axustes</string>
     <!--Actionbar menu-->
+    <string name="menu_settings">Axustes</string>
     <!--Google Cloud Messaging-->
+    <string name="list_no_item_none">Ningún</string>
+    <string name="list_item_see_all">Ver todo</string>
     <!--gcm: network status-->
+    <string name="service_status_disabled">Desactivado</string>
+    <string name="service_status_enabled">Activado</string>
+    <string name="service_status_automatic">Automático</string>
+    <string name="service_status_manual">Manual</string>
+    <string name="service_status_enabled_short">On</string>
+    <string name="service_status_disabled_short">Off</string>
     <!--Patchers names-->
 </resources>

play-services-base/core/src/main/res/values-hu-rHU/values/strings.xml

@@ -5,19 +5,19 @@
   -->
 <resources>
     <!--Foreground service notification-->
-    <string name="foreground_service_notification_title">Háttérben aktív</string>
+    <string name="foreground_service_notification_title">Aktív a háttérben</string>
     <!-- %1$s is a notification text such as "Exposure Notification" -->
-    <string name="foreground_service_notification_text" formatted="true">%1$s fut a háttérben</string>
+    <string name="foreground_service_notification_text" formatted="true">A(z) %1$s fut a háttérben</string>
     <!-- %1$s is a notification text such as "mnicroG Services" -->
-    <string name="foreground_service_notification_big_text">Kizárja %1$s a akkumulátor-optimizálásokat vagy változtassa a értesítési beállításokat, hogy rejtse el ezt az értesítést</string>
+    <string name="foreground_service_notification_big_text">Zárja ki a(z) %1$s-t az akkumulátoroptimalizálásból, vagy módosítsa az értesítési beállításokat, hogy elrejtse ezt az értesítést.</string>
     <!--foreground service: notification actions-->
     <string name="foreground_action_battery_optimization">Akkuoptimalizálás</string>
     <string name="foreground_action_notification_settings">Beállítások</string>
     <!--Actionbar menu-->
     <string name="menu_settings">Beállítások</string>
     <!--Google Cloud Messaging-->
     <string name="list_no_item_none">Egyik sem</string>
-    <string name="list_item_see_all">Minden megtekintése</string>
+    <string name="list_item_see_all">Összes megtekintése</string>
     <!--gcm: network status-->
     <string name="service_status_disabled">Letiltva</string>
     <string name="service_status_enabled">Engedélyezve</string>

play-services-base/core/src/main/res/values-in-rID/values/strings.xml

@@ -19,7 +19,7 @@
     <string name="list_no_item_none">Tidak ada</string>
     <string name="list_item_see_all">Lihat semua</string>
     <!--gcm: network status-->
-    <string name="service_status_disabled">Nonaktif</string>
+    <string name="service_status_disabled">Dinonaktifkan</string>
     <string name="service_status_enabled">Aktif</string>
     <string name="service_status_automatic">Otomatis</string>
     <string name="service_status_manual">Manual</string>

play-services-base/core/src/main/res/values-iw-rIL/values/strings.xml

@@ -5,13 +5,13 @@
   -->
 <resources>
     <!--Foreground service notification-->
-    <string name="foreground_service_notification_title">פעיל במפגש</string>
+    <string name="foreground_service_notification_title">פעיל ברקע</string>
     <!-- %1$s is a notification text such as "Exposure Notification" -->
-    <string name="foreground_service_notification_text" formatted="true">%1$s תורם בעדף</string>
+    <string name="foreground_service_notification_text" formatted="true">%1$s פועל ברקע</string>
     <!-- %1$s is a notification text such as "mnicroG Services" -->
-    <string name="foreground_service_notification_big_text">הסר %1$s מתוך אופטימיזציות סוללה או שנה את הגדרות התראה כדי להסתיר תראה זו</string>
+    <string name="foreground_service_notification_big_text">השמט את %1$s מתוך אופטימיזציות סוללה או שנה את הגדרות ההתראה כדי להסתיר התראה זו</string>
     <!--foreground service: notification actions-->
-    <string name="foreground_action_battery_optimization">Optimization של סוללה</string>
+    <string name="foreground_action_battery_optimization">מיטוב הסוללה</string>
     <string name="foreground_action_notification_settings">הגדרות</string>
     <!--Actionbar menu-->
     <string name="menu_settings">הגדרות</string>
@@ -23,7 +23,7 @@
     <string name="service_status_enabled">מופעל</string>
     <string name="service_status_automatic">אוטומטי</string>
     <string name="service_status_manual">ידני</string>
-    <string name="service_status_enabled_short">ON</string>
-    <string name="service_status_disabled_short">OFF</string>
+    <string name="service_status_enabled_short">דלוק</string>
+    <string name="service_status_disabled_short">כבוי</string>
     <!--Patchers names-->
 </resources>