Skip to content

Fixed an issue where tapping the location sharing settings redirected to the login page. #3588

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

Open
DaVinci9196 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed an issue where tapping the location sharing settings redirected to the login page. #3588

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions play-services-core/src/main/java/org/microg/gms/ui/LocationSettingsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
public class LocationSettingsActivity extends Activity {

private final static String ACCOUNT_NAME = "account_name";
private final static String ACCOUNT_NAME_V2 = "accountName";

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
Expand All @@ -38,8 +39,17 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
Intent intent = new Intent(this, MainActivity.class);
intent.setAction(ACTION_LOCATION_SHARING);
Bundle extras = getIntent().getExtras();
if (extras != null && extras.containsKey(ACCOUNT_NAME)) {
intent.putExtra(EXTRA_ACCOUNT_NAME, extras.getString(ACCOUNT_NAME));
if (extras != null) {
String accountName = null;
if (extras.containsKey(ACCOUNT_NAME)) {
accountName = extras.getString(ACCOUNT_NAME);
}
else if (extras.containsKey(ACCOUNT_NAME_V2)) {
accountName = extras.getString(ACCOUNT_NAME_V2);
}
if (accountName != null) {
intent.putExtra(EXTRA_ACCOUNT_NAME, accountName);
}
}
startActivity(intent);
}
Expand Down