mirror of
https://github.com/bitfireAT/davx5-ose
synced 2024-10-15 15:59:18 +00:00
Android 14 Compatibility (#545)
* Increase target SDK level to 34 * ForegroundService: specify "data sync" foreground service type
This commit is contained in:
parent
a9a699c5b9
commit
09b15c1e75
|
@ -32,7 +32,7 @@ android {
|
||||||
setProperty "archivesBaseName", "davx5-ose-" + getVersionName()
|
setProperty "archivesBaseName", "davx5-ose-" + getVersionName()
|
||||||
|
|
||||||
minSdkVersion 24 // Android 7.0
|
minSdkVersion 24 // Android 7.0
|
||||||
targetSdkVersion 33 // Android 13
|
targetSdkVersion 34 // Android 14
|
||||||
|
|
||||||
buildConfigField "String", "userAgent", "\"DAVx5\""
|
buildConfigField "String", "userAgent", "\"DAVx5\""
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||||
<uses-permission android:name="android.permission.ACCESS_WIFI_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"/>
|
||||||
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
|
||||||
<uses-permission android:name="android.permission.INTERNET"/>
|
<uses-permission android:name="android.permission.INTERNET"/>
|
||||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
|
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
|
||||||
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
|
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
|
||||||
|
|
|
@ -8,10 +8,12 @@ import android.app.PendingIntent
|
||||||
import android.app.Service
|
import android.app.Service
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
|
import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.PowerManager
|
import android.os.PowerManager
|
||||||
import androidx.core.app.NotificationCompat
|
import androidx.core.app.NotificationCompat
|
||||||
import androidx.core.app.NotificationManagerCompat
|
import androidx.core.app.NotificationManagerCompat
|
||||||
|
import androidx.core.app.ServiceCompat
|
||||||
import androidx.core.content.getSystemService
|
import androidx.core.content.getSystemService
|
||||||
import at.bitfire.davdroid.settings.Settings
|
import at.bitfire.davdroid.settings.Settings
|
||||||
import at.bitfire.davdroid.settings.SettingsManager
|
import at.bitfire.davdroid.settings.SettingsManager
|
||||||
|
@ -104,7 +106,7 @@ class ForegroundService : Service() {
|
||||||
.setStyle(NotificationCompat.BigTextStyle())
|
.setStyle(NotificationCompat.BigTextStyle())
|
||||||
.setContentIntent(PendingIntent.getActivity(this, 0, settingsIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE))
|
.setContentIntent(PendingIntent.getActivity(this, 0, settingsIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE))
|
||||||
.setCategory(NotificationCompat.CATEGORY_STATUS)
|
.setCategory(NotificationCompat.CATEGORY_STATUS)
|
||||||
startForeground(NotificationUtils.NOTIFY_FOREGROUND, builder.build())
|
ServiceCompat.startForeground(this, NotificationUtils.NOTIFY_FOREGROUND, builder.build(), FOREGROUND_SERVICE_TYPE_DATA_SYNC)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onBind(intent: Intent?): Nothing? = null
|
override fun onBind(intent: Intent?): Nothing? = null
|
||||||
|
|
Loading…
Reference in a new issue