fix to enable system bubble when they are disabled but "create bubble" is chosen for a conversation

before this commit, only systemAllowsAllConversations was checked. This was not enough but also system wide enabling of bubbles must be checked

+ minor refactoring

Author: mahibi

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

@@ -3333,6 +3333,8 @@ open class ChatActivity :
                 menu.removeItem(R.id.conversation_voice_call)
             }
 
+            menu.findItem(R.id.create_conversation_bubble)?.isVisible = NotificationUtils.deviceSupportsBubbles
+
             handleThreadNotificationIcon(menu.findItem(R.id.thread_notifications))
         }
         return true
@@ -3402,8 +3404,15 @@ open class ChatActivity :
         }
 
     private fun createConversationBubble() {
+        if (!NotificationUtils.deviceSupportsBubbles) {
+            Log.e(TAG, "createConversationBubble was called but device doesnt support it. It should not be possible " +
+                "to get here via UI!")
+            return
+        }
+
         lifecycleScope.launch {
-            if (!appPreferences.areBubblesEnabled()) {
+            if (!appPreferences.areBubblesEnabled() || !NotificationUtils.areSystemBubblesEnabled(context)) {
+                // Do not replace with snackbar as it needs to survive screen change
                 Toast.makeText(
                     this@ChatActivity,
                     getString(R.string.nc_conversation_notification_bubble_disabled),
@@ -3416,6 +3425,7 @@ open class ChatActivity :
             if (!appPreferences.areBubblesForced()) {
                 val conversationAllowsBubbles = isConversationBubbleEnabled()
                 if (!conversationAllowsBubbles) {
+                    // Do not replace with snackbar as it needs to survive screen change
                     Toast.makeText(
                         this@ChatActivity,
                         getString(R.string.nc_conversation_notification_bubble_enable_conversation),
@@ -3567,7 +3577,7 @@ open class ChatActivity :
                 // Check if notification channel supports bubbles and recreate if needed
                 val channel = notificationManager.getNotificationChannel(channelId)
 
-                if (channel == null || !channel.canBubble()) {
+                if (channel == null || NotificationUtils.deviceSupportsBubbles && !channel.canBubble()) {
                     NotificationUtils.registerNotificationChannels(
                         applicationContext,
                         appPreferences!!

app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt

@@ -15,7 +15,6 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.annotation.SuppressLint
 import android.app.KeyguardManager
-import android.app.NotificationManager
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.DialogInterface
@@ -442,19 +441,20 @@ class SettingsActivity :
         binding.settingsBubbles.visibility = View.VISIBLE
         binding.settingsBubblesForce.visibility = View.VISIBLE
 
-        val systemAllowsAllConversations = isSystemBubblePreferenceAll()
+        val systemAllowsAllConversations = NotificationUtils.isSystemBubblePreferenceAll(context)
+        val systemBubblesEnabled = NotificationUtils.areSystemBubblesEnabled(context)
         updateBubbleSummary(systemAllowsAllConversations)
 
-        var bubblesEnabled = appPreferences.areBubblesEnabled()
-        if (bubblesEnabled && !systemAllowsAllConversations) {
+        var appBubblesEnabled = appPreferences.areBubblesEnabled()
+        if (appBubblesEnabled && (!systemAllowsAllConversations || !systemBubblesEnabled)) {
             appPreferences.setBubblesEnabled(false)
-            bubblesEnabled = false
+            appBubblesEnabled = false
         }
 
-        setGlobalBubbleSwitchState(bubblesEnabled)
+        setGlobalBubbleSwitchState(appBubblesEnabled)
         binding.settingsBubblesForceSwitch.isChecked = appPreferences.areBubblesForced()
 
-        updateBubbleForceRowState(bubblesEnabled)
+        updateBubbleForceRowState(appBubblesEnabled)
 
         binding.settingsBubblesSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isUpdatingBubbleSwitchState) {
@@ -494,10 +494,10 @@ class SettingsActivity :
     }
 
     private fun handleGlobalBubblePreferenceChange(enabled: Boolean) {
-        val systemAllowsAllConversations = isSystemBubblePreferenceAll()
+        val systemAllowsAllConversations = NotificationUtils.isSystemBubblePreferenceAll(context)
 
         if (enabled) {
-            if (!systemAllowsAllConversations) {
+            if (!systemAllowsAllConversations || !NotificationUtils.areSystemBubblesEnabled(context)) {
                 pendingBubbleEnableAfterSystemChange = true
                 showSystemBubblesDisabledFeedback()
                 updateBubbleSummary(systemAllowsAllConversations)
@@ -556,15 +556,6 @@ class SettingsActivity :
         updateBubbleSummary(true)
     }
 
-    private fun isSystemBubblePreferenceAll(): Boolean {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
-            return false
-        }
-
-        val notificationManager = getSystemService(NotificationManager::class.java)
-        return notificationManager?.bubblePreference == NotificationManager.BUBBLE_PREFERENCE_ALL
-    }
-
     private fun navigateToSystemBubbleSettings() {
         val targetPackage = packageName
         val targetUid = applicationInfo?.uid ?: -1

app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt

@@ -23,6 +23,7 @@ import android.graphics.drawable.Drawable
 import android.media.AudioAttributes
 import android.net.Uri
 import android.os.Build
+import android.provider.Settings
 import android.service.notification.StatusBarNotification
 import android.text.TextUtils
 import android.util.Log
@@ -79,6 +80,34 @@ object NotificationUtils {
     const val KEY_UPLOAD_GROUP = "com.nextcloud.talk.utils.KEY_UPLOAD_GROUP"
     const val GROUP_SUMMARY_NOTIFICATION_ID = -1
 
+    val deviceSupportsBubbles = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
+
+    fun areSystemBubblesEnabled(context: Context): Boolean {
+        if (!deviceSupportsBubbles) {
+            return false
+        }
+
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            Settings.Secure.getInt(
+                context.contentResolver,
+                "notification_bubbles",
+                1
+            ) == 1
+        } else {
+            // Android 10 (Q) — bubbles always enabled
+            true
+        }
+    }
+
+    fun isSystemBubblePreferenceAll(context: Context): Boolean {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
+            return false
+        }
+
+        val notificationManager = context.getSystemService(NotificationManager::class.java)
+        return notificationManager?.bubblePreference == NotificationManager.BUBBLE_PREFERENCE_ALL
+    }
+
     private fun createNotificationChannel(
         context: Context,
         notificationChannel: Channel,
@@ -87,8 +116,7 @@ object NotificationUtils {
     ) {
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         val isMessagesChannel = notificationChannel.id == NotificationChannels.NOTIFICATION_CHANNEL_MESSAGES_V4.name
-        val shouldSupportBubbles =
-            android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R && isMessagesChannel
+        val shouldSupportBubbles = deviceSupportsBubbles && isMessagesChannel
 
         val existingChannel = notificationManager.getNotificationChannel(notificationChannel.id)
         val needsRecreation = shouldSupportBubbles && existingChannel != null && !existingChannel.canBubble()