From 9dbab7d90cb2b827f152c391c55808c5881f0a3a Mon Sep 17 00:00:00 2001
From: Hai Zhang <dreaming.in.code.zh@gmail.com>
Date: Sun, 10 Sep 2023 04:16:17 -0700
Subject: [PATCH] [Feature] Target Android 14.

Add foreground service types and specify exported flag when register
receivers.
---
 app/build.gradle                                          | 2 +-
 app/src/main/AndroidManifest.xml                          | 8 ++++++--
 .../android/files/storage/StorageVolumeListLiveData.kt    | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 258a91c06..08ee53190 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,7 +34,7 @@ android {
         minSdk 21
         // Not supporting notification runtime permission yet.
         //noinspection OldTargetApi
-        targetSdk 33
+        targetSdk 34
         versionCode 33
         versionName '1.6.1'
         resValue 'string', 'app_version', versionName + ' (' + versionCode + ')'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 87e66a657..f7b28e0f8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,6 +17,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission
         android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
@@ -314,9 +315,12 @@
             </intent-filter>
         </activity>
 
-        <service android:name="me.zhanghai.android.files.filejob.FileJobService" />
+        <service
+            android:name="me.zhanghai.android.files.filejob.FileJobService"
+            android:foregroundServiceType="dataSync" />
 
-        <service android:name="me.zhanghai.android.files.ftpserver.FtpServerService" />
+        <service android:name="me.zhanghai.android.files.ftpserver.FtpServerService"
+            android:foregroundServiceType="dataSync" />
 
         <service
             android:name="me.zhanghai.android.files.ftpserver.FtpServerTileService"
diff --git a/app/src/main/java/me/zhanghai/android/files/storage/StorageVolumeListLiveData.kt b/app/src/main/java/me/zhanghai/android/files/storage/StorageVolumeListLiveData.kt
index 222169a8c..ab20841c9 100644
--- a/app/src/main/java/me/zhanghai/android/files/storage/StorageVolumeListLiveData.kt
+++ b/app/src/main/java/me/zhanghai/android/files/storage/StorageVolumeListLiveData.kt
@@ -11,15 +11,17 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.storage.StorageVolume
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.LiveData
 import me.zhanghai.android.files.app.application
 import me.zhanghai.android.files.app.storageManager
+import me.zhanghai.android.files.compat.registerReceiverCompat
 import me.zhanghai.android.files.compat.storageVolumesCompat
 
 object StorageVolumeListLiveData : LiveData<List<StorageVolume>>() {
     init {
         loadValue()
-        application.registerReceiver(
+        application.registerReceiverCompat(
             object : BroadcastReceiver() {
                 override fun onReceive(context: Context, intent: Intent) {
                     loadValue()
@@ -36,7 +38,7 @@ object StorageVolumeListLiveData : LiveData<List<StorageVolume>>() {
                 // The "file" data scheme is required to receive these broadcasts.
                 // @see https://stackoverflow.com/a/7143298
                 addDataScheme(ContentResolver.SCHEME_FILE)
-            }
+            }, ContextCompat.RECEIVER_NOT_EXPORTED
         )
     }