ReVanced-Mirror/VancedMicroG
1
0
Fork 0
mirror of https://github.com/TeamVanced/VancedMicroG synced 2025-01-07 10:05:48 +01:00
Code Issues Projects Releases Wiki Activity

Update to latest upstream (#151)

Browse Source 
* Exposure Notifications: Request permissions for Android 12 Beta

* Refactor settings access to use a SettingsProvider

to enable safe usage of settings no matter which process is getting/setting them.
Previously, different processes were accessing settings in an unsafe way and the warn methods were throwing Runtime exceptions which went largely unnoticed, but happened, especially on a fresh start of the OS.

Change-Id: Ie4134e7be2a7ca4a373790f45fbcbd09bf02ad86

* Bump version

* Fix settings provider being called with wrong identity

Fixes #1503

* Revert "Make the application persistent"

This reverts commit 3eb3380c2d.
See #1487 for details

* Cronet: Use updated version

* Update to latest upstream

Co-authored-by: Marvin W <git@larma.de>
Co-authored-by: Torsten Grote <t@grobox.de>
This commit is contained in:
Oizaro 2021-07-01 19:32:42 +02:00 committed by GitHub
parent 6b9aa61849
commit e519443293
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -4,7 +4,7 @@
*/ */
buildscript { buildscript {
ext.cronetVersion = '91.0.4472.120' ext.cronetVersion = '91.0.4472.120.1'
ext.safeParcelVersion = '1.7.0' ext.safeParcelVersion = '1.7.0'
ext.kotlinVersion = '1.4.32' ext.kotlinVersion = '1.4.32'

2
play-services-core/src/main/AndroidManifest.xml
View File

@ -96,7 +96,7 @@
<provider <provider
android:name="org.microg.gms.settings.SettingsProvider" android:name="org.microg.gms.settings.SettingsProvider"
android:authorities="org.microg.gms.settings" android:authorities="org.microg.gms.settings"
android:exported="true" /> android:exported="false" />
<!-- Services Framework --> <!-- Services Framework -->

22
play-services-core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt
View File

@ -4,6 +4,7 @@ import android.content.ContentValues
import android.content.Context import android.content.Context
import android.database.Cursor import android.database.Cursor
import android.net.Uri import android.net.Uri
import android.os.Binder
object SettingsContract { object SettingsContract {
const val AUTHORITY = "org.microg.gms.settings" const val AUTHORITY = "org.microg.gms.settings"
@ -81,15 +82,24 @@ object SettingsContract {
) )
} }
fun <T> getSettings(context: Context, uri: Uri, projection: Array<out String>?, f: (Cursor) -> T): T { private fun <T> withoutCallingIdentity(f: () -> T): T {
context.contentResolver.query(uri, projection, null, null, null).use { c -> val identity = Binder.clearCallingIdentity()
require(c != null) { "Cursor for query $uri ${projection?.toList()} was null" } try {
if (!c.moveToFirst()) error("Cursor for query $uri ${projection?.toList()} was empty") return f.invoke()
return f.invoke(c) } finally {
Binder.restoreCallingIdentity(identity)
} }
} }
fun setSettings(context: Context, uri: Uri, v: ContentValues.() -> Unit) { fun <T> getSettings(context: Context, uri: Uri, projection: Array<out String>?, f: (Cursor) -> T): T = withoutCallingIdentity {
context.contentResolver.query(uri, projection, null, null, null).use { c ->
require(c != null) { "Cursor for query $uri ${projection?.toList()} was null" }
if (!c.moveToFirst()) error("Cursor for query $uri ${projection?.toList()} was empty")
f.invoke(c)
}
}
fun setSettings(context: Context, uri: Uri, v: ContentValues.() -> Unit) = withoutCallingIdentity {
val values = ContentValues().apply { v.invoke(this) } val values = ContentValues().apply { v.invoke(this) }
val affected = context.contentResolver.update(uri, values, null, null) val affected = context.contentResolver.update(uri, values, null, null)
require(affected == 1) { "Update for $uri with $values affected 0 rows"} require(affected == 1) { "Update for $uri with $values affected 0 rows"}