Merge pull request #7 from WSTxda/dev

v5.1

.github/matchers/gradle-build-kotlin-error-matcher.json

@@ -0,0 +1,17 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "gradle-build-kotlin-error-matcher",
+      "severity": "error",
+      "pattern": [
+        {
+          "regexp": "^e:\\sfile:\/\/([^:]+):(\\d+):(\\d+)\\s(.+)$",
+          "file": 1,
+          "line": 2,
+          "column": 3,
+          "message": 4
+        }
+      ]
+    }
+  ]
+}

.github/matchers/gradle-build-kotlin-error-matcher.json.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: none
+SPDX-License-Identifier: CC0-1.0

.github/matchers/gradle-build-matcher.json

@@ -0,0 +1,16 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "gradle-build-matcher",
+      "pattern": [
+        {
+          "regexp": "^([^:]+):(\\d+):\\s(error|Error):\\s(.+)$",
+          "file": 1,
+          "line": 2,
+          "severity": 3,
+          "message": 4
+        }
+      ]
+    }
+  ]
+}

.github/matchers/gradle-build-matcher.json.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: none
+SPDX-License-Identifier: CC0-1.0

.github/workflows/build.yml

@@ -1,18 +1,45 @@
-name: Build
-on: [pull_request, push]
+name: "Gradle build"
+permissions: {}
+on:
+  - push
+  - pull_request
+  - workflow_dispatch
+
 jobs:
   build:
+    name: "Gradle build"
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v2
+      - name: "Checkout sources"
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-java@v3
+      - name: "Setup Java"
+        uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: 'gradle'
-      - run: ./gradlew --no-daemon build
-        env:
-          TERM: dumb
-          JAVA_OPTS: -Xmx2048m
+          distribution: "temurin"
+          java-version: "17"
+      - name: "Gradle Wrapper validation"
+        uses: gradle/wrapper-validation-action@v2
+      - name: "Setup Gradle"
+        uses: gradle/actions/setup-gradle@v3
+      - name: "Setup matchers"
+        run: |
+          # Setting up matchers...
+
+          matchers_dir='${{ github.workspace }}/.github/matchers'
+          matcher_list()
+          {
+            echo 'gradle-build-matcher.json'
+            echo 'gradle-build-kotlin-error-matcher.json'
+          }
+
+          matcher_list | while IFS='' read -r NAME; do
+            if test -f "${matchers_dir:?}/${NAME:?}"; then
+              echo "::add-matcher::${matchers_dir:?}/${NAME:?}"
+              echo "Matcher configured: ${NAME:?}"
+            fi
+          done
+      - name: "Execute Gradle build"
+        run: "./gradlew --no-daemon build"

build.gradle

@@ -7,41 +7,41 @@ buildscript {
     ext.applicationNamespace = "com.google.android.gms"
     ext.basePackageName = "com.mgoogle"
 
-    ext.cronetVersion = '102.5005.125'
-    ext.wearableVersion = '0.1.1'
-
-    ext.kotlinVersion = '1.7.22'
-    ext.coroutineVersion = '1.6.4'
-
-    ext.annotationVersion = '1.6.0'
+    ext.annotationVersion = '1.7.1'
     ext.appcompatVersion = '1.6.1'
     ext.biometricVersion = '1.1.0'
-    ext.coreVersion = '1.9.0'
-    ext.fragmentVersion = '1.5.5'
-    ext.lifecycleVersion = '2.6.1'
-    ext.materialVersion = '1.9.0'
+    ext.coreVersion = '1.12.0'
+    ext.fragmentVersion = '1.6.2'
+    ext.lifecycleVersion = '2.7.0'
     ext.loaderVersion = '1.1.0'
-    ext.mediarouterVersion = '1.4.0'
+    ext.materialVersion = '1.11.0'
+    ext.mediarouterVersion = '1.6.0'
     ext.multidexVersion = '2.0.1'
-    ext.navigationVersion = '2.6.0'
+    ext.navigationVersion = '2.7.7'
     ext.preferenceVersion = '1.2.0'
-    ext.recyclerviewVersion = '1.2.0'
-    ext.webkitVersion = '1.7.0'
+    ext.recyclerviewVersion = '1.3.2'
+    ext.webkitVersion = '1.10.0'
 
+    ext.coroutineVersion = '1.7.3'
+    ext.kotlinVersion = '1.9.22'
+
+    ext.cronetVersion = '102.5005.125'
+    ext.okhttpVersion = '4.12.0'
     ext.slf4jVersion = '1.7.36'
     ext.volleyVersion = '1.2.1'
-    ext.wireVersion = '4.8.0'
+    ext.wearableVersion = '0.1.1'
+    ext.wireVersion = '4.9.7'
 
-    ext.androidBuildGradleVersion = '8.0.2'
+    ext.androidBuildGradleVersion = '8.3.0'
 
-    ext.androidBuildVersionTools = '33.0.2'
+    ext.androidBuildVersionTools = '34.0.0'
 
     ext.androidMinSdk = 23
     ext.androidTargetSdk = 29
-    ext.androidCompileSdk = 33
+    ext.androidCompileSdk = 34
 
     ext.localProperties = new Properties()
-    
+
     ext.includeProjects = [
             ':play-services-base-core',
             ':play-services-cast-core',
@@ -82,8 +82,8 @@ allprojects {
     apply plugin: 'idea'
 
     group = 'org.microg.gms'
-    ext.appVersionName = 5.0
-    ext.appVersionCode = 240515000
+    ext.appVersionName = 5.1
+    ext.appVersionCode = 240812000
     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

fake-signature/src/main/res/values/arrays.xml

@@ -8,6 +8,26 @@
         <item>com.google.android.gms</item>
         <item>com.android.vending</item>
         <item>com.spotify.music</item>
+        <item>com.getir</item>
+        <item>com.pozitron.iscep</item>
+        <item>com.widgetable.theme.android</item>
+        <item>pro.huobi</item>
+        <item>com.tarparos.phigaea</item>
+        <item>com.artem.scotepio</item>
+        <item>com.sabah.deprembs</item>
+        <item>com.boynergrup.hopi</item>
+        <item>com.belbim.istanbulkart</item>
+        <item>com.a101.plus</item>
+        <item>com.widgetable.theme.android</item>
+        <item>net.wargaming.wot.blitz</item>
+        <item>com.litatom.app</item>
+        <item>com.ataexpress.tiklagelsin</item>
+        <item>tr.com.petrolofisi</item>
+        <item>com.mobisoft.beymen</item>
+        <item>com.unilever.algida</item>
+        <item>com.mobisoft.morhipo</item>
+        <item>com.zzkko</item>
+        <item>com.didilabs.kaavefali</item>
     </string-array>
     <string-array name="signature_never_fake">
         <item>com.truecaller</item>

gradle.properties

@@ -1,6 +1,5 @@
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx4096m -XX:+UseParallelGC --add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
-android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
 android.experimental.legacyTransform.forceNonIncremental=true
 android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -3,6 +3,7 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -56,7 +56,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -81,10 +81,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -144,12 +144,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -206,6 +210,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -15,7 +15,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -26,7 +26,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -41,7 +42,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -76,13 +77,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

play-services-base/core/build.gradle

@@ -38,6 +38,7 @@ android {
 
     buildFeatures {
         dataBinding = true
+        buildConfig true
     }
 
     sourceSets {

play-services-base/core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt

@@ -85,11 +85,13 @@ object SettingsContract {
         const val TRUST_GOOGLE = "auth_manager_trust_google"
         const val VISIBLE = "auth_manager_visible"
         const val INCLUDE_ANDROID_ID = "auth_include_android_id"
+        const val STRIP_DEVICE_NAME = "auth_strip_device_name"
 
         val PROJECTION = arrayOf(
             TRUST_GOOGLE,
             VISIBLE,
             INCLUDE_ANDROID_ID,
+            STRIP_DEVICE_NAME,
         )
     }
 

play-services-base/core/src/main/kotlin/org/microg/gms/settings/SettingsProvider.kt

@@ -199,6 +199,7 @@ class SettingsProvider : ContentProvider() {
             Auth.TRUST_GOOGLE -> getSettingsBoolean(key, true)
             Auth.VISIBLE -> getSettingsBoolean(key, false)
             Auth.INCLUDE_ANDROID_ID -> getSettingsBoolean(key, true)
+            Auth.STRIP_DEVICE_NAME -> getSettingsBoolean(key, false)
             else -> throw IllegalArgumentException("Unknown key: $key")
         }
     }
@@ -211,6 +212,7 @@ class SettingsProvider : ContentProvider() {
                 Auth.TRUST_GOOGLE -> editor.putBoolean(key, value as Boolean)
                 Auth.VISIBLE -> editor.putBoolean(key, value as Boolean)
                 Auth.INCLUDE_ANDROID_ID -> editor.putBoolean(key, value as Boolean)
+                Auth.STRIP_DEVICE_NAME -> editor.putBoolean(key, value as Boolean)
                 else -> throw IllegalArgumentException("Unknown key: $key")
             }
         }

play-services-base/core/src/main/kotlin/org/microg/gms/ui/AppPreference.kt

@@ -98,7 +98,7 @@ abstract class AppPreference : Preference {
             packageName.contains(".vanced.android") -> context.getString(R.string.vanced)
             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(".rex.android") -> context.getString(R.string.youtube_advanced)
             else -> ""
         }
 

play-services-base/core/src/main/res/drawable/ic_patcher.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="#000000"
+                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>
+</vector>