Merge pull request #2836 from BlueBubblesApp/development

v1.14.0 hotfix 1

android/app/src/main/kotlin/com/bluebubbles/messaging/services/foreground/SocketIOForegroundService.kt

@@ -4,12 +4,14 @@ import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.Service
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_REMOTE_MESSAGING
 import android.content.Context
 import android.content.Intent
 import android.util.Log
 import android.os.Build
 import android.os.IBinder
 import androidx.core.app.NotificationCompat
+import androidx.core.app.ServiceCompat
 import com.bluebubbles.messaging.Constants
 import com.bluebubbles.messaging.R
 import com.bluebubbles.messaging.services.backend_ui_interop.DartWorkManager
@@ -69,9 +71,11 @@ class SocketIOForegroundService : Service() {
 
         // Create notification for foreground service
         createNotificationChannel()
-        startForeground(
+        ServiceCompat.startForeground(
+            this,
             Constants.foregroundServiceNotificationId,
-            createNotification(DEFAULT_NOTIFICATION)
+            createNotification(DEFAULT_NOTIFICATION),
+            FOREGROUND_SERVICE_TYPE_REMOTE_MESSAGING
         )
 
         // if the service is enabled, but the server URL is missing, update the notification

lib/app/layouts/conversation_view/widgets/message/send_animation.dart

@@ -157,7 +157,7 @@ class _SendAnimationState
       );
       _message.generateTempGuid();
       outq.queue(OutgoingItem(
-        type: (_message.attributedBody.isNotEmpty) ? QueueType.sendMultipart : QueueType.sendMessage,
+        type: (_message.attributedBody.isNotEmpty && !ss.isMinSonomaSync) ? QueueType.sendMultipart : QueueType.sendMessage,
         chat: controller.chat,
         message: _message,
       ));

pubspec.yaml

@@ -12,7 +12,7 @@ description: Send iMessages on Android using BlueBubbles!
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 1.14.0+67
+version: 1.14.0+69
 publish_to: none
 
 environment: