etc
/
VancedMicroG
mirror of https://github.com/YTVanced/VancedMicroG
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Other preferences fixes

This commit is contained in:
Oizaro 2020-10-11 01:52:19 +02:00
parent f21b5b2740
commit 893874c04f
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
View File

@ -163,7 +163,7 @@ public class LoginActivity extends AssistantActivity {
state++;
if (state == 1) {
PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean(HuaweiButtonPreference, true).apply();
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(LoginButtonPreference, false)) {
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(LoginButtonPreference, true)) {
LastCheckinInfo.ClearCheckinInfo(this);
CheckinClient.brandSpoof = true;
PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean(LoginButtonPreference, true).apply();

11
play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java
View File

@ -36,6 +36,7 @@ public class GcmPrefs implements SharedPreferences.OnSharedPreferenceChangeListe
public static final String PREF_FULL_LOG = "gcm_full_log";
public static final String PREF_LAST_PERSISTENT_ID = "gcm_last_persistent_id";
public static final String PREF_CONFIRM_NEW_APPS = "gcm_confirm_new_apps";
public static final String START_PREF_ENABLE_GCM = "start_gcm_enable_mcs_service";
public static final String PREF_ENABLE_GCM = "gcm_enable_mcs_service";
public static final String PREF_NETWORK_MOBILE = "gcm_network_mobile";
@ -215,7 +216,15 @@ public class GcmPrefs implements SharedPreferences.OnSharedPreferenceChangeListe
}
public static void setEnabled(Context context, boolean newStatus) {
boolean changed = GcmPrefs.get(context).isEnabled() != newStatus;
boolean changed = false;
if (!PreferenceManager.getDefaultSharedPreferences(context).getBoolean(START_PREF_ENABLE_GCM, true)) {
changed = GcmPrefs.get(context).isEnabled() != newStatus;
} else {
if (GcmPrefs.get(context).isEnabled()) {
changed = true;
}
PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(START_PREF_ENABLE_GCM, false).apply();
}
PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(GcmPrefs.PREF_ENABLE_GCM, newStatus).apply();
if (!changed) return;
if (!newStatus) {