Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 604617a9 authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Cleanup PoToken and Audit

parent d69a0f5a

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

+2 −2
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ 


        <!-- PoToken -->



        <service android:name="com.google.android.gms.potokens.internal.PoTokensApiService">

        <service android:name="org.microg.gms.potokens.PoTokensService">

            <intent-filter>

                <action android:name="com.google.android.gms.potokens.service.START" />

            </intent-filter>
@@ -859,7 +859,7 @@ 
            </intent-filter>

        </service>



        <service android:name="com.google.android.gms.audit.internal.AuditApiService">

        <service android:name="org.microg.gms.audit.AuditService">

            <intent-filter>

                <action android:name="com.google.android.gms.audit.service.START" />

            </intent-filter>

play-services-core/src/main/kotlin/com/google/android/gms/potokens/internal/PoTokensApiService.kt

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/*

 * SPDX-FileCopyrightText: 2023 microG Project Team

 * SPDX-License-Identifier: Apache-2.0

 */



package com.google.android.gms.potokens.internal



import android.util.Log

import androidx.lifecycle.lifecycleScope

import com.google.android.gms.common.Feature

import com.google.android.gms.common.api.CommonStatusCodes

import com.google.android.gms.common.internal.ConnectionInfo

import com.google.android.gms.common.internal.GetServiceRequest

import com.google.android.gms.common.internal.IGmsCallbacks

import com.google.android.gms.potokens.utils.PoTokenConstants

import org.microg.gms.BaseService

import org.microg.gms.common.GmsService



const val TAG = "PoTokensApi"



class PoTokensApiService : BaseService(TAG, GmsService.POTOKENS) {

    override fun handleServiceRequest(callback: IGmsCallbacks, request: GetServiceRequest, service: GmsService) {

        val connectionInfo = ConnectionInfo()

        connectionInfo.features = arrayOf(Feature(PoTokenConstants.PO_TOKENS, 1))

        Log.d(TAG, "PoTokensApiService handleServiceRequest")

        callback.onPostInitCompleteWithConnectionInfo(

            CommonStatusCodes.SUCCESS, PoTokensApiServiceImpl(

                applicationContext, request.packageName, lifecycleScope

            ), connectionInfo

        )

    }

}

play-services-core/src/main/kotlin/com/google/android/gms/audit/internal/AuditApiService.kt→play-services-core/src/main/kotlin/org/microg/gms/audit/AuditService.kt

+6 −5
Original line number Diff line number Diff line 
/*

 * SPDX-FileCopyrightText: 2023 microG Project Team

 * SPDX-FileCopyrightText: 2024 microG Project Team

 * SPDX-License-Identifier: Apache-2.0

 */



package com.google.android.gms.audit.internal

package org.microg.gms.audit



import android.util.Log

import com.google.android.gms.audit.LogAuditRecordsRequest

import com.google.android.gms.audit.internal.IAuditService

import com.google.android.gms.common.ConnectionResult

import com.google.android.gms.common.api.Status

import com.google.android.gms.common.api.internal.IStatusCallback
@@ -17,14 +18,14 @@ import org.microg.gms.common.GmsService 


private const val TAG = "AuditApiService"



class AuditApiService : BaseService(TAG, GmsService.AUDIT) {

class AuditService : BaseService(TAG, GmsService.AUDIT) {

    override fun handleServiceRequest(callback: IGmsCallbacks, request: GetServiceRequest, service: GmsService) {

        callback.onPostInitComplete(ConnectionResult.SUCCESS, AuditApiServiceImpl().asBinder(), null)

        callback.onPostInitComplete(ConnectionResult.SUCCESS, AuditServiceImpl().asBinder(), null)

    }



}



class AuditApiServiceImpl : IAuditService.Stub() {

class AuditServiceImpl : IAuditService.Stub() {



    override fun logAuditRecords(request: LogAuditRecordsRequest?, callback: IStatusCallback) {

        Log.d(TAG, "method 'logAuditRecords' not fully implemented, only return Status.SUCCESS")

play-services-core/src/main/kotlin/com/google/android/gms/potokens/utils/PoTokenConstants.kt→play-services-core/src/main/kotlin/org/microg/gms/potokens/PoTokenConstants.kt

+4 −6
Original line number Diff line number Diff line 
/*

 * SPDX-FileCopyrightText: 2023 microG Project Team

 * SPDX-FileCopyrightText: 2024 microG Project Team

 * SPDX-License-Identifier: Apache-2.0

 */



package com.google.android.gms.potokens.utils

package org.microg.gms.potokens



object PoTokenConstants {

    const val PO_TOKENS = "PO_TOKENS"

    const val TOKEN_URL =

        "https://deviceintegritytokens-pa.googleapis.com/v1/getPoIntegrityToken?alt=proto&key=AIzaSyBtL0AK6Hzgr69rQyeyhi-V1lmtsPGZd1M"

    const val TOKEN_URL = "https://deviceintegritytokens-pa.googleapis.com/v1/getPoIntegrityToken?alt=proto&key=AIzaSyBtL0AK6Hzgr69rQyeyhi-V1lmtsPGZd1M"

    const val TYPE_URL = "type.googleapis.com/google.crypto.tink.AesGcmKey"

    const val KEY_TOKEN = "po-token-fast"

    const val KEY_FAST = "po-fast-key"

play-services-core/src/main/kotlin/com/google/android/gms/potokens/utils/PoTokenHelper.kt→play-services-core/src/main/kotlin/org/microg/gms/potokens/PoTokenHelper.kt

+2 −3
Original line number Diff line number Diff line 
/*

 * SPDX-FileCopyrightText: 2023 microG Project Team

 * SPDX-FileCopyrightText: 2024 microG Project Team

 * SPDX-License-Identifier: Apache-2.0

 */



package com.google.android.gms.potokens.utils

package org.microg.gms.potokens



import android.content.Context

import android.text.TextUtils
@@ -26,7 +26,6 @@ import com.google.android.gms.potokens.KeySet 
import com.google.android.gms.potokens.PoTokenInfo

import com.google.android.gms.potokens.PoTokenResult

import com.google.android.gms.potokens.PoTokenResultWrap

import com.google.android.gms.potokens.internal.TAG

import com.google.android.gms.tasks.Tasks

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.withContext