Add Bluetooth support for WearOS devices

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
           # Log available space
           df -h
       - name: "Checkout sources"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: "Setup Java"

.github/workflows/dependency-submission.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: "Checkout sources"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: "Setup Java"

build.gradle

@@ -24,6 +24,7 @@ buildscript {
     ext.preferenceVersion = '1.2.0'
     ext.recyclerviewVersion = '1.3.2'
     ext.webkitVersion = '1.10.0'
+    ext.workVersion = '2.7.0'
 
     ext.slf4jVersion = '1.7.36'
     ext.volleyVersion = '1.2.1'

play-services-auth/src/main/aidl/com/google/android/gms/auth/api/identity/ClearTokenRequest.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2025 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.auth.api.identity;
+
+parcelable ClearTokenRequest;

play-services-auth/src/main/aidl/com/google/android/gms/auth/api/identity/RevokeAccessRequest.aidl

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2025 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.google.android.gms.auth.api.identity;
+
+parcelable RevokeAccessRequest;

play-services-auth/src/main/aidl/com/google/android/gms/auth/api/identity/internal/IAuthorizationService.aidl

@@ -9,8 +9,13 @@ import com.google.android.gms.auth.api.identity.internal.IAuthorizationCallback;
 import com.google.android.gms.auth.api.identity.internal.IVerifyWithGoogleCallback;
 import com.google.android.gms.auth.api.identity.AuthorizationRequest;
 import com.google.android.gms.auth.api.identity.VerifyWithGoogleRequest;
+import com.google.android.gms.auth.api.identity.RevokeAccessRequest;
+import com.google.android.gms.auth.api.identity.ClearTokenRequest;
+import com.google.android.gms.common.api.internal.IStatusCallback;
 
 interface IAuthorizationService {
     void authorize(in IAuthorizationCallback callback, in AuthorizationRequest request) = 0;
     void verifyWithGoogle(in IVerifyWithGoogleCallback callback, in VerifyWithGoogleRequest request) = 1;
+    void revokeAccess(in IStatusCallback callback, in RevokeAccessRequest request) = 2;
+    void clearToken(in IStatusCallback callback, in ClearTokenRequest request) = 3;
 }

play-services-auth/src/main/java/com/google/android/gms/auth/api/identity/RevokeAccessRequest.java

@@ -143,4 +143,13 @@ public static abstract class Builder {
     public void writeToParcel(@NonNull Parcel parcel, int flags) {
         CREATOR.writeToParcel(this, parcel, flags);
     }
+
+    @Override
+    public String toString() {
+        return "RevokeAccessRequest{" +
+                "scopes=" + scopes +
+                ", account=" + account +
+                ", sessionId='" + sessionId + '\'' +
+                '}';
+    }
 }

play-services-base/core/src/main/kotlin/org/microg/gms/common/AccountUtils.kt

@@ -0,0 +1,50 @@
+/**
+ * SPDX-FileCopyrightText: 2025 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.common
+
+import android.accounts.Account
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Context.MODE_PRIVATE
+import androidx.core.content.edit
+import org.microg.gms.auth.AuthConstants
+
+class AccountUtils(val context: Context) {
+
+    private val prefs = context.getSharedPreferences("common.selected_account_prefs", MODE_PRIVATE)
+
+    companion object {
+        private const val TYPE = "selected_account_type:"
+        @SuppressLint("StaticFieldLeak")
+        @Volatile
+        private var instance: AccountUtils? = null
+        fun get(context: Context): AccountUtils = instance ?: synchronized(this) {
+            instance ?: AccountUtils(context.applicationContext).also { instance = it }
+        }
+    }
+
+    fun saveSelectedAccount(packageName: String, account: Account?) {
+        if (account != null) {
+            prefs.edit(true) {
+                putString(packageName, account.name)
+                putString(TYPE.plus(packageName), account.type)
+            }
+        }
+    }
+
+    fun getSelectedAccount(packageName: String): Account? {
+        val name = prefs.getString(packageName, null) ?: return null
+        val type = prefs.getString(TYPE.plus(packageName), AuthConstants.DEFAULT_ACCOUNT_TYPE) ?: return null
+        return Account(name, type)
+    }
+
+    fun removeSelectedAccount(packageName: String) {
+        prefs.edit {
+            remove(packageName)
+            remove(TYPE.plus(packageName))
+        }
+    }
+}

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

@@ -279,6 +279,7 @@ object SettingsContract {
         const val ASSET_DEVICE_SYNC = "vending_device_sync"
         const val APPS_INSTALL = "vending_apps_install"
         const val APPS_INSTALLER_LIST = "vending_apps_installer_list"
+        const val PLAY_INTEGRITY_APP_LIST = "vending_play_integrity_apps"
 
         val PROJECTION = arrayOf(
             LICENSING,
@@ -289,6 +290,7 @@ object SettingsContract {
             ASSET_DEVICE_SYNC,
             APPS_INSTALL,
             APPS_INSTALLER_LIST,
+            PLAY_INTEGRITY_APP_LIST
         )
     }
 

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

@@ -369,6 +369,7 @@ class SettingsProvider : ContentProvider() {
             Vending.SPLIT_INSTALL -> getSettingsBoolean(key, false)
             Vending.APPS_INSTALL -> getSettingsBoolean(key, false)
             Vending.APPS_INSTALLER_LIST -> getSettingsString(key, "")
+            Vending.PLAY_INTEGRITY_APP_LIST -> getSettingsString(key, "")
             else -> throw IllegalArgumentException("Unknown key: $key")
         }
     }
@@ -386,6 +387,7 @@ class SettingsProvider : ContentProvider() {
                 Vending.ASSET_DEVICE_SYNC -> editor.putBoolean(key, value as Boolean)
                 Vending.APPS_INSTALL -> editor.putBoolean(key, value as Boolean)
                 Vending.APPS_INSTALLER_LIST -> editor.putString(key, value as String)
+                Vending.PLAY_INTEGRITY_APP_LIST -> editor.putString(key, value as String)
                 else -> throw IllegalArgumentException("Unknown key: $key")
             }
         }

play-services-base/core/src/main/kotlin/org/microg/gms/vending/PlayIntegrityData.kt

@@ -0,0 +1,71 @@
+/**
+ * SPDX-FileCopyrightText: 2025 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.vending
+
+import org.json.JSONException
+import org.json.JSONObject
+
+class PlayIntegrityData(var allowed: Boolean,
+                        val packageName: String,
+                        val pkgSignSha256: String,
+                        var lastTime: Long,
+                        var lastResult: String? = null,
+                        var lastStatus: Boolean = false) {
+
+    override fun toString(): String {
+        return JSONObject()
+            .put(ALLOWED, allowed)
+            .put(PACKAGE_NAME, packageName)
+            .put(SIGNATURE, pkgSignSha256)
+            .put(LAST_VISIT_TIME, lastTime)
+            .put(LAST_VISIT_RESULT, lastResult)
+            .put(LAST_VISIT_STATUS, lastStatus)
+            .toString()
+    }
+
+    companion object {
+        private const val PACKAGE_NAME = "packageName"
+        private const val ALLOWED = "allowed"
+        private const val SIGNATURE = "signature"
+        private const val LAST_VISIT_TIME = "lastVisitTime"
+        private const val LAST_VISIT_RESULT = "lastVisitResult"
+        private const val LAST_VISIT_STATUS = "lastVisitStatus"
+
+        private fun parse(jsonString: String): PlayIntegrityData? {
+            try {
+                val json = JSONObject(jsonString)
+                return PlayIntegrityData(
+                    json.getBoolean(ALLOWED),
+                    json.getString(PACKAGE_NAME),
+                    json.getString(SIGNATURE),
+                    json.getLong(LAST_VISIT_TIME),
+                    json.getString(LAST_VISIT_RESULT),
+                    json.getBoolean(LAST_VISIT_STATUS)
+                )
+            } catch (e: JSONException) {
+                return null
+            }
+        }
+
+        fun loadDataSet(content: String): Set<PlayIntegrityData> {
+            return content.split("|").mapNotNull { parse(it) }.toSet()
+        }
+
+        fun updateDataSetString(channelList: Set<PlayIntegrityData>, channel: PlayIntegrityData): String {
+            val channelData = channelList.find { it.packageName == channel.packageName && it.pkgSignSha256 == channel.pkgSignSha256 }
+            val newChannelList = if (channelData != null) {
+                channelData.allowed = channel.allowed
+                channelData.lastTime = channel.lastTime
+                channelData.lastResult = channel.lastResult
+                channelData.lastStatus = channel.lastStatus
+                channelList
+            } else {
+                channelList + channel
+            }
+            return newChannelList.let { it -> it.joinToString(separator = "|") { it.toString() } }
+        }
+    }
+}

play-services-core/build.gradle

@@ -102,6 +102,8 @@ dependencies {
 
     implementation "androidx.lifecycle:lifecycle-service:$lifecycleVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+
+    implementation "androidx.work:work-runtime-ktx:$workVersion"
 }
 
 android {

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

@@ -30,6 +30,7 @@
 
     <string name="self_check_cat_permissions">権限付与</string>
     <string name="self_check_name_permission">%1$sの権限:</string>
+    <string name="self_check_name_permission_interact_across_profiles">仕事用プロファイルを操作する権限:</string>
     <string name="self_check_resolution_permission">ここをタップして権限を付与してください。 権限を付与しないと、アプリが正しく動作しない可能性があります。</string>
 
     <string name="about_root_title">microG UIデモ</string>

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

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2013-2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <string name="lib_name">เครื่องมือส่วนต่อประสานกับผู้ใช้ของ microG</string>
+    <string name="lib_license">Apache License 2.0, ทีม microG</string>
+
+    <string name="about_version_str">เวอร์ชัน %1$s</string>
+    <string name="about_name_version_str">%1$s %2$s</string>
+    <string name="about_default_license">สงวนลิขสิทธิ์ทุกประการ</string>
+
+    <string name="prefcat_setup">ตั้งค่า</string>
+
+    <string name="self_check_title">โมดูลการตรวจสอบด้วยตนเอง</string>
+    <string name="self_check_desc">ตรวจสอบว่าระบบได้รับการตั้งค่าอย่างถูกต้องเพื่อใช้งาน microG หรือไม่</string>
+
+    <string name="self_check_cat_permissions">ได้รับสิทธิ์แล้ว</string>
+    <string name="self_check_name_permission">สิทธิ์ในการเข้าถึง %1$s:</string>
+    <string name="self_check_name_permission_interact_across_profiles">สิทธิ์ในการโต้ตอบกับโปรไฟล์งานของบริษัท:</string>
+    <string name="self_check_resolution_permission">แตะที่นี้เพื่อทำการให้สิทธิ์ การไม่ให้สิทธิ์อาจจะส่งผลให้เกิดพฤติกรรมไม่เหมาะสม</string>
+
+    <string name="about_root_title">สาธิตส่วนต่อประสานกับผู้ใช้ของ microG</string>
+    <string name="about_root_summary">สรุป</string>
+    <string name="about_root_version">เวอร์ชัน v0.1.0</string>
+    <string name="about_root_libraries">ไลบรารีสนับสนุน</string>
+
+    <string name="about_android_support_v4">ไลบรารีสนับสนุนเวอร์ชัน 4</string>
+    <string name="about_android_support_v7_appcompat">ไลบรารีสนับสนุน appcompat เวอร์ชัน 7</string>
+    <string name="about_android_support_v7_preference">ไลบรารีสนับสนุนการตั้งค่า เวอร์ชัน 7</string>
+    <string name="about_android_support_license">Apache License 2.0, The Android Open Source Project</string>
+</resources>

play-services-core/src/main/AndroidManifest.xml

@@ -376,8 +376,9 @@
             android:exported="false"
             android:process=":persistent">
             <intent-filter>
-                <action android:name="org.microg.gms.gcm.REGISTERED" />
+                <action android:name="org.microg.gms.gcm.CONNECTED" />
                 <action android:name="org.microg.gms.gcm.REGISTER_ACCOUNT" />
+                <action android:name="org.microg.gms.gcm.REGISTER_ALL_ACCOUNTS" />
                 <action android:name="org.microg.gms.gcm.NOTIFY_COMPLETE" />
 
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
@@ -420,8 +421,7 @@
         </receiver>
 
         <receiver
-            android:name="org.microg.gms.gcm.UnregisterReceiver"
-            android:process=":persistent">
+            android:name="org.microg.gms.common.PersistentTrustedReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_DATA_CLEARED" />
                 <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />

play-services-core/src/main/java/org/microg/gms/gcm/McsService.java

@@ -81,8 +81,8 @@
 import static android.app.AlarmManager.ELAPSED_REALTIME_WAKEUP;
 import static android.os.Build.VERSION.SDK_INT;
 import static org.microg.gms.common.PackageUtils.warnIfNotPersistentProcess;
+import static org.microg.gms.gcm.ExtensionsKt.ACTION_GCM_CONNECTED;
 import static org.microg.gms.gcm.GcmConstants.*;
-import static org.microg.gms.gcm.ExtensionsKt.ACTION_GCM_REGISTERED;
 import static org.microg.gms.gcm.McsConstants.*;
 
 @ForegroundServiceInfo(value = "Cloud messaging", resName = "service_name_mcs", resPackage = "com.google.android.gms")
@@ -497,15 +497,15 @@ private void handleLoginResponse(LoginResponse loginResponse) {
         if (loginResponse.error == null) {
             GcmPrefs.clearLastPersistedId(this);
             logd(this, "Logged in");
-            notifyGcmRegistered();
+            notifyGcmConnected();
             wakeLock.release();
         } else {
             throw new RuntimeException("Could not login: " + loginResponse.error);
         }
     }
 
-    private void notifyGcmRegistered() {
-        Intent intent = new Intent(ACTION_GCM_REGISTERED);
+    private void notifyGcmConnected() {
+        Intent intent = new Intent(ACTION_GCM_CONNECTED);
         intent.setPackage(Constants.GMS_PACKAGE_NAME);
         sendBroadcast(intent);
     }