Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed microphone & camera while app is in background on Android 14 if keep app alive setting is enabled

Browse source
This commit is contained in:
Sylvain Berfini 2023-12-18 11:12:15 +01:00
parent 70803664f9
commit f27da5c95d
3 changed files with 68 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/src/main/java/org/linphone/compatibility/Api34Compatibility.kt
View file

@ -97,12 +97,42 @@ class Api34Compatibility {
}
}
fun startDataSyncForegroundService(service: Service, notifId: Int, notif: Notification) {
fun startDataSyncForegroundService(
service: Service,
notifId: Int,
notif: Notification,
isCallActive: Boolean
) {
val mask = if (isCallActive) {
Log.i(
"[Api34 Compatibility] Trying to start service as foreground using at least FOREGROUND_SERVICE_TYPE_PHONE_CALL or FOREGROUND_SERVICE_TYPE_DATA_SYNC"
)
var computeMask = ServiceInfo.FOREGROUND_SERVICE_TYPE_PHONE_CALL or ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
if (PermissionHelper.get().hasCameraPermission()) {
Log.i(
"[Api34 Compatibility] CAMERA permission has been granted, adding FOREGROUND_SERVICE_TYPE_CAMERA"
)
computeMask = computeMask or ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA
}
if (PermissionHelper.get().hasRecordAudioPermission()) {
Log.i(
"[Api34 Compatibility] RECORD_AUDIO permission has been granted, adding FOREGROUND_SERVICE_TYPE_MICROPHONE"
)
computeMask = computeMask or ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE
}
computeMask
} else {
Log.i(
"[Api34 Compatibility] Trying to start service as foreground using only FOREGROUND_SERVICE_TYPE_DATA_SYNC because no call at the time"
)
ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
}
try {
service.startForeground(
notifId,
notif,
ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
mask
)
} catch (fssnae: ForegroundServiceStartNotAllowedException) {
Log.e("[Api34 Compatibility] Can't start service as foreground! $fssnae")

14
app/src/main/java/org/linphone/compatibility/Compatibility.kt
View file

@ -303,9 +303,19 @@ class Compatibility {
}
}
fun startDataSyncForegroundService(service: Service, notifId: Int, notif: Notification) {
fun startDataSyncForegroundService(
service: Service,
notifId: Int,
notif: Notification,
isCallActive: Boolean
) {
if (Version.sdkAboveOrEqual(Version.API34_ANDROID_14_UPSIDE_DOWN_CAKE)) {
Api34Compatibility.startDataSyncForegroundService(service, notifId, notif)
Api34Compatibility.startDataSyncForegroundService(
service,
notifId,
notif,
isCallActive
)
} else {
startForegroundService(service, notifId, notif)
}

26
app/src/main/java/org/linphone/notifications/NotificationsManager.kt
View file

@ -552,10 +552,22 @@ class NotificationsManager(private val context: Context) {
"[Notifications Manager] Starting service as foreground [$currentForegroundServiceNotificationId]"
)
val core = coreContext.core
val isActiveCall = if (core.callsNb > 0) {
val currentCall = core.currentCall ?: core.calls.first()
when (currentCall.state) {
Call.State.IncomingReceived, Call.State.IncomingEarlyMedia, Call.State.OutgoingInit, Call.State.OutgoingProgress, Call.State.OutgoingRinging -> false
else -> true
}
} else {
false
}
Compatibility.startDataSyncForegroundService(
coreService,
currentForegroundServiceNotificationId,
notification
notification,
isActiveCall
)
}
@ -864,11 +876,15 @@ class NotificationsManager(private val context: Context) {
Log.i("[Notifications Manager] Notifying call notification [${notifiable.notificationId}]")
notify(notifiable.notificationId, notification)
if (service != null && (currentForegroundServiceNotificationId == 0 || currentForegroundServiceNotificationId == notifiable.notificationId)) {
val coreService = service
if (coreService != null && (currentForegroundServiceNotificationId == 0 || currentForegroundServiceNotificationId == notifiable.notificationId)) {
Log.i(
"[Notifications Manager] Notifying call notification for foreground service [${notifiable.notificationId}]"
)
startForeground(notifiable.notificationId, notification, isCallActive)
} else if (coreService != null && currentForegroundServiceNotificationId == SERVICE_NOTIF_ID) {
// To add microphone & camera foreground service use to foreground service if needed
startForeground(coreService, useAutoStartDescription = false)
}
}
@ -881,6 +897,12 @@ class NotificationsManager(private val context: Context) {
} else {
Log.w("[Notifications Manager] No notification found for call ${call.callLog.callId}")
}
// To remove microphone & camera foreground service use to foreground service if needed
val coreService = service
if (coreService != null && currentForegroundServiceNotificationId == SERVICE_NOTIF_ID) {
startForeground(coreService, useAutoStartDescription = false)
}
}
/* Chat related */