mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-07-22 10:54:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix notification for missing notification command permissions (#3435)

Browse source 
- Fixes notifications for missing notification command permissions crashing the app because there was no server ID included for the notification
This commit is contained in:
Joris Pelgröm 2023-04-01 05:22:31 +02:00 committed by GitHub
parent b947157f89
commit 4aadcd0315
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/src/main/java/io/homeassistant/companion/android/notifications/MessagingManager.kt
View file

@ -559,13 +559,14 @@ class MessagingManager @Inject constructor(
private fun handleDeviceCommands(data: Map<String, String>) {
val message = data[NotificationData.MESSAGE]
val command = data[NotificationData.COMMAND]
val serverId = data[THIS_SERVER_ID]!!
when (message) {
COMMAND_DND -> {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
val notificationManager =
context.getSystemService<NotificationManager>()
if (notificationManager?.isNotificationPolicyAccessGranted == false) {
notifyMissingPermission(message.toString())
notifyMissingPermission(message.toString(), serverId)
} else {
when (command) {
DND_ALARMS_ONLY -> notificationManager?.setInterruptionFilter(
@ -589,7 +590,7 @@ class MessagingManager @Inject constructor(
val notificationManager =
context.getSystemService<NotificationManager>()
if (notificationManager?.isNotificationPolicyAccessGranted == false) {
notifyMissingPermission(message.toString())
notifyMissingPermission(message.toString(), serverId)
} else {
processRingerMode(audioManager!!, command)
}
@ -629,7 +630,7 @@ class MessagingManager @Inject constructor(
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
val notificationManager = context.getSystemService<NotificationManager>()
if (notificationManager?.isNotificationPolicyAccessGranted == false) {
notifyMissingPermission(message.toString())
notifyMissingPermission(message.toString(), serverId)
} else {
processStreamVolume(
audioManager!!,
@ -654,7 +655,7 @@ class MessagingManager @Inject constructor(
}
else -> {
Log.e(TAG, "Missing Bluetooth permissions, notifying user to grant permissions")
notifyMissingPermission(message.toString())
notifyMissingPermission(message.toString(), serverId)
}
}
}
@ -680,7 +681,7 @@ class MessagingManager @Inject constructor(
COMMAND_ACTIVITY -> {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (!Settings.canDrawOverlays(context)) {
notifyMissingPermission(message.toString())
notifyMissingPermission(message.toString(), serverId)
} else if (ContextCompat.checkSelfPermission(context, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED && data["tag"] == Intent.ACTION_CALL) {
Handler(Looper.getMainLooper()).post {
Toast.makeText(
@ -705,7 +706,7 @@ class MessagingManager @Inject constructor(
COMMAND_WEBVIEW -> {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (!Settings.canDrawOverlays(context)) {
notifyMissingPermission(message.toString())
notifyMissingPermission(message.toString(), serverId)
} else {
openWebview(command, data)
}
@ -737,7 +738,7 @@ class MessagingManager @Inject constructor(
if (!NotificationManagerCompat.getEnabledListenerPackages(context)
.contains(context.packageName)
) {
notifyMissingPermission(message.toString())
notifyMissingPermission(message.toString(), serverId)
} else {
processMediaCommand(data)
}
@ -746,7 +747,7 @@ class MessagingManager @Inject constructor(
COMMAND_LAUNCH_APP -> {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (!Settings.canDrawOverlays(context)) {
notifyMissingPermission(message.toString())
notifyMissingPermission(message.toString(), serverId)
} else {
launchApp(data)
}
@ -764,7 +765,7 @@ class MessagingManager @Inject constructor(
mainScope.launch { sendNotification(data) }
}
} else {
notifyMissingPermission(message.toString())
notifyMissingPermission(message.toString(), serverId)
}
} else if (!processScreenCommands(data)) {
mainScope.launch { sendNotification(data) }
@ -1775,7 +1776,7 @@ class MessagingManager @Inject constructor(
return success
}
private fun notifyMissingPermission(type: String) {
private fun notifyMissingPermission(type: String, serverId: String) {
val appManager =
context.getSystemService<ActivityManager>()
val currentProcess = appManager?.runningAppProcesses
@ -1783,8 +1784,10 @@ class MessagingManager @Inject constructor(
for (item in currentProcess) {
if (context.applicationInfo.processName == item.processName) {
if (item.importance != ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
val data =
mutableMapOf(NotificationData.MESSAGE to context.getString(commonR.string.missing_command_permission))
val data = mutableMapOf(
NotificationData.MESSAGE to context.getString(commonR.string.missing_command_permission),
THIS_SERVER_ID to serverId
)
runBlocking {
sendNotification(data)
}