Fix lint

microg · Sep 25, 2024 · 0a8ebce · 0a8ebce
1 parent 2e9b69a
commit 0a8ebce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/play-services-location/core/src/main/AndroidManifest.xml b/play-services-location/core/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.BODY_SENSORS" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <uses-permission
         android:name="android.permission.UPDATE_DEVICE_STATS"
@@ -57,15 +58,6 @@
             android:theme="@style/Theme.App.Translucent"
             android:exported="false" />
 
-        <activity
-            android:name="org.microg.gms.location.ui.ImportExportActivity"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="org.microg.gms.location.network.ACTION_NETWORK_IMPORT_EXPORT" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
         <service
             android:name="org.microg.gms.location.manager.LocationManagerService"
             android:exported="true">

diff --git a/...location/core/src/main/kotlin/org/microg/gms/location/ui/ConfigurationRequiredReceiver.kt b/...location/core/src/main/kotlin/org/microg/gms/location/ui/ConfigurationRequiredReceiver.kt
@@ -7,7 +7,9 @@ package org.microg.gms.location.ui
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.net.Uri
+import android.os.Build.VERSION.SDK_INT
 import org.microg.gms.location.ACTION_CONFIGURATION_REQUIRED
 import org.microg.gms.location.CONFIGURATION_FIELD_ONLINE_SOURCE
 import org.microg.gms.location.EXTRA_CONFIGURATION
@@ -20,6 +22,7 @@ import org.microg.gms.location.core.R
 class ConfigurationRequiredReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         if (intent.action == ACTION_CONFIGURATION_REQUIRED) {
+            if (SDK_INT >= 23 && context.checkSelfPermission(android.Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) return
             val channel = NotificationChannelCompat.Builder("location", NotificationManagerCompat.IMPORTANCE_DEFAULT)
                 .setName(context.getString(R.string.service_name_location)).build()
             NotificationManagerCompat.from(context).createNotificationChannel(channel)

diff --git a/play-services-location/core/src/main/res/values/strings.xml b/play-services-location/core/src/main/res/values/strings.xml
@@ -60,6 +60,6 @@
     <string name="location_data_export_wifi_title">Export local Wi-Fi location database</string>
     <string name="location_data_export_cell_title">Export local cell tower location database</string>
     <string name="location_data_import_title">Import location data from file</string>
-    <string name="location_data_import_result_toast">Imported %1$s records.</string>
+    <string name="location_data_import_result_toast">Imported %1$d records.</string>
 
 </resources>