Merge branch 'main' into feat/codec-negotiation

GetStream · Jan 10, 2025 · 30c3fc0 · 30c3fc0
2 parents cdabfb5 + 52df588
commit 30c3fc0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/packages/stream_video_flutter/CHANGELOG.md b/packages/stream_video_flutter/CHANGELOG.md
@@ -1,11 +1,14 @@
 ## Unreleased 
 
 🚧 Breaking changes
-* The package is now compatible with Gradle 8. The minimum required Java version is now 17.
-* Updated the `flutter_callkit_incoming` package to version 2.5.0, which also requires Java 17.
+* https://github.com/GetStream/stream-video-flutter/pull/820: The package is now compatible with Gradle 8. The minimum required Java version is now 17.
+* https://github.com/GetStream/stream-video-flutter/pull/820: Updated the `flutter_callkit_incoming` package to version 2.5.0, which also requires Java 17.
 
 ✅ Added
-* Added out-of-the-box support for blur background filters and image filters. As well as the option to create custom video filters. For complete documentation of those features please check [here.](https://getstream.io/video/docs/flutter/advanced/apply-video-filters/)
+* https://github.com/GetStream/stream-video-flutter/pull/799: Added out-of-the-box support for blur background filters and image filters. As well as the option to create custom video filters. For complete documentation of those features please check [here.](https://getstream.io/video/docs/flutter/advanced/apply-video-filters/)
+
+🐞 Fixed
+* https://github.com/GetStream/stream-video-flutter/pull/822: Fixed issues when ending the call while in Picture in Picture mode on Android. 
 
 ## 0.6.1
 

diff --git a/.../kotlin/io/getstream/video/flutter/stream_video_flutter/service/PictureInPictureHelper.kt b/.../kotlin/io/getstream/video/flutter/stream_video_flutter/service/PictureInPictureHelper.kt
@@ -13,7 +13,11 @@ class PictureInPictureHelper {
         const val PIP_ENABLED_PREF_KEY = "pip_enabled"
 
         fun disablePictureInPicture(activity: Activity) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                if (activity.isInPictureInPictureMode) {
+                    activity.moveTaskToBack(true) 
+                }
+
                 val params = PictureInPictureParams.Builder()
                 params.setAutoEnterEnabled(false)
                 activity.setPictureInPictureParams(params.build())

diff --git a/packages/stream_video_flutter/lib/src/call_participants/call_participants.dart b/packages/stream_video_flutter/lib/src/call_participants/call_participants.dart
@@ -148,7 +148,8 @@ class _StreamCallParticipantsState extends State<StreamCallParticipants> {
 
   @override
   Widget build(BuildContext context) {
-    if (widget.layoutMode == ParticipantLayoutMode.pictureInPicture) {
+    if (_participants.isNotEmpty &&
+        widget.layoutMode == ParticipantLayoutMode.pictureInPicture) {
       return widget.callParticipantBuilder(
         context,
         widget.call,

diff --git a/packages/stream_video_flutter/lib/src/call_screen/call_content/call_content.dart b/packages/stream_video_flutter/lib/src/call_screen/call_content/call_content.dart
@@ -112,6 +112,12 @@ class _StreamCallContentState extends State<StreamCallContent>
         WidgetsBinding.instance.removeObserver(this);
       }
     }
+
+    if (widget.callState.status != oldWidget.callState.status) {
+      if (widget.callState.status.isDisconnected) {
+        StreamVideoFlutterBackground.setPictureInPictureEnabled(enable: false);
+      }
+    }
   }
 
   @override