Skip to content

fix: Apply various sign-in fixes #146

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.

Sign up for GitHub

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

Merged
LisoUseInAIKyrios merged 6 commits into from
Mar 21, 2026
Merged

fix: Apply various sign-in fixes #146

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ddef22a
fix: Set correct ActivityResult status code when finishing auth sign in
hoo-dles Mar 18, 2026
e1f0140
fix: Use original GMS package name for auth request
hoo-dles Mar 18, 2026
59c57ee
fix: Fix layout inflation crash of sign-in picker
hoo-dles Mar 18, 2026
f8e3db2
fix: Update `findCreator` method from upstream
hoo-dles Mar 18, 2026
f0d5143
remove requested scope whitelist
hoo-dles Mar 19, 2026
b2968c3
fix: Properly constrain permission dialog height
hoo-dles Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion play-services-core/src/main/java/org/microg/gms/auth/AuthRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public AuthRequest appIsGms() {
}

public AuthRequest callerIsGms() {
return caller(Constants.GMS_PACKAGE_NAME, Constants.GMS_PACKAGE_SIGNATURE_SHA1);
return caller(Constants.GOOGLE_GMS_PACKAGE_NAME, Constants.GMS_PACKAGE_SIGNATURE_SHA1);
Copy link
Copy Markdown
Author

@hoo-dles hoo-dles Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We want the auth request to have the caller as com.google.android.gms, not app.revanced.android.gms

}

public AuthRequest callerIsApp() {
Expand Down
2 changes: 1 addition & 1 deletion play-services-core/src/main/kotlin/org/microg/gms/auth/signin/AuthSignInActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ class AuthSignInActivity : AppCompatActivity() {
})
}
Log.d(TAG, "Result: ${data.extras?.also { it.keySet() }}")
setResult(statusCode, data)
setResult(RESULT_OK, data)
Copy link
Copy Markdown
Author

@hoo-dles hoo-dles Mar 18, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This caused a problem where the initiating app got the ActivityResult back. The previously used CommonStatusCodes.SUCCESS maps to 0, which is defined as ActvityResult.RESULT_CANCELED. The expected RESULT_OK is equal to -1.

Copy link
Copy Markdown
Author

@hoo-dles hoo-dles Mar 18, 2026 •
edited by LisoUseInAIKyrios
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at upstream, this was already fixed: https://github.com/microg/GmsCore/blob/48bc2bb11c22ab9f943a35364cedcc95a0157392/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/AuthSignInActivity.kt#L232

There's a lot more changes, though, that aren't a clean merge.

finish()
}

Expand Down