-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Implement CommonService #3213
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
DaVinci9196
wants to merge
1
commit into
microg:master
Choose a base branch
from
DaVinci9196:gms_common_service
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Implement CommonService #3213
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
10 changes: 10 additions & 0 deletions
10
...s-base/src/main/aidl/com/google/android/gms/common/internal/service/ICommonCallbacks.aidl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: 2026 microG Project Team | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package com.google.android.gms.common.internal.service; | ||
|
|
||
| interface ICommonCallbacks { | ||
| void onClearDefaultAccountResult(int statusCode); | ||
| } |
12 changes: 12 additions & 0 deletions
12
...ces-base/src/main/aidl/com/google/android/gms/common/internal/service/ICommonService.aidl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: 2026 microG Project Team | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package com.google.android.gms.common.internal.service; | ||
|
|
||
| import com.google.android.gms.common.internal.service.ICommonCallbacks; | ||
|
|
||
| interface ICommonService { | ||
| void clearDefaultAccount(in ICommonCallbacks callbacks) = 0; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
play-services-core/src/main/kotlin/org/microg/gms/common/GmsCommonService.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: 2026 microG Project Team | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package org.microg.gms.common | ||
|
|
||
| import android.content.Context | ||
| import android.util.Log | ||
| import androidx.lifecycle.Lifecycle | ||
| import androidx.lifecycle.LifecycleOwner | ||
| import androidx.lifecycle.lifecycleScope | ||
| import com.google.android.gms.common.ConnectionResult | ||
| import com.google.android.gms.common.internal.GetServiceRequest | ||
| import com.google.android.gms.common.internal.IGmsCallbacks | ||
| import com.google.android.gms.common.internal.service.ICommonCallbacks | ||
| import com.google.android.gms.common.internal.service.ICommonService | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.withContext | ||
| import org.microg.gms.BaseService | ||
| import org.microg.gms.auth.signin.SignInConfigurationService | ||
| import org.microg.gms.auth.signin.performSignOut | ||
|
|
||
| private const val TAG = "GmsCommonService" | ||
|
|
||
| class GmsCommonService : BaseService(TAG, GmsService.COMMON) { | ||
| override fun handleServiceRequest(callback: IGmsCallbacks?, request: GetServiceRequest, service: GmsService?) { | ||
| val packageName = PackageUtils.getAndCheckCallingPackage(this, request.packageName) ?: throw IllegalArgumentException("Missing package name") | ||
| Log.d(TAG, "handleServiceRequest: start: $packageName") | ||
| callback?.onPostInitComplete(ConnectionResult.SUCCESS, GmsCommonServiceImpl(this, packageName, lifecycle).asBinder(), null) | ||
| } | ||
| } | ||
|
|
||
| class GmsCommonServiceImpl(val context: Context, val packageName: String, override val lifecycle: Lifecycle) : ICommonService.Stub(), LifecycleOwner { | ||
| override fun clearDefaultAccount(callbacks: ICommonCallbacks?) { | ||
| Log.d(TAG, "clearDefaultAccount: packageName: $packageName") | ||
| lifecycleScope.launchWhenStarted { | ||
| withContext(Dispatchers.IO) { | ||
| val authOptions = SignInConfigurationService.getDefaultOptions(context, packageName) | ||
| val authAccount = SignInConfigurationService.getDefaultAccount(context, packageName) | ||
| if (authOptions != null && authAccount != null) { | ||
| Log.d(TAG, "$packageName:clear authAccount: ${authAccount.name} authOption:($authOptions)") | ||
| performSignOut(context, packageName, authOptions, authAccount) | ||
| } | ||
| SignInConfigurationService.setDefaultSignInInfo(context, packageName, null, null) | ||
| } | ||
| runCatching { callbacks?.onClearDefaultAccountResult(0) } | ||
| } | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The official implementation seems to not do any network interaction when
clearDefaultAccountis invoked, it really just clears the default.