Merge pull request #14 from WSTxda/dev

5.4
WSTxda · Jun 5, 2024 · 64d0034 · 64d0034
2 parents 4986f3b + 3413e87
commit 64d0034
Show file tree

Hide file tree

Showing 29 changed files with 156 additions and 104 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
           distribution: "temurin"
           java-version: "17"
       - name: "Gradle Wrapper validation"
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/actions/wrapper-validation@v3
       - name: "Setup Gradle"
         uses: gradle/actions/setup-gradle@v3
       - name: "Setup matchers"

diff --git a/build.gradle b/build.gradle
@@ -7,32 +7,32 @@ buildscript {
     ext.applicationNamespace = "com.google.android.gms"
     ext.basePackageName = "app.revanced"
 
-    ext.annotationVersion = '1.7.1'
-    ext.appcompatVersion = '1.6.1'
+    ext.annotationVersion = '1.8.0'
+    ext.appcompatVersion = '1.7.0'
     ext.biometricVersion = '1.1.0'
-    ext.coreVersion = '1.12.0'
-    ext.fragmentVersion = '1.6.2'
-    ext.lifecycleVersion = '2.7.0'
+    ext.coreVersion = '1.13.1'
+    ext.fragmentVersion = '1.7.1'
+    ext.lifecycleVersion = '2.8.1'
     ext.loaderVersion = '1.1.0'
-    ext.materialVersion = '1.11.0'
+    ext.materialVersion = '1.12.0'
     ext.mediarouterVersion = '1.7.0'
     ext.multidexVersion = '2.0.1'
     ext.navigationVersion = '2.7.7'
     ext.preferenceVersion = '1.2.1'
     ext.recyclerviewVersion = '1.3.2'
-    ext.webkitVersion = '1.10.0'
+    ext.webkitVersion = '1.11.0'
 
     ext.coroutineVersion = '1.7.3'
-    ext.kotlinVersion = '1.9.23'
+    ext.kotlinVersion = '2.0.0'
 
     ext.cronetVersion = '102.5005.125'
     ext.okhttpVersion = '4.12.0'
     ext.slf4jVersion = '1.7.36'
     ext.volleyVersion = '1.2.1'
     ext.wearableVersion = '0.1.1'
-    ext.wireVersion = '4.9.8'
+    ext.wireVersion = '4.9.9'
 
-    ext.androidBuildGradleVersion = '8.3.0'
+    ext.androidBuildGradleVersion = '8.3.2'
 
     ext.androidBuildVersionTools = '34.0.0'
 
@@ -82,8 +82,8 @@ allprojects {
     apply plugin: 'idea'
 
     group = 'org.microg.gms'
-    ext.appVersionName = 5.3
-    ext.appVersionCode = 240914000
+    ext.appVersionName = 5.4
+    ext.appVersionCode = 242155000
     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/play-services-base/build.gradle b/play-services-base/build.gradle
@@ -30,12 +30,15 @@ android {
 
     buildFeatures {
         aidl = true
+        buildConfig = true
     }
 
     defaultConfig {
         versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
+
+        buildConfigField "String", "BASE_PACKAGE_NAME", "\"$basePackageName\""
     }
 
     compileOptions {

diff --git a/play-services-basement/src/main/AndroidManifest.xml b/play-services-basement/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <meta-data
-                android:name="com.google.android.gms.version"
+                android:name="${basePackageName}.android.gms.version"
                 android:value="$appVersionCode"/>
     </application>
 </manifest>
diff --git a/play-services-basement/src/main/java/org/microg/gms/gcm/GcmConstants.java b/play-services-basement/src/main/java/org/microg/gms/gcm/GcmConstants.java
@@ -63,6 +63,7 @@ public final class GcmConstants {
     public static final String EXTRA_SENDER_LEGACY = "legacy.sender";
     public static final String EXTRA_SEND_TO = "google.to";
     public static final String EXTRA_SEND_FROM = "google.from";
+    public static final String EXTRA_SENT_TIME = "google.sent_time";
     public static final String EXTRA_SIGNATURE = "sig";
     public static final String EXTRA_SUBSCIPTION = "subscription";
     public static final String EXTRA_SUBTYPE = "subtype";

diff --git a/play-services-cast-framework/build.gradle b/play-services-cast-framework/build.gradle
@@ -21,6 +21,10 @@ android {
         versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
+
+        manifestPlaceholders = [
+                basePackageName: "$basePackageName"
+        ]
     }
 
     compileOptions {

diff --git a/play-services-cast-framework/src/main/AndroidManifest.xml b/play-services-cast-framework/src/main/AndroidManifest.xml
@@ -9,21 +9,21 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
     <queries>
-        <package android:name="com.google.android.gms.policy_cast_dynamite"/>
+        <package android:name="${basePackageName}.android.gms.policy_cast_dynamite"/>
     </queries>
 
     <application>
         <receiver
-                android:name="com.google.android.gms.cast.framework.media.MediaIntentReceiver"
+                android:name="${basePackageName}.android.gms.cast.framework.media.MediaIntentReceiver"
                 android:exported="false"/>
 
         <service
-                android:name="com.google.android.gms.cast.framework.media.MediaNotificationService"
+                android:name="${basePackageName}.android.gms.cast.framework.media.MediaNotificationService"
                 android:exported="false"
                 android:foregroundServiceType="mediaPlayback"/>
 
         <service
-                android:name="com.google.android.gms.cast.framework.ReconnectionService"
+                android:name="${basePackageName}.android.gms.cast.framework.ReconnectionService"
                 android:exported="false"/>
     </application>
 

diff --git a/play-services-cast/core/build.gradle b/play-services-cast/core/build.gradle
@@ -32,6 +32,10 @@ android {
         versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
+
+        manifestPlaceholders = [
+                basePackageName: "$basePackageName"
+        ]
     }
 
     buildFeatures {

diff --git a/play-services-cast/core/src/main/AndroidManifest.xml b/play-services-cast/core/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
 
         <service android:name="org.microg.gms.cast.CastDeviceControllerService">
             <intent-filter>
-                <action android:name="com.google.android.gms.cast.service.BIND_CAST_DEVICE_CONTROLLER_SERVICE" />
+                <action android:name="${basePackageName}.android.gms.cast.service.BIND_CAST_DEVICE_CONTROLLER_SERVICE" />
             </intent-filter>
         </service>
     </application>

diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/preference_widget_radiobutton.xml b/play-services-core/microg-ui-tools/src/main/res/layout/preference_widget_radiobutton.xml
@@ -16,9 +16,9 @@
   -->
 
 <RadioButton android:id="@android:id/checkbox"
-             xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
-             android:layout_gravity="center"
-             android:clickable="false"
-             android:focusable="false"/>
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:clickable="false"
+    android:focusable="false" />
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.3</string>
+    <string name="github_tag_version">5.4</string>
 
     <!-- Updater strings-->
 

diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
@@ -71,7 +71,7 @@
     <uses-permission android:name="${basePackageName}.android.c2dm.permission.SEND" />
     <uses-permission android:name="${basePackageName}.android.gtalkservice.permission.GTALK_SERVICE" />
 
-    <uses-permission android:name="org.microg.gms.STATUS_BROADCAST" />
+    <uses-permission android:name="${basePackageName}.microg.gms.STATUS_BROADCAST" />
 
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -462,32 +462,27 @@
             android:taskAffinity="org.microg.gms.settings"
             android:theme="@style/AppTheme.Dialog">
             <intent-filter>
-                <action android:name="${basePackageName}.android.gms.accountsettings.MY_ACCOUNT" />
-                <action android:name="${basePackageName}.android.gms.accountsettings.ACCOUNT_PREFERENCES_SETTINGS" />
-                <action android:name="${basePackageName}.android.gms.accountsettings.PRIVACY_SETTINGS" />
-                <action android:name="${basePackageName}.android.gms.accountsettings.SECURITY_SETTINGS" />
+                <action android:name="com.google.android.gms.accountsettings.MY_ACCOUNT" />
+                <action android:name="com.google.android.gms.accountsettings.ACCOUNT_PREFERENCES_SETTINGS" />
+                <action android:name="com.google.android.gms.accountsettings.PRIVACY_SETTINGS" />
+                <action android:name="com.google.android.gms.accountsettings.SECURITY_SETTINGS" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <activity
-            android:name="org.microg.gms.accountsettings.ui.LoaderActivity"
+        <activity-alias
+            android:name="org.microg.gms.accountsettings.ui.ManagerActivity"
             android:process=":ui"
             android:exported="true"
             android:excludeFromRecents="true"
-            android:theme="@style/AppTheme.Dialog">
-            <intent-filter>
-                <action android:name="${basePackageName}.android.gms.accountsettings.action.VIEW_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+            android:targetActivity="org.microg.gms.ui.MainSettingsActivity"
+            android:taskAffinity="org.microg.gms.settings">
             <intent-filter>
-                <action android:name="${basePackageName}.android.gms.accountsettings.action.BROWSE_SETTINGS" />
-
+                <action android:name="com.google.android.gms.accountsettings.action.VIEW_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
-        </activity>
+        </activity-alias>
 
         <!-- Other -->
 

diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java b/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java
@@ -69,6 +69,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.net.ssl.SSLContext;
@@ -548,6 +549,8 @@ private void handleAppMessage(DataMessageStanza msg) {
         intent.setAction(ACTION_C2DM_RECEIVE);
         intent.putExtra(EXTRA_FROM, msg.from);
         intent.putExtra(EXTRA_MESSAGE_ID, msg.id);
+        if (msg.sent != null && msg.sent != 0) intent.putExtra(EXTRA_SENT_TIME, msg.sent);
+        if (msg.ttl != null && msg.ttl != 0) intent.putExtra(EXTRA_TTL, msg.ttl);
         if (msg.persistent_id != null) intent.putExtra(EXTRA_MESSAGE_ID, msg.persistent_id);
         if (msg.token != null) intent.putExtra(EXTRA_COLLAPSE_KEY, msg.token);
         if (msg.raw_data != null) {
@@ -560,6 +563,10 @@ private void handleAppMessage(DataMessageStanza msg) {
             intent.addFlags(Intent.FLAG_EXCLUDE_STOPPED_PACKAGES);
         }
         for (AppData appData : msg.app_data) {
+            if (appData.key == null) continue;
+            String key = appData.key.toLowerCase(Locale.US);
+            // Some keys are exclusively set by the client and not the app.
+            if (key.equals(EXTRA_FROM) || (key.startsWith("google.") && !key.startsWith("google.c."))) continue;
             intent.putExtra(appData.key, appData.value_);
         }