mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

This should prevent crashes on Androids < 13 due to broken POST_NOTIFICATIONS permission check

Browse source
This commit is contained in:
Sylvain Berfini 2025-03-24 11:33:00 +01:00
parent 8b35f2bab5
commit 12e22dd7a9
4 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/linphone/compatibility/Api33Compatibility.kt
View file

@ -20,6 +20,8 @@
package org.linphone.compatibility
import android.Manifest
import android.content.Context
import android.content.pm.PackageManager
import android.os.Build
import androidx.annotation.RequiresApi
@ -34,5 +36,11 @@ class Api33Compatibility {
Manifest.permission.CAMERA
)
}
fun isPostNotificationsPermissionGranted(context: Context): Boolean {
return context.checkSelfPermission(
Manifest.permission.POST_NOTIFICATIONS
) == PackageManager.PERMISSION_GRANTED
}
}
}

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

@ -111,6 +111,13 @@ class Compatibility {
return false
}
fun isPostNotificationsPermissionGranted(context: Context): Boolean {
if (Version.sdkAboveOrEqual(Version.API33_ANDROID_13_TIRAMISU)) {
return Api33Compatibility.isPostNotificationsPermissionGranted(context)
}
return true
}
fun enterPipMode(activity: Activity): Boolean {
if (Version.sdkStrictlyBelow(Version.API31_ANDROID_12)) {
return Api28Compatibility.enterPipMode(activity)

12
app/src/main/java/org/linphone/core/CoreFileTransferService.kt
View file

@ -19,19 +19,18 @@
*/
package org.linphone.core
import android.Manifest
import android.annotation.SuppressLint
import android.app.PendingIntent
import android.content.Intent
import android.content.pm.PackageManager
import android.os.IBinder
import androidx.annotation.AnyThread
import androidx.annotation.MainThread
import androidx.annotation.WorkerThread
import androidx.core.app.ActivityCompat
import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.R
import org.linphone.compatibility.Compatibility
import org.linphone.core.tools.Log
import org.linphone.core.tools.service.FileTransferService
import org.linphone.ui.main.MainActivity
@ -171,14 +170,11 @@ class CoreFileTransferService : FileTransferService() {
postNotification()
}
@SuppressLint("MissingPermission")
@AnyThread
private fun postNotification() {
val notificationsManager = NotificationManagerCompat.from(this)
if (ActivityCompat.checkSelfPermission(
this,
Manifest.permission.POST_NOTIFICATIONS
) == PackageManager.PERMISSION_GRANTED
) {
if (Compatibility.isPostNotificationsPermissionGranted(this)) {
if (mServiceNotification != null) {
Log.i("$TAG Sending notification to manager")
notificationsManager.notify(SERVICE_NOTIF_ID, mServiceNotification)

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

@ -20,6 +20,7 @@
package org.linphone.notifications
import android.Manifest
import android.annotation.SuppressLint
import android.app.Notification
import android.app.NotificationChannel
import android.app.NotificationManager
@ -1022,13 +1023,10 @@ class NotificationsManager
notify(notifiable.notificationId, notification, CHAT_TAG)
}
@SuppressLint("MissingPermission")
@WorkerThread
private fun notify(id: Int, notification: Notification, tag: String? = null) {
if (ActivityCompat.checkSelfPermission(
context,
Manifest.permission.POST_NOTIFICATIONS
) == PackageManager.PERMISSION_GRANTED
) {
if (Compatibility.isPostNotificationsPermissionGranted(context)) {
Log.i(
"$TAG Notifying using ID [$id] and ${if (tag == null) "without tag" else "with tag [$tag]"}"
)