Merge branch 'fix-timer-service' - 2.29 🚀

This commit is contained in:
Brandon Presley 2024-03-01 19:57:56 +13:00
commit 2d5e0620af
4 changed files with 19 additions and 5 deletions

View File

@ -87,8 +87,8 @@ android {
applicationId "com.massive"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 36243
versionName "2.28"
versionCode 36244
versionName "2.29"
}
signingConfigs {
release {

View File

@ -6,6 +6,7 @@
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
<uses-permission
android:name="android.permission.ACCESS_NETWORK_STATE"
@ -48,6 +49,11 @@
<service
android:name=".TimerService"
android:exported="false" />
android:exported="false"
android:foregroundServiceType="specialUse">
<property
android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
android:value="App does not require SCHEDULE_EXACT_ALARM or USE_EXACT_ALARM, but needs foreground service for foreground timer."/>
</service>
</application>
</manifest>

View File

@ -9,6 +9,7 @@ import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.content.pm.PackageManager
import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
import android.media.AudioAttributes
import android.media.MediaPlayer
import android.net.Uri
@ -76,7 +77,14 @@ class TimerService : Service() {
secondsLeft = (intent?.getIntExtra("milliseconds", 0) ?: 0) / 1000
currentDescription = intent?.getStringExtra("description").toString()
secondsTotal = secondsLeft
startForeground(ONGOING_ID, getProgress(secondsLeft).build())
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
startForeground(ONGOING_ID, getProgress(secondsLeft).build(), FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
} else
{
startForeground(ONGOING_ID, getProgress(secondsLeft).build())
}
battery()
Log.d("TimerService", "onStartCommand seconds=$secondsLeft")

View File

@ -1,6 +1,6 @@
{
"name": "massive",
"version": "2.28",
"version": "2.29",
"private": true,
"license": "GPL-3.0-only",
"scripts": {