File tree Expand file tree Collapse file tree
play-services-core/src/main/java/org/microg/gms/ui Expand file tree Collapse file tree Original file line number Diff line number Diff line change 2929public class LocationSettingsActivity extends Activity {
3030
3131 private final static String ACCOUNT_NAME = "account_name" ;
32+ private final static String ACCOUNT_NAME_V2 = "accountName" ;
3233
3334 @ Override
3435 protected void onCreate (@ Nullable Bundle savedInstanceState ) {
@@ -38,8 +39,17 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
3839 Intent intent = new Intent (this , MainActivity .class );
3940 intent .setAction (ACTION_LOCATION_SHARING );
4041 Bundle extras = getIntent ().getExtras ();
41- if (extras != null && extras .containsKey (ACCOUNT_NAME )) {
42- intent .putExtra (EXTRA_ACCOUNT_NAME , extras .getString (ACCOUNT_NAME ));
42+ if (extras != null ) {
43+ String accountName = null ;
44+ if (extras .containsKey (ACCOUNT_NAME )) {
45+ accountName = extras .getString (ACCOUNT_NAME );
46+ }
47+ else if (extras .containsKey (ACCOUNT_NAME_V2 )) {
48+ accountName = extras .getString (ACCOUNT_NAME_V2 );
49+ }
50+ if (accountName != null ) {
51+ intent .putExtra (EXTRA_ACCOUNT_NAME , accountName );
52+ }
4353 }
4454 startActivity (intent );
4555 }
You can’t perform that action at this time.
0 commit comments