Merge pull request #1814 from 100mslive/updatePackages

Resolved QA reported minor bugs
100mslive · Sep 16, 2024 · beac5a5 · beac5a5
2 parents 68f239b + f8b44e0
commit beac5a5
Show file tree

Hide file tree

Showing 29 changed files with 165 additions and 181 deletions.
diff --git a/.java-version b/.java-version
@@ -1 +1 @@
-openjdk64-17.0.11
+17.0.12
diff --git a/README.md b/README.md
@@ -5,7 +5,6 @@
 [![Discord](https://img.shields.io/discord/843749923060711464?label=Join%20on%20Discord)](https://100ms.live/discord)
 [![Firebase](https://img.shields.io/badge/Download%20Android-Firebase-green)](https://appdistribution.firebase.dev/i/b623e5310929ab70)
 [![TestFlight](https://img.shields.io/badge/Download%20iOS-TestFlight-blue)](https://testflight.apple.com/join/Uhzebmut)
-[![Activity](https://img.shields.io/github/commit-activity/m/100mslive/100ms-flutter.svg)](https://github.com/100mslive/100ms-flutter/projects?type=classic)
 [![Register](https://img.shields.io/badge/Contact-Know%20More-blue)](https://dashboard.100ms.live/register)
 
 # 100ms Flutter SDK 🎉

diff --git a/packages/hms_room_kit/README.md b/packages/hms_room_kit/README.md
@@ -7,7 +7,6 @@
 [![Discord](https://img.shields.io/discord/843749923060711464?label=Join%20on%20Discord)](https://100ms.live/discord)
 [![Firebase](https://img.shields.io/badge/Download%20Android-Firebase-green)](https://appdistribution.firebase.dev/i/b623e5310929ab70)
 [![TestFlight](https://img.shields.io/badge/Download%20iOS-TestFlight-blue)](https://testflight.apple.com/join/Uhzebmut)
-[![Activity](https://img.shields.io/github/commit-activity/m/100mslive/100ms-flutter.svg)](https://github.com/100mslive/100ms-flutter/projects/1)
 [![Register](https://img.shields.io/badge/Contact-Know%20More-blue)](https://dashboard.100ms.live/register)
 
 <p align="center" width="100%">

diff --git a/packages/hms_room_kit/example/ios/Podfile.lock b/packages/hms_room_kit/example/ios/Podfile.lock
@@ -5,37 +5,46 @@ PODS:
   - HMSHLSPlayerSDK (0.0.2):
     - HMSAnalyticsSDK (= 0.0.2)
   - HMSNoiseCancellationModels (1.0.0)
-  - HMSSDK (1.9.0):
+  - HMSSDK (1.16.1):
     - HMSAnalyticsSDK (= 0.0.2)
-    - HMSWebRTC (= 1.0.6168)
-  - hmssdk_flutter (1.10.1):
+    - HMSWebRTC (= 1.0.6171)
+  - hmssdk_flutter (1.10.6):
     - Flutter
     - HMSBroadcastExtensionSDK (= 0.0.9)
     - HMSHLSPlayerSDK (= 0.0.2)
     - HMSNoiseCancellationModels (= 1.0.0)
-    - HMSSDK (= 1.9.0)
-  - HMSWebRTC (1.0.6168)
+    - HMSSDK (= 1.16.1)
+  - HMSWebRTC (1.0.6171)
+  - image_picker_ios (0.0.1):
+    - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
   - permission_handler_apple (9.1.1):
     - Flutter
+  - pointer_interceptor_ios (0.0.1):
+    - Flutter
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
   - url_launcher_ios (0.0.1):
     - Flutter
+  - webview_flutter_wkwebview (0.0.1):
+    - Flutter
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
   - hmssdk_flutter (from `.symlinks/plugins/hmssdk_flutter/ios`)
+  - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
+  - pointer_interceptor_ios (from `.symlinks/plugins/pointer_interceptor_ios/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
+  - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
 
 SPEC REPOS:
   trunk:
@@ -51,31 +60,40 @@ EXTERNAL SOURCES:
     :path: Flutter
   hmssdk_flutter:
     :path: ".symlinks/plugins/hmssdk_flutter/ios"
+  image_picker_ios:
+    :path: ".symlinks/plugins/image_picker_ios/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
+  pointer_interceptor_ios:
+    :path: ".symlinks/plugins/pointer_interceptor_ios/ios"
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
+  webview_flutter_wkwebview:
+    :path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
 
 SPEC CHECKSUMS:
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   HMSAnalyticsSDK: 4d2a88a729b1eb42f3d25f217c28937ec318a5b7
   HMSBroadcastExtensionSDK: d80fe325f6c928bd8e5176290b5a4b7ae15d6fbb
   HMSHLSPlayerSDK: 6a54ad4d12f3dc2270d1ecd24019d71282a4f6a3
   HMSNoiseCancellationModels: a3bda1405a16015632f4bcabd46ce48f35103b02
-  HMSSDK: 96bdafc1c610aabfecd1155ad7e3c1bc45b3a6cb
-  hmssdk_flutter: c2ad70779ed9355577afbbe1047fb20f862820ac
-  HMSWebRTC: a302f0d6c94f7bee94f3265adb7bb1c6569e7ee5
+  HMSSDK: 31e779fbf9c95335d88475a7f9f42fb077692e30
+  hmssdk_flutter: da118bf9558b0556b609cdc14540dca5514291ac
+  HMSWebRTC: f6f4f02a665fda6d9d8a5b223272045c3d9486fb
+  image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
   path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
+  pointer_interceptor_ios: 9280618c0b2eeb80081a343924aa8ad756c21375
   share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
   shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
   url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
+  webview_flutter_wkwebview: 4f3e50f7273d31e5500066ed267e3ae4309c5ae4
 
 PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b
 

diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock
@@ -342,30 +342,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.7"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.0.4"
-  leak_tracker_flutter_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_flutter_testing
-      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.3"
-  leak_tracker_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
   linkify:
     dependency: transitive
     description:
@@ -394,26 +370,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16+1"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.10.0"
   mime:
     dependency: transitive
     description:
@@ -434,10 +410,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.8.3"
   path_parsing:
     dependency: transitive
     description:
@@ -727,10 +703,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0"
+    version: "0.6.1"
   tuple:
     dependency: transitive
     description:
@@ -859,14 +835,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.4.0+2"
-  vm_service:
+  web:
     dependency: transitive
     description:
-      name: vm_service
-      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      name: web
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.1"
+    version: "0.3.0"
   webview_flutter:
     dependency: transitive
     description:
@@ -924,5 +900,5 @@ packages:
     source: hosted
     version: "6.3.0"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
-  flutter: ">=3.18.0-18.0.pre.54"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
+  flutter: ">=3.13.0"
diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_store.dart b/packages/hms_room_kit/lib/src/meeting/meeting_store.dart
@@ -380,7 +380,6 @@ class MeetingStore extends ChangeNotifier
   void endRoom(bool lock, String? reason) {
     isEndRoomCalled = true;
     _hmsSDKInteractor.endRoom(lock, reason ?? "", this);
-    _hmsSDKInteractor.destroy();
   }
 
   void removePeerFromRoom(HMSPeer peer) {

diff --git a/packages/hms_room_kit/lib/src/meeting_screen_controller.dart b/packages/hms_room_kit/lib/src/meeting_screen_controller.dart
@@ -92,12 +92,7 @@ class _MeetingScreenControllerState extends State<MeetingScreenController> {
     _meetingStore = MeetingStore(hmsSDKInteractor: widget.hmsSDKInteractor);
     _setInitValues();
     _joinMeeting();
-
-    ///If the role is hlsStreaming we set the HLS Player store
-    if (HMSRoomLayout.roleLayoutData?.screens?.conferencing?.hlsLiveStreaming !=
-        null) {
-      _setHLSPlayerStore();
-    }
+    _setHLSPlayerStore();
   }
 
   ///This function joins the room only if the name is not empty

diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_bottom_sheet.dart
@@ -153,19 +153,9 @@ class _ChatBottomSheetState extends State<ChatBottomSheet> {
                                             child: const HMSEmptyChatWidget())))
                                 : Expanded(
                                     child: Column(children: [
-                                      Selector<MeetingStore, int>(
-                                          selector: (_, meetingStore) =>
-                                              meetingStore
-                                                  .pinnedMessages.length,
-                                          builder:
-                                              (_, pinnedMessageLength, __) {
-                                            return pinnedMessageLength > 0
-                                                ? Expanded(
-                                                    flex: 1,
-                                                    child:
-                                                        const PinChatWidget())
-                                                : const SizedBox();
-                                          }),
+                                      Expanded(
+                                          flex: 1,
+                                          child: const PinChatWidget()),
 
                                       /// List containing chats
                                       Expanded(

diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_utilities_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/chat_utilities_bottom_sheet.dart
@@ -30,6 +30,7 @@ class ChatUtilitiesBottomSheet extends StatefulWidget {
 class _ChatUtilitiesBottomSheetState extends State<ChatUtilitiesBottomSheet> {
   bool isPinned = false;
   bool isBlocked = false;
+  bool isLocalBlocked = false;
 
   @override
   initState() {
@@ -39,14 +40,32 @@ class _ChatUtilitiesBottomSheetState extends State<ChatUtilitiesBottomSheet> {
             (element) => element["id"] == widget.message.messageId) !=
         -1;
 
-    isBlocked = context.read<MeetingStore>().blackListedUserIds.indexWhere(
-            (userId) => userId == widget.message.sender?.customerUserId) !=
-        -1;
+    // Initial check for isBlocked
+    updateIsBlocked();
+
+    // Add listener to update isBlocked when blackListedUserIds changes
+    context.read<MeetingStore>().addListener(updateIsBlocked);
+  }
+
+  void updateIsBlocked() {
+    setState(() {
+      isBlocked = context.read<MeetingStore>().blackListedUserIds.indexWhere(
+              (userId) => userId == widget.message.sender?.customerUserId) !=
+          -1;
+      isLocalBlocked = context
+              .read<MeetingStore>()
+              .blackListedUserIds
+              .indexWhere((userId) =>
+                  userId ==
+                  context.read<MeetingStore>().localPeer?.customerUserId) !=
+          -1;
+    });
   }
 
   @override
   void deactivate() {
     context.read<MeetingStore>().removeBottomSheet(context);
+    context.read<MeetingStore>().removeListener(updateIsBlocked);
     super.deactivate();
   }
 
@@ -156,7 +175,8 @@ class _ChatUtilitiesBottomSheetState extends State<ChatUtilitiesBottomSheet> {
 
             if ((HMSRoomLayout.chatData?.realTimeControls?.canBlockUser ??
                     false) &&
-                !(widget.message.sender?.isLocal ?? true))
+                !(widget.message.sender?.isLocal ?? true) &&
+                !isLocalBlocked)
               ListTile(
                   horizontalTitleGap: 2,
                   onTap: () async {

diff --git a/packages/hms_room_kit/lib/src/widgets/common_widgets/message_container.dart b/packages/hms_room_kit/lib/src/widgets/common_widgets/message_container.dart
@@ -97,9 +97,7 @@ class MessageContainer extends StatelessWidget {
                     mainAxisAlignment: MainAxisAlignment.end,
                     children: [
                       HMSSubtitleText(
-                        text: message.time == null
-                            ? ""
-                            : formatter.format(message.time!),
+                        text: formatter.format(message.time),
                         textColor: HMSThemeColors.onSurfaceMediumEmphasis,
                       ),
                       const SizedBox(