From 0becc2f9180345abab11d58d46ea5421304851b4 Mon Sep 17 00:00:00 2001 From: Oizaro <45825534+Oizaro@users.noreply.github.com> Date: Sun, 30 Aug 2020 23:36:05 +0200 Subject: [PATCH 1/5] Fix version name --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5a46b66f..602e2576 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ allprojects { apply plugin: 'idea' group = 'org.microg.gms' - version = "0.2.11.202414-vanced" + version = "0.2.11.202414" ext.appVersionCode = 202414022 ext.isReleaseVersion = false } From f10612ecd1cea5430c776d35faccafae7316e90e Mon Sep 17 00:00:00 2001 From: Oizaro <45825534+Oizaro@users.noreply.github.com> Date: Sun, 30 Aug 2020 23:54:43 +0200 Subject: [PATCH 2/5] Bump to new version --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 602e2576..6ab8cd6b 100644 --- a/build.gradle +++ b/build.gradle @@ -49,8 +49,8 @@ allprojects { apply plugin: 'idea' group = 'org.microg.gms' - version = "0.2.11.202414" - ext.appVersionCode = 202414022 + version = "0.2.11.20500" + ext.appVersionCode = 202500022 ext.isReleaseVersion = false } From 9201652c576d9e811a16e9d517e67ad39abf481f Mon Sep 17 00:00:00 2001 From: Oizaro <45825534+Oizaro@users.noreply.github.com> Date: Mon, 31 Aug 2020 00:02:36 +0200 Subject: [PATCH 3/5] more smaller range...again --- .../src/main/java/org/microg/gms/gcm/GcmPrefs.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java b/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java index b552ff86..571e5ca2 100644 --- a/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java +++ b/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java @@ -44,7 +44,7 @@ public class GcmPrefs implements SharedPreferences.OnSharedPreferenceChangeListe public static final String PREF_LEARNT_OTHER = "gcm_learnt_other"; private static final int MIN_INTERVAL = 1 * 60 * 1000; // 1 minute - private static final int MAX_INTERVAL = 3 * 60 * 1000; // 3 minutes + private static final int MAX_INTERVAL = 2 * 60 * 1000; // 2 minutes private static GcmPrefs INSTANCE; From 27f79a39f556f0fd0b98b12876c9676e2da03036 Mon Sep 17 00:00:00 2001 From: Oizaro <45825534+Oizaro@users.noreply.github.com> Date: Tue, 1 Sep 2020 00:06:05 +0200 Subject: [PATCH 4/5] Restore gr3ger double casting fix --- .../java/org/microg/gms/ui/SettingsFragment.java | 15 +++++++++++++++ .../src/main/res/drawable/ic_cast_black.xml | 10 ++++++++++ .../src/main/res/values-it/strings.xml | 2 ++ .../src/main/res/values/strings.xml | 3 ++- .../src/main/res/xml/preferences_start.xml | 6 ++++++ 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 play-services-core/src/main/res/drawable/ic_cast_black.xml 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 e8bcd0ee..24e39788 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,10 +1,16 @@ 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; @@ -18,6 +24,7 @@ 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() { preferencesResource = R.xml.preferences_start; @@ -41,6 +48,14 @@ public class SettingsFragment extends ResourceSettingsFragment { 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()) { GcmDatabase database = new GcmDatabase(getContext()); int regCount = database.getRegistrationList().size(); 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 new file mode 100644 index 00000000..95b6bf72 --- /dev/null +++ b/play-services-core/src/main/res/drawable/ic_cast_black.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/play-services-core/src/main/res/values-it/strings.xml b/play-services-core/src/main/res/values-it/strings.xml index e6acb930..4cede008 100755 --- a/play-services-core/src/main/res/values-it/strings.xml +++ b/play-services-core/src/main/res/values-it/strings.xml @@ -107,6 +107,8 @@ Questa operazione può richiedere alcuni minuti." Chiedi conferma all\'utente prima di registrare una nuova applicazione per le notifiche push. A proposito di microG + Correzione Cast duplicato + Attiva questa opzione in caso di voci duplicate nel menù di cast Automatico Manuale diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml index 9c99e8a2..912dcc53 100755 --- a/play-services-core/src/main/res/values/strings.xml +++ b/play-services-core/src/main/res/values/strings.xml @@ -102,6 +102,7 @@ This can take a couple of minutes." Ask before registering a new app to receive push notifications About Vanced microG + Cast duplication fix Register device 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. @@ -132,5 +133,5 @@ This can take a couple of minutes." Registered apps Unregistered apps Networks to use for push notifications - + 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 9501282c..ee780e76 100755 --- a/play-services-core/src/main/res/xml/preferences_start.xml +++ b/play-services-core/src/main/res/xml/preferences_start.xml @@ -42,6 +42,12 @@ android:targetClass="org.microg.gms.ui.GoogleMoreFragment$AsActivity" android:targetPackage="com.mgoogle.android.gms" /> + Date: Tue, 1 Sep 2020 00:49:48 +0200 Subject: [PATCH 5/5] Fix typo --- play-services-core/src/main/res/values-it/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/src/main/res/values-it/strings.xml b/play-services-core/src/main/res/values-it/strings.xml index 4cede008..a0ef6886 100755 --- a/play-services-core/src/main/res/values-it/strings.xml +++ b/play-services-core/src/main/res/values-it/strings.xml @@ -91,7 +91,7 @@ Questa operazione può richiedere alcuni minuti." Quando questa opzione è attiva, tutte le applicazioni su questo dispositivo saranno in grado di visualizzare gli indirizzi di posta elettronica dell\'account Google senza autorizzazione preventiva. Registra dispositivo - Registra il tuo dispositivo ai servizi Google e crea un identificativo univoco. Vengono rimossi da microG alcuni bit funzionali all\'identificazione dai dati di registrazione, oltre al nome dell\'account Google. + Registra il tuo dispositivo ai servizi Google e crea un identificativo univoco. Vengono rimossi da microG alcuni bit funzionali all\'identificazione dei dati di registrazione, oltre al nome dell\'account Google. Non registrato Ultima registrazione: %1$s