IDE-264 Migrate targetSDKVersion 34 (#5026)

* IDE-264 Migrate targetSDKVersion 34 * IDE-264 Set ForegroundServiceType for project upload and download
Catrobat · Sep 25, 2024 · 960df48 · 960df48
1 parent f4f0115
commit 960df48
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/catroid/build.gradle b/catroid/build.gradle
@@ -117,7 +117,6 @@ android {
     }
 
     defaultConfig {
-
         minSdkVersion 28
         targetSdkVersion 34
         applicationId appId

diff --git a/catroid/src/main/AndroidManifest.xml b/catroid/src/main/AndroidManifest.xml
@@ -43,7 +43,6 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" tools:node="remove" />
 
@@ -83,6 +82,10 @@
     android:name="android.hardware.camera"
     android:required="false" />
 
+    <!-- foreground services -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+
     <application
         android:name=".CatroidApplication"
         android:allowBackup="false"
@@ -249,8 +252,12 @@
         <activity
             android:name=".ui.filepicker.FilePickerActivity" />
 
-        <service android:name=".transfers.project.ProjectUploadService" />
-        <service android:name=".transfers.project.ProjectDownloadService" />
+        <service
+            android:name=".transfers.project.ProjectUploadService"
+            android:foregroundServiceType="dataSync" />
+        <service
+            android:name=".transfers.project.ProjectDownloadService"
+            android:foregroundServiceType="dataSync" />
         <service android:name=".transfers.MediaDownloadService" />
         <service android:name=".utils.notifications.StatusBarNotificationManager$NotificationActionService" />
         <service android:name=".cast.CastService"/>

diff --git a/catroid/src/main/java/org/catrobat/catroid/transfers/project/ProjectDownloadService.kt b/catroid/src/main/java/org/catrobat/catroid/transfers/project/ProjectDownloadService.kt
@@ -86,7 +86,8 @@ class ProjectDownloadService : IntentService("ProjectDownloadService") {
         val zipFileString = File(File(CACHE_DIRECTORY, TMP_DIRECTORY_NAME), DOWNLOAD_FILE_NAME).absolutePath
         val destinationFile = File(zipFileString)
 
-        if ((destinationFile.parentFile.isDirectory or destinationFile.parentFile.mkdirs()).not()) {
+        if (((destinationFile.parentFile?.isDirectory ?: false) or
+                (destinationFile.parentFile?.mkdirs() ?: false)).not()) {
             ToastUtil.showError(this, R.string.error_project_download)
             return
         }