Skip to content

Fix the exception about LoginActivity #2578

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
merged 2 commits into from
Nov 16, 2024
Merged

Fix the exception about LoginActivity #2578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef03f5f
Fixed the issue that multiple LoginActivity pages exist in the backgr…
DaVinci9196 Oct 12, 2024
eaba805
Optimize code logic
DaVinci9196 Nov 11, 2024
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
1 change: 1 addition & 0 deletions play-services-core/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@
android:configChanges="keyboardHidden|keyboard|orientation|screenSize"
android:exported="true"
android:process=":ui"
android:launchMode="singleTask"
android:theme="@style/Theme.LoginBlue">
<intent-filter>
<action android:name="com.google.android.gms.auth.login.LOGIN" />
Expand Down
7 changes: 4 additions & 3 deletions play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,12 @@ protected void onBackButtonClicked() {
}

public void loginCanceled() {
Log.d(TAG, "loginCanceled: ");
setResult(RESULT_CANCELED);
if (response != null) {
response.onError(AccountManager.ERROR_CODE_CANCELED, "Canceled");
}
finish();
if (SDK_INT >= LOLLIPOP) { finishAndRemoveTask(); } else finish();
}

@Override
Expand Down Expand Up @@ -383,7 +384,7 @@ public void onResponse(AuthResponse response) {
}
checkin(true);
returnSuccessResponse(account);
finish();
if (SDK_INT >= LOLLIPOP) { finishAndRemoveTask(); } else finish();
}

@Override
Expand Down Expand Up @@ -669,7 +670,7 @@ public final void showView() {
@JavascriptInterface
public final void skipLogin() {
Log.d(TAG, "JSBridge: skipLogin");
finish();
loginCanceled();
}

@JavascriptInterface
Expand Down