diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index afba1092..d64cd491 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/play-services-base-core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt b/play-services-base-core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt index 031b178d..8851d1a1 100644 --- a/play-services-base-core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt +++ b/play-services-base-core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt @@ -103,17 +103,6 @@ object SettingsContract { ) } - object Play { - private const val id = "play" - fun getContentUri(context: Context) = Uri.withAppendedPath(getAuthorityUri(context), id) - fun getContentType(context: Context) = "vnd.android.cursor.item/vnd.${getAuthority(context)}.$id" - const val LICENSING = "play_licensing" - val PROJECTION = arrayOf( - LICENSING - ) - } - - private fun withoutCallingIdentity(f: () -> T): T { val identity = Binder.clearCallingIdentity() try { diff --git a/play-services-base-core/src/main/kotlin/org/microg/gms/settings/SettingsProvider.kt b/play-services-base-core/src/main/kotlin/org/microg/gms/settings/SettingsProvider.kt index 15b797e3..39dc00e1 100644 --- a/play-services-base-core/src/main/kotlin/org/microg/gms/settings/SettingsProvider.kt +++ b/play-services-base-core/src/main/kotlin/org/microg/gms/settings/SettingsProvider.kt @@ -14,7 +14,6 @@ import android.content.SharedPreferences import android.database.Cursor import android.database.MatrixCursor import android.net.Uri -import org.microg.gms.settings.SettingsContract.Play import android.preference.PreferenceManager import org.microg.gms.common.PackageUtils.warnIfNotMainProcess import org.microg.gms.settings.SettingsContract.Auth @@ -69,7 +68,6 @@ class SettingsProvider : ContentProvider() { Gcm.getContentUri(context!!) -> queryGcm(projection ?: Gcm.PROJECTION) Auth.getContentUri(context!!) -> queryAuth(projection ?: Auth.PROJECTION) Profile.getContentUri(context!!) -> queryProfile(projection ?: Profile.PROJECTION) - Play.getContentUri(context!!) -> queryPlay(projection ?: Play.PROJECTION) else -> null } @@ -86,30 +84,11 @@ class SettingsProvider : ContentProvider() { Gcm.getContentUri(context!!) -> updateGcm(values) Auth.getContentUri(context!!) -> updateAuth(values) Profile.getContentUri(context!!) -> updateProfile(values) - Play.getContentUri(context!!) -> updatePlay(values) else -> return 0 } return 1 } - private fun queryPlay(p: Array): Cursor = MatrixCursor(p).addRow(p) { key -> - when (key) { - Play.LICENSING -> getSettingsBoolean(key, false) - else -> throw IllegalArgumentException("Unknown key: $key") - } - } - private fun updatePlay(values: ContentValues) { - if (values.size() == 0) return - val editor = preferences.edit() - values.valueSet().forEach { (key, value) -> - when (key) { - Play.LICENSING -> editor.putBoolean(key, value as Boolean) - else -> throw IllegalArgumentException("Unknown key: $key") - } - } - editor.apply() - } - private fun queryCheckIn(p: Array): Cursor = MatrixCursor(p).addRow(p) { key -> when (key) { CheckIn.ENABLED -> getSettingsBoolean(key, true) diff --git a/play-services-core/src/main/kotlin/org/microg/gms/play/PlayPreferences.kt b/play-services-core/src/main/kotlin/org/microg/gms/play/PlayPreferences.kt deleted file mode 100644 index fa906104..00000000 --- a/play-services-core/src/main/kotlin/org/microg/gms/play/PlayPreferences.kt +++ /dev/null @@ -1,18 +0,0 @@ -package org.microg.gms.play -import android.content.Context -import org.microg.gms.settings.SettingsContract -object PlayPreferences { - @JvmStatic - fun isLicensingEnabled(context: Context): Boolean { - val projection = arrayOf(SettingsContract.Play.LICENSING) - return SettingsContract.getSettings(context, SettingsContract.Play.getContentUri(context), projection) { c -> - c.getInt(0) != 0 - } - } - @JvmStatic - fun setLicensingEnabled(context: Context, enabled: Boolean) { - SettingsContract.setSettings(context, SettingsContract.Play.getContentUri(context)) { - put(SettingsContract.Play.LICENSING, enabled) - } - } -} \ No newline at end of file diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/PlayFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/PlayFragment.kt deleted file mode 100644 index eb7f1515..00000000 --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/PlayFragment.kt +++ /dev/null @@ -1,42 +0,0 @@ -package org.microg.gms.ui -import android.annotation.SuppressLint -import android.os.Bundle -import androidx.lifecycle.lifecycleScope -import androidx.preference.Preference -import androidx.preference.PreferenceFragmentCompat -import androidx.preference.TwoStatePreference -import com.mgoogle.android.gms.R -import org.microg.gms.play.PlayPreferences -class PlayFragment : PreferenceFragmentCompat() { - private lateinit var licensingEnabled: TwoStatePreference - override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { - addPreferencesFromResource(R.xml.preferences_play) - } - @SuppressLint("RestrictedApi") - override fun onBindPreferences() { - licensingEnabled = preferenceScreen.findPreference(PREF_LICENSING_ENABLED) ?: licensingEnabled - licensingEnabled.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue -> - val appContext = requireContext().applicationContext - lifecycleScope.launchWhenResumed { - if (newValue is Boolean) { - PlayPreferences.setLicensingEnabled(appContext, newValue) - } - updateContent() - } - true - } - } - override fun onResume() { - super.onResume() - updateContent() - } - private fun updateContent() { - val appContext = requireContext().applicationContext - lifecycleScope.launchWhenResumed { - licensingEnabled.isChecked = PlayPreferences.isLicensingEnabled(appContext) - } - } - companion object { - const val PREF_LICENSING_ENABLED = "play_licensing" - } -} \ No newline at end of file diff --git a/play-services-core/src/main/res/navigation/nav_settings.xml b/play-services-core/src/main/res/navigation/nav_settings.xml index fd1a42ff..fb1cfa00 100755 --- a/play-services-core/src/main/res/navigation/nav_settings.xml +++ b/play-services-core/src/main/res/navigation/nav_settings.xml @@ -11,9 +11,6 @@ - - - diff --git a/play-services-core/src/main/res/values-ar/strings.xml b/play-services-core/src/main/res/values-ar/strings.xml index 0043af17..5d4cd8ea 100644 --- a/play-services-core/src/main/res/values-ar/strings.xml +++ b/play-services-core/src/main/res/values-ar/strings.xml @@ -138,9 +138,4 @@ Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-az/strings.xml b/play-services-core/src/main/res/values-az/strings.xml index 500e7ea7..740a9b11 100644 --- a/play-services-core/src/main/res/values-az/strings.xml +++ b/play-services-core/src/main/res/values-az/strings.xml @@ -138,9 +138,4 @@ Bu bir neçə dəqiqə çəkə bilər." Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-be/strings.xml b/play-services-core/src/main/res/values-be/strings.xml index 339f72ea..1152301e 100644 --- a/play-services-core/src/main/res/values-be/strings.xml +++ b/play-services-core/src/main/res/values-be/strings.xml @@ -138,9 +138,4 @@ Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-bn/strings.xml b/play-services-core/src/main/res/values-bn/strings.xml index 2c33052f..0156013d 100644 --- a/play-services-core/src/main/res/values-bn/strings.xml +++ b/play-services-core/src/main/res/values-bn/strings.xml @@ -139,9 +139,4 @@ Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-cs/strings.xml b/play-services-core/src/main/res/values-cs/strings.xml index df04f144..7e021dd8 100644 --- a/play-services-core/src/main/res/values-cs/strings.xml +++ b/play-services-core/src/main/res/values-cs/strings.xml @@ -135,9 +135,4 @@ Tato akce může trvat několik minut." Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-es-rES/strings.xml b/play-services-core/src/main/res/values-es-rES/strings.xml index ef2e4b05..5b090832 100644 --- a/play-services-core/src/main/res/values-es-rES/strings.xml +++ b/play-services-core/src/main/res/values-es-rES/strings.xml @@ -138,9 +138,4 @@ Esto puede tardar unos minutos." Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-fr/strings.xml b/play-services-core/src/main/res/values-fr/strings.xml index 1fdd82f3..0fcac240 100644 --- a/play-services-core/src/main/res/values-fr/strings.xml +++ b/play-services-core/src/main/res/values-fr/strings.xml @@ -138,9 +138,4 @@ Cela peut prendre quelques minutes." Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-he/strings.xml b/play-services-core/src/main/res/values-he/strings.xml index ecd90758..95511eb1 100644 --- a/play-services-core/src/main/res/values-he/strings.xml +++ b/play-services-core/src/main/res/values-he/strings.xml @@ -85,9 +85,4 @@ Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-hi/strings.xml b/play-services-core/src/main/res/values-hi/strings.xml index cad50b4c..fdf8ea5a 100644 --- a/play-services-core/src/main/res/values-hi/strings.xml +++ b/play-services-core/src/main/res/values-hi/strings.xml @@ -137,9 +137,4 @@ Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-id/strings.xml b/play-services-core/src/main/res/values-id/strings.xml index e00d9da4..ac8b9869 100644 --- a/play-services-core/src/main/res/values-id/strings.xml +++ b/play-services-core/src/main/res/values-id/strings.xml @@ -136,9 +136,4 @@ Ini bisa berlangsung beberapa menit." Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services 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 e73bffc2..07277b42 100755 --- a/play-services-core/src/main/res/values-it/strings.xml +++ b/play-services-core/src/main/res/values-it/strings.xml @@ -135,9 +135,4 @@ Questo potrà richiedere un paio di minuti" Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-ja/strings.xml b/play-services-core/src/main/res/values-ja/strings.xml index 86fad15d..0d93256f 100644 --- a/play-services-core/src/main/res/values-ja/strings.xml +++ b/play-services-core/src/main/res/values-ja/strings.xml @@ -138,9 +138,4 @@ Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-ko/strings.xml b/play-services-core/src/main/res/values-ko/strings.xml index 13b7a04f..fa18f6d5 100644 --- a/play-services-core/src/main/res/values-ko/strings.xml +++ b/play-services-core/src/main/res/values-ko/strings.xml @@ -138,9 +138,4 @@ Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-lt/strings.xml b/play-services-core/src/main/res/values-lt/strings.xml index ce13b1f3..bdf153d4 100644 --- a/play-services-core/src/main/res/values-lt/strings.xml +++ b/play-services-core/src/main/res/values-lt/strings.xml @@ -138,9 +138,4 @@ Tai gali užtrukti keletą minučių." Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-pt-rBR/strings.xml b/play-services-core/src/main/res/values-pt-rBR/strings.xml index a819d634..1120864e 100644 --- a/play-services-core/src/main/res/values-pt-rBR/strings.xml +++ b/play-services-core/src/main/res/values-pt-rBR/strings.xml @@ -156,9 +156,4 @@ Isso pode demorar alguns minutos." Gerenciar contas do Google conectadas Isso abrirá as configurações do seu dispositivo ! Configurações diversas - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-ru/strings.xml b/play-services-core/src/main/res/values-ru/strings.xml index 00c399e6..61269e80 100644 --- a/play-services-core/src/main/res/values-ru/strings.xml +++ b/play-services-core/src/main/res/values-ru/strings.xml @@ -138,9 +138,4 @@ Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-th/strings.xml b/play-services-core/src/main/res/values-th/strings.xml index 2f613b19..3f2df561 100644 --- a/play-services-core/src/main/res/values-th/strings.xml +++ b/play-services-core/src/main/res/values-th/strings.xml @@ -126,9 +126,4 @@ Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-tr/strings.xml b/play-services-core/src/main/res/values-tr/strings.xml index 24f96a11..d5f5ddf5 100644 --- a/play-services-core/src/main/res/values-tr/strings.xml +++ b/play-services-core/src/main/res/values-tr/strings.xml @@ -138,9 +138,4 @@ Bunu bilerek yaptıysanız, Google'ın oturum açma sayfasına bağlanmak için Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-uk/strings.xml b/play-services-core/src/main/res/values-uk/strings.xml index 98e3dad5..a63b5a67 100644 --- a/play-services-core/src/main/res/values-uk/strings.xml +++ b/play-services-core/src/main/res/values-uk/strings.xml @@ -138,9 +138,4 @@ Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-vi/strings.xml b/play-services-core/src/main/res/values-vi/strings.xml index 33409f1d..df22a69d 100644 --- a/play-services-core/src/main/res/values-vi/strings.xml +++ b/play-services-core/src/main/res/values-vi/strings.xml @@ -141,9 +141,4 @@ Hãy thử lại sau." Quản lý tài khoản Google đã đăng nhập Điều này sẽ mở cài đặt thiết bị của bạn ! Cài đặt khác - Tự động cấp phép đang tắt - Tự động cấp phép đang bật - Tự động cấp phép - Một số ứng dụng có thể yêu cầu xác minh rằng bạn đã mua từ Google Play hay không. Khi ứng dụng đó yêu cầu, Vanced+ microG có thể chứng minh là bạn đã mua ứng dụng đó từ Google Play. Điều này sẽ không áp dụng nếu tùy chọn này được tắt hoặc không có tài khoản Google nào được thêm vào. - Dịch vụ Play diff --git a/play-services-core/src/main/res/values-zh-rCN/strings.xml b/play-services-core/src/main/res/values-zh-rCN/strings.xml index 31bb1f24..5dc520b8 100644 --- a/play-services-core/src/main/res/values-zh-rCN/strings.xml +++ b/play-services-core/src/main/res/values-zh-rCN/strings.xml @@ -137,9 +137,4 @@ Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values-zh-rTW/strings.xml b/play-services-core/src/main/res/values-zh-rTW/strings.xml index 9c80ed44..f4105881 100644 --- a/play-services-core/src/main/res/values-zh-rTW/strings.xml +++ b/play-services-core/src/main/res/values-zh-rTW/strings.xml @@ -145,9 +145,4 @@ Vanced+ microG 會把 Google 帳戶名稱以外的識別位 Manage signed in Google accounts This will open your device settings ! Miscellaneous settings - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. - Play Store services diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml index c4cd7a0a..236f1198 100755 --- a/play-services-core/src/main/res/values/strings.xml +++ b/play-services-core/src/main/res/values/strings.xml @@ -119,10 +119,7 @@ This can take a couple of minutes." Messages: %1$d (%2$d bytes) Disconnected Connected since %1$s - Licensing off - Licensing on - Answer license verification requests - Some apps require verification that you have purchased them on Google Play. When requested by an app, Vanced+ microG can download a proof of purchase from Google. If disabled, or if no Google account is added, requests for license verification are ignored. + Allow registration Allow the app to register for push notifications. Start app on push message @@ -132,7 +129,7 @@ This can take a couple of minutes." Registered apps Unregistered apps Networks to use for push notifications - Play Store services + Device profile Select profile Native diff --git a/play-services-core/src/main/res/xml/preferences_play.xml b/play-services-core/src/main/res/xml/preferences_play.xml deleted file mode 100644 index df28b60a..00000000 --- a/play-services-core/src/main/res/xml/preferences_play.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file 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 ae135d57..e7372cee 100755 --- a/play-services-core/src/main/res/xml/preferences_start.xml +++ b/play-services-core/src/main/res/xml/preferences_start.xml @@ -38,11 +38,6 @@ android:title="@string/hideLauncherIcon" android:icon="@drawable/ic_baseline_hide_source_24" android:defaultValue="true"/> - -