PeterCxy
/
UnifiedNlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support old configuration and system defaults

This commit is contained in:
Marvin W 2020-08-25 23:02:13 +02:00
parent 4e3a6dac96
commit 3d5fc38ac1
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
5 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
geocode-v1/src/main/AndroidManifest.xml
View File

@ -19,8 +19,7 @@
<service
android:name=".GeocodeService"
android:exported="true"
android:permission="android.permission.INTERNET"
android:process=":geocservice">
android:permission="android.permission.INTERNET">
<intent-filter>
<action android:name="com.android.location.service.GeocodeProvider" />
<action android:name="com.google.android.location.GeocodeProvider" />

1
location-v2/src/main/AndroidManifest.xml
View File

@ -22,7 +22,6 @@
<service
android:name=".LocationService"
android:exported="true"
android:process=":locservice"
android:permission="android.permission.ACCESS_COARSE_LOCATION">
<intent-filter>
<action android:name="com.android.location.service.v2.NetworkLocationProvider" />

1
location-v3/src/main/AndroidManifest.xml
View File

@ -21,7 +21,6 @@
<service
android:name=".LocationService"
android:exported="true"
android:process=":locservice"
android:permission="android.permission.ACCESS_COARSE_LOCATION">
<intent-filter>
<action android:name="com.android.location.service.v3.NetworkLocationProvider" />

1
service/src/main/AndroidManifest.xml
View File

@ -19,7 +19,6 @@
<service
android:name=".UnifiedLocationServiceEntryPoint"
android:exported="true"
android:process=":ulocservice"
tools:ignore="ExportedService">
<intent-filter>
<action android:name="org.microg.nlp.service.UnifiedLocationService" />

31
service/src/main/kotlin/org/microg/nlp/service/Preferences.kt
View File

@ -8,13 +8,24 @@ package org.microg.nlp.service
import android.content.Context
import android.content.SharedPreferences
import android.os.Build
import java.io.File
class Preferences(private val context: Context) {
private val sharedPreferences: SharedPreferences
private val preferences: SharedPreferences
get() = context.getSharedPreferences(PREFERENCES_NAME, Context.MODE_PRIVATE)
private val oldPreferences: SharedPreferences
get() = context.getSharedPreferences(context.packageName + "_preferences", Context.MODE_PRIVATE)
private val systemDefaultPreferences: SharedPreferences?
get() = try {
Context::class.java.getDeclaredMethod("getSharedPreferences", File::class.java, Int::class.javaPrimitiveType).invoke(context, File("/system/etc/microg.xml"), Context.MODE_PRIVATE) as SharedPreferences
} catch (e: java.lang.Exception) {
null
}
private fun SharedPreferences.getStringSetCompat(key: String, defValues: Set<String>? = null): Set<String>? {
if (Build.VERSION.SDK_INT >= 11) {
try {
@ -41,18 +52,24 @@ class Preferences(private val context: Context) {
}
}
private fun getStringSetFromAny(key: String): Set<String>? {
val fromNewSettings = preferences.getStringSetCompat(key)
if (fromNewSettings != null) return fromNewSettings
val fromOldSettings = oldPreferences.getStringSetCompat(key)
if (fromOldSettings != null) return fromOldSettings
return systemDefaultPreferences?.getStringSetCompat(key)
}
var locationBackends: Set<String>
get() =
sharedPreferences.getStringSetCompat(PREF_LOCATION_BACKENDS) ?: emptySet()
get() = getStringSetFromAny(PREF_LOCATION_BACKENDS) ?: emptySet()
set(backends) {
sharedPreferences.edit().putStringSetCompat(PREF_LOCATION_BACKENDS, backends).apply()
preferences.edit().putStringSetCompat(PREF_LOCATION_BACKENDS, backends).apply()
}
var geocoderBackends: Set<String>
get() =
sharedPreferences.getStringSetCompat(PREF_GEOCODER_BACKENDS) ?: emptySet()
get() = getStringSetFromAny(PREF_GEOCODER_BACKENDS) ?: emptySet()
set(backends) {
sharedPreferences.edit().putStringSetCompat(PREF_GEOCODER_BACKENDS, backends).apply()
preferences.edit().putStringSetCompat(PREF_GEOCODER_BACKENDS, backends).apply()
}
companion object {