Merge pull request #8 from WSTxda/dev

v5.2
WSTxda · Mar 24, 2024 · 0467078 · 0467078
2 parents 11109bc + d3f7dff
commit 0467078
Show file tree

Hide file tree

Showing 54 changed files with 244 additions and 319 deletions.
diff --git a/.github/matchers/gradle-build-matcher.json b/.github/matchers/gradle-build-matcher.json
@@ -4,7 +4,7 @@
       "owner": "gradle-build-matcher",
       "pattern": [
         {
-          "regexp": "^([^:]+):(\\d+):\\s(error|Error):\\s(.+)$",
+          "regexp": "^\\s*([^:]+):(\\d+):\\s(error|Error):\\s(.+)$",
           "file": 1,
           "line": 2,
           "severity": 3,

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,5 +41,7 @@ jobs:
               echo "Matcher configured: ${NAME:?}"
             fi
           done
-      - name: "Execute Gradle build"
-        run: "./gradlew --no-daemon build"
+      - name: "Execute Gradle assemble"
+        run: "./gradlew --no-daemon assemble"
+      - name: "Execute Gradle check"
+        run: "./gradlew --no-daemon check"
diff --git a/build.gradle b/build.gradle
@@ -82,8 +82,8 @@ allprojects {
     apply plugin: 'idea'
 
     group = 'org.microg.gms'
-    ext.appVersionName = 5.1
-    ext.appVersionCode = 240812000
+    ext.appVersionName = 5.2
+    ext.appVersionCode = 240856000
     ext.baseVersion = ext.appVersionCode.toString()[0..1] + '.' + ext.appVersionCode.toString()[2..3] + '.' + ext.appVersionCode.toString()[4..5]
     version = ext.appVersionName+" GMS-"+ext.baseVersion.replaceAll("\\.", "")
     ext.isReleaseVersion = false

diff --git a/fake-signature/src/huawei/java/com/huawei/signature/diff/AppListDatabaseOpenHelper.java b/fake-signature/src/huawei/java/com/huawei/signature/diff/AppListDatabaseOpenHelper.java
@@ -18,7 +18,7 @@ public class AppListDatabaseOpenHelper extends SQLiteOpenHelper {
     public static final String TABLE_APPLIST = "applist";
     public static final String COLUMN_NAME = "name";
     public static final String COLUMN_FAKE = "fake";
-    private static final int DATABASE_VERSION = 2;
+    private static final int DATABASE_VERSION = 3;
     private static final String DROP_APP_LIST_TABLE = "DROP TABLE IF EXISTS " + TABLE_APPLIST;
     private static final String CREATE_APP_LIST_TABLE = "CREATE TABLE IF NOT EXISTS " + TABLE_APPLIST + "(" +
             COLUMN_NAME + " VARCHAR(255) PRIMARY KEY, " +

diff --git a/fake-signature/src/main/res/values/arrays.xml b/fake-signature/src/main/res/values/arrays.xml
@@ -28,6 +28,10 @@
         <item>com.mobisoft.morhipo</item>
         <item>com.zzkko</item>
         <item>com.didilabs.kaavefali</item>
+        <item>com.airbnb.android</item>
+        <item>com.mobillium.papara</item>
+        <item>co.com.fincaraiz.app</item>
+        <item>com.frisby.frisby</item>
     </string-array>
     <string-array name="signature_never_fake">
         <item>com.truecaller</item>

diff --git a/play-services-base/core/src/main/kotlin/org/microg/gms/ui/AppPreference.kt b/play-services-base/core/src/main/kotlin/org/microg/gms/ui/AppPreference.kt
@@ -99,6 +99,9 @@ abstract class AppPreference : Preference {
             packageName.contains(".revanced.android") -> context.getString(R.string.revanced)
             packageName.contains(".rvx.android") -> context.getString(R.string.revanced_extended)
             packageName.contains(".rex.android") -> context.getString(R.string.youtube_advanced)
+            packageName.contains(".rve.android") -> context.getString(R.string.revanced_extended_rufusin)
+            packageName.contains("anddea.youtube") -> context.getString(R.string.revanced_extended_anddea)
+            packageName.contains("bill.youtube") -> context.getString(R.string.revanced_extended_anddea)
             else -> ""
         }
 

diff --git a/play-services-base/core/src/main/res/drawable/ic_expand_apps.xml b/play-services-base/core/src/main/res/drawable/ic_expand_apps.xml
@@ -5,17 +5,17 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="25dp"
+    android:height="25dp"
     android:tint="?attr/colorAccent"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="25"
+    android:viewportHeight="25">
     <group>
-        <clip-path android:pathData="M0 0H24V24H0z" />
+        <clip-path android:pathData="M.64.92H24.64V24.92H.64z" />
         <group>
             <path
-                android:fillColor="#FF000000"
-                android:pathData="M12.6 12L8 7.4 9.4 6l6 6-6 6L8 16.6l4.6-4.6Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M13.24 12.92l-3.9-3.9C9.16 8.83 9.07 8.6 9.07 8.32c0-0.29 0.1-0.52 0.27-0.7 0.19-0.19 0.42-0.28 0.7-0.28 0.29 0 0.52 0.1 0.7 0.28l4.6 4.6c0.1 0.1 0.17 0.2 0.22 0.32 0.04 0.12 0.06 0.24 0.06 0.38 0 0.13-0.02 0.26-0.06 0.37-0.05 0.12-0.12 0.23-0.22 0.33l-4.6 4.6c-0.18 0.18-0.41 0.27-0.7 0.27-0.28 0-0.51-0.09-0.7-0.27-0.18-0.19-0.27-0.42-0.27-0.7 0-0.29 0.1-0.52 0.27-0.7l3.9-3.9Z" />
         </group>
     </group>
 </vector>
diff --git a/play-services-base/core/src/main/res/drawable/ic_info_outline.xml b/play-services-base/core/src/main/res/drawable/ic_info_outline.xml
diff --git a/play-services-base/core/src/main/res/drawable/ic_information.xml b/play-services-base/core/src/main/res/drawable/ic_information.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ SPDX-FileCopyrightText: 2019, The Android Open Source Project
+  ~ SPDX-FileCopyrightText: 2020, microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group>
+        <clip-path android:pathData="M0 0H24V24H0z" />
+        <group>
+            <path
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M12 17c0.28 0 0.52-0.1 0.71-0.29C12.91 16.52 13 16.28 13 16v-4c0-0.28-0.1-0.52-0.29-0.71C12.52 11.09 12.28 11 12 11c-0.28 0-0.52 0.1-0.71 0.29C11.09 11.48 11 11.72 11 12v4c0 0.28 0.1 0.52 0.29 0.71C11.48 16.91 11.72 17 12 17Zm0-8c0.28 0 0.52-0.1 0.71-0.29C12.91 8.52 13 8.28 13 8c0-0.28-0.1-0.52-0.29-0.71C12.52 7.09 12.28 7 12 7c-0.28 0-0.52 0.1-0.71 0.29C11.09 7.48 11 7.72 11 8c0 0.28 0.1 0.52 0.29 0.71C11.48 8.91 11.72 9 12 9Zm0 13c-1.38 0-2.68-0.26-3.9-0.79-1.22-0.52-2.27-1.23-3.17-2.14-0.9-0.9-1.62-1.95-2.14-3.17C2.26 14.68 2 13.38 2 12s0.26-2.68 0.79-3.9C3.3 6.88 4.03 5.83 4.92 4.93c0.9-0.9 1.96-1.62 3.18-2.14C9.32 2.26 10.62 2 12 2s2.68 0.26 3.9 0.79c1.22 0.52 2.28 1.24 3.17 2.13 0.9 0.9 1.62 1.96 2.14 3.18C21.74 9.32 22 10.62 22 12s-0.26 2.68-0.79 3.9c-0.52 1.22-1.23 2.28-2.14 3.17-0.9 0.9-1.95 1.62-3.17 2.14C14.68 21.74 13.38 22 12 22Zm0-2c2.23 0 4.13-0.77 5.68-2.32C19.23 16.13 20 14.23 20 12c0-2.23-0.77-4.13-2.32-5.67C16.13 4.78 14.23 4 12 4 9.77 4 7.87 4.78 6.33 6.33 4.78 7.87 4 9.77 4 12s0.78 4.13 2.33 5.68C7.87 19.23 9.77 20 12 20Z" />
+        </group>
+    </group>
+</vector>
diff --git a/play-services-base/core/src/main/res/drawable/ic_open.xml b/play-services-base/core/src/main/res/drawable/ic_open.xml
@@ -14,8 +14,8 @@
         <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
-                android:pathData="M5 21c-0.55 0-1.02-0.2-1.41-0.59C3.19 20.02 3 19.55 3 19V5c0-0.55 0.2-1.02 0.59-1.41C3.98 3.19 4.45 3 5 3h7v2H5v14h14v-7h2v7c0 0.55-0.2 1.02-0.59 1.41C20.02 20.81 19.55 21 19 21H5Zm4.7-5.3l-1.4-1.4L17.6 5H14V3h7v7h-2V6.4l-9.3 9.3Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M5 21c-0.55 0-1.02-0.2-1.41-0.59C3.19 20.02 3 19.55 3 19V5c0-0.55 0.2-1.02 0.59-1.41C3.98 3.19 4.45 3 5 3h6c0.28 0 0.52 0.1 0.71 0.29C11.91 3.48 12 3.72 12 4c0 0.28-0.1 0.52-0.29 0.71C11.52 4.91 11.28 5 11 5H5v14h14v-6c0-0.28 0.1-0.52 0.29-0.71C19.48 12.09 19.72 12 20 12c0.28 0 0.52 0.1 0.71 0.29C20.91 12.48 21 12.72 21 13v6c0 0.55-0.2 1.02-0.59 1.41C20.02 20.81 19.55 21 19 21H5ZM19 6.4L10.4 15c-0.18 0.18-0.42 0.28-0.7 0.28-0.28 0-0.52-0.1-0.7-0.28-0.18-0.18-0.28-0.42-0.28-0.7 0-0.28 0.1-0.52 0.28-0.7L17.6 5H15c-0.28 0-0.52-0.1-0.71-0.29C14.09 4.52 14 4.28 14 4c0-0.28 0.1-0.52 0.29-0.71C14.48 3.09 14.72 3 15 3h5c0.28 0 0.52 0.1 0.71 0.29C20.91 3.48 21 3.72 21 4v5c0 0.28-0.1 0.52-0.29 0.71C20.52 9.91 20.28 10 20 10c-0.28 0-0.52-0.1-0.71-0.29C19.09 9.52 19 9.28 19 9V6.4Z" />
         </group>
     </group>
 </vector>
diff --git a/play-services-base/core/src/main/res/drawable/ic_patcher.xml b/play-services-base/core/src/main/res/drawable/ic_patcher.xml
@@ -9,7 +9,7 @@
         <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
+                android:fillColor="#FF1C1B1F"
                 android:pathData="M18.85 21.98c-0.13 0-0.26-0.03-0.38-0.07-0.11-0.04-0.22-0.11-0.32-0.21l-5.1-5.1c-0.1-0.1-0.17-0.2-0.21-0.33-0.04-0.11-0.06-0.24-0.06-0.37s0.02-0.26 0.06-0.38c0.04-0.11 0.11-0.22 0.21-0.32l2.13-2.13c0.1-0.1 0.2-0.17 0.32-0.2 0.12-0.05 0.24-0.07 0.38-0.07 0.13 0 0.25 0.02 0.37 0.06 0.12 0.04 0.23 0.12 0.32 0.21l5.1 5.1c0.1 0.1 0.18 0.21 0.22 0.33 0.04 0.12 0.06 0.24 0.06 0.38 0 0.13-0.02 0.25-0.06 0.37-0.04 0.12-0.12 0.23-0.21 0.32l-2.13 2.13c-0.1 0.1-0.2 0.17-0.32 0.21-0.12 0.04-0.25 0.07-0.38 0.07Zm0-2.38l0.72-0.73-3.67-3.67-0.72 0.73 3.67 3.67ZM5.12 22C5 22 4.87 21.98 4.75 21.93 4.6 21.88 4.5 21.8 4.4 21.7l-2.1-2.1c-0.1-0.1-0.17-0.21-0.22-0.34C2.02 19.14 2 19.01 2 18.87c0-0.13 0.02-0.25 0.08-0.37 0.04-0.12 0.12-0.23 0.22-0.32l5.3-5.3h2.13l0.84-0.86L6.45 7.9H5.03L2 4.87l2.83-2.82 3.02 3.03V6.5l4.13 4.13 2.9-2.9-1.08-1.08 1.4-1.4h-2.82l-0.7-0.7L15.21 1l0.7 0.7v2.83l1.4-1.4 3.55 3.54c0.29 0.29 0.5 0.6 0.65 0.97 0.16 0.36 0.23 0.74 0.23 1.14 0 0.4-0.07 0.78-0.23 1.15-0.14 0.36-0.36 0.69-0.64 0.97l-2.13-2.13-1.4 1.4-1.05-1.04-5.18 5.17v2.1l-5.3 5.3c-0.1 0.1-0.2 0.18-0.32 0.23C5.38 21.98 5.26 22 5.12 22Zm0-2.4l4.25-4.25v-0.72H8.65L4.4 18.87l0.72 0.73Zm0 0L4.4 18.87l0.38 0.36 0.34 0.37Z" />
         </group>
     </group>

diff --git a/play-services-base/core/src/main/res/values-pt-rBR/strings.xml b/play-services-base/core/src/main/res/values-pt-rBR/strings.xml
@@ -8,7 +8,7 @@
     <string name="foreground_service_notification_text"><xliff:g example="Exposure Notification">%1$s</xliff:g> está rodando em segundo plano</string>
     <string name="foreground_service_notification_big_text">Exclua o <xliff:g example="microG Services">%1$s</xliff:g> das otimizações de bateria ou altere as configurações de notificação para ocultar este aviso</string>
 
-    <string name="menu_advanced">Avançado</string>
+    <string name="menu_settings">Configurações</string>
 
     <string name="list_no_item_none">Nenhum</string>
     <string name="list_item_see_all">Ver todos</string>

diff --git a/play-services-base/core/src/main/res/values/strings.xml b/play-services-base/core/src/main/res/values/strings.xml
@@ -9,7 +9,7 @@
     <string name="foreground_service_notification_text"><xliff:g example="Exposure Notification">%1$s</xliff:g> is running in background</string>
     <string name="foreground_service_notification_big_text">Exclude <xliff:g example="microG Services">%1$s</xliff:g> from battery optimizations or change notification settings to hide this notification</string>
 
-    <string name="menu_advanced">Advanced</string>
+    <string name="menu_settings">Settings</string>
 
     <string name="list_no_item_none">None</string>
     <string name="list_item_see_all">See all</string>
@@ -27,6 +27,8 @@
 
     <string name="vanced">Vanced</string>
     <string name="revanced">ReVanced</string>
-    <string name="revanced_extended">ReVanced Extended</string>
     <string name="youtube_advanced">YT Advanced</string>
+    <string name="revanced_extended">ReVanced Extended</string>
+    <string name="revanced_extended_anddea">ReVanced Extended (Anddea)</string>
+    <string name="revanced_extended_rufusin">ReVanced Extended (Rufusin)</string>
 </resources>
diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml
@@ -25,8 +25,8 @@
         <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
-                android:pathData="M7.4 15.38L6 13.97l6-6 6 6-1.4 1.4-4.6-4.6-4.6 4.6Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M12 10.78l-3.9 3.9c-0.18 0.18-0.42 0.27-0.7 0.27-0.28 0-0.52-0.1-0.7-0.27-0.18-0.19-0.28-0.42-0.28-0.7 0-0.29 0.1-0.52 0.28-0.7l4.6-4.6c0.1-0.1 0.2-0.18 0.32-0.22C11.74 8.42 11.88 8.4 12 8.4s0.26 0.02 0.38 0.06c0.11 0.04 0.22 0.11 0.32 0.21l4.6 4.6c0.18 0.19 0.27 0.42 0.27 0.7 0 0.29-0.09 0.52-0.27 0.7-0.18 0.19-0.42 0.28-0.7 0.28-0.28 0-0.52-0.1-0.7-0.27l-3.9-3.9Z" />
         </group>
     </group>
 </vector>
diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml
@@ -22,11 +22,11 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <group>
-        <clip-path android:pathData="M.2.82H24.2V24.82H.2z" />
+        <clip-path android:pathData="M0 0H24V24H0z" />
         <group>
             <path
-                android:fillColor="#000000"
-                android:pathData="M12.2 16.2l-6-6 1.4-1.4 4.6 4.6 4.6-4.6 1.4 1.4-6 6Z" />
+                android:fillColor="#FF1C1B1F"
+                android:pathData="M12 14.95c-0.13 0-0.26-0.02-0.38-0.06-0.11-0.04-0.22-0.12-0.32-0.21l-4.6-4.6c-0.18-0.19-0.28-0.42-0.28-0.7 0-0.29 0.1-0.52 0.28-0.7C6.88 8.49 7.12 8.4 7.4 8.4c0.28 0 0.52 0.1 0.7 0.28l3.9 3.9 3.9-3.9c0.18-0.19 0.42-0.28 0.7-0.28 0.28 0 0.52 0.1 0.7 0.28 0.18 0.18 0.27 0.41 0.27 0.7 0 0.28-0.09 0.51-0.27 0.7l-4.6 4.6c-0.1 0.1-0.2 0.17-0.32 0.2-0.12 0.05-0.25 0.07-0.38 0.07Z" />
         </group>
     </group>
 </vector>
diff --git a/play-services-core/microg-ui-tools/src/main/res/layout-v21/preference_material.xml b/play-services-core/microg-ui-tools/src/main/res/layout-v21/preference_material.xml
diff --git a/play-services-core/microg-ui-tools/src/main/res/values/strings.xml b/play-services-core/microg-ui-tools/src/main/res/values/strings.xml
@@ -44,7 +44,7 @@
 
     <!-- UpdateChecker tag controller-->
 
-    <string name="github_tag_version">5.1</string>
+    <string name="github_tag_version">5.2</string>
 
     <!-- Updater strings-->
 
@@ -55,5 +55,4 @@
 
     <string name="error_connection">Connection error:</string>
     <string name="error_others">Error:</string>
-
 </resources>