diff --git a/play-services-core/src/main/java/org/microg/gms/ui/SettingsFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/SettingsFragment.java index e1fda778..e8bcd0ee 100755 --- a/play-services-core/src/main/java/org/microg/gms/ui/SettingsFragment.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/SettingsFragment.java @@ -1,16 +1,11 @@ package org.microg.gms.ui; -import android.content.ComponentName; -import android.content.pm.PackageManager; import android.os.Bundle; import androidx.annotation.Nullable; import androidx.navigation.NavOptions; import androidx.navigation.fragment.NavHostFragment; -import androidx.preference.Preference; -import androidx.preference.SwitchPreferenceCompat; -import com.google.android.gms.cast.media.CastMediaRouteProviderService; import com.mgoogle.android.gms.R; import org.microg.gms.checkin.CheckinPrefs; @@ -18,56 +13,40 @@ import org.microg.gms.gcm.GcmDatabase; import org.microg.gms.gcm.GcmPrefs; import org.microg.tools.ui.ResourceSettingsFragment; -public class SettingsFragment extends ResourceSettingsFragment -{ +public class SettingsFragment extends ResourceSettingsFragment { public static final String PREF_ABOUT = "pref_about"; public static final String PREF_GCM = "pref_gcm"; public static final String PREF_CHECKIN = "pref_checkin"; - public static final String PREF_CAST_DOUBLE_FIX_ENABLED = "pref_cast_double_fix_enabled"; - public SettingsFragment() - { + public SettingsFragment() { preferencesResource = R.xml.preferences_start; } @Override - public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) - { + public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) { super.onCreatePreferences(savedInstanceState, rootKey); updateDetails(); } @Override - public void onResume() - { + public void onResume() { super.onResume(); updateDetails(); } - private void updateDetails() - { + private void updateDetails() { findPreference(PREF_ABOUT).setSummary(getString(R.string.about_version_str, AboutFragment.getSelfVersion(getContext()))); findPreference(PREF_ABOUT).setOnPreferenceClickListener(preference -> { UtilsKt.navigate(NavHostFragment.findNavController(SettingsFragment.this), getContext(), R.id.openAbout, null); return true; }); - findPreference(PREF_CAST_DOUBLE_FIX_ENABLED).setOnPreferenceChangeListener((preference, newValue) -> { - boolean isEnabled = (boolean) newValue; - getContext().getPackageManager().setComponentEnabledSetting( - new ComponentName(getContext().getApplicationContext(), CastMediaRouteProviderService.class), - isEnabled ? PackageManager.COMPONENT_ENABLED_STATE_DISABLED : PackageManager.COMPONENT_ENABLED_STATE_ENABLED, - PackageManager.DONT_KILL_APP); - return true; - }); - if (GcmPrefs.get(getContext()).isEnabled()) - { + if (GcmPrefs.get(getContext()).isEnabled()) { GcmDatabase database = new GcmDatabase(getContext()); int regCount = database.getRegistrationList().size(); database.close(); findPreference(PREF_GCM).setSummary(getString(R.string.service_status_enabled_short) + " - " + getResources().getQuantityString(R.plurals.gcm_registered_apps_counter, regCount, regCount)); - } else - { + } else { findPreference(PREF_GCM).setSummary(R.string.service_status_disabled_short); } findPreference(PREF_GCM).setOnPreferenceClickListener(preference -> { diff --git a/play-services-core/src/main/res/drawable/ic_cast_black.xml b/play-services-core/src/main/res/drawable/ic_cast_black.xml deleted file mode 100644 index 001d433f..00000000 --- a/play-services-core/src/main/res/drawable/ic_cast_black.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml index 341364a3..98fbb870 100755 --- a/play-services-core/src/main/res/values/strings.xml +++ b/play-services-core/src/main/res/values/strings.xml @@ -106,7 +106,6 @@ This can take a couple of minutes." Ask before registering a new app to receive push notifications About Vanced microG - Cast duplication fix Registers your device to Google services and creates a unique device identifier. Vanced microG strips identifying bits other than your Google account name from registration data. Status @@ -136,6 +135,5 @@ This can take a couple of minutes." official server third-party server self-signed certificate - Enable this if you see duplicates in your casting menu diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml index ee780e76..9501282c 100755 --- a/play-services-core/src/main/res/xml/preferences_start.xml +++ b/play-services-core/src/main/res/xml/preferences_start.xml @@ -42,12 +42,6 @@ android:targetClass="org.microg.gms.ui.GoogleMoreFragment$AsActivity" android:targetPackage="com.mgoogle.android.gms" /> -