diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 1e772655..6d8c7936 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -34,9 +34,9 @@ LSRequiresIPhoneOS NSCameraUsageDescription - Grant access to Photo Library will allow Solian take photo or video for your post. + Grant access to Camera will allow Solian take photo or video for your post. NSMicrophoneUsageDescription - Grant access to Photo Library will allow Solian record audio for your post. + Grant access to Microphone will allow Solian record audio for your post. NSPhotoLibraryAddUsageDescription Grant access to Photo Library will allow Solian download photo to album for you. NSPhotoLibraryUsageDescription diff --git a/lib/screens/chat/room.dart b/lib/screens/chat/room.dart index 34580718..d24c77c0 100644 --- a/lib/screens/chat/room.dart +++ b/lib/screens/chat/room.dart @@ -158,7 +158,7 @@ class _ChatRoomScreenState extends State { GoRouter.of(context).pushNamed( 'chatCallRoom', pathParameters: { - 'scope': _channel!.realm!.alias, + 'scope': _channel!.realm?.alias ?? 'global', 'alias': _channel!.alias, }, ); diff --git a/lib/screens/sharing.dart b/lib/screens/sharing.dart index e3824cad..2f8da8f8 100644 --- a/lib/screens/sharing.dart +++ b/lib/screens/sharing.dart @@ -1,8 +1,10 @@ import 'dart:async'; import 'dart:developer'; +import 'dart:io'; import 'package:cross_file/cross_file.dart'; import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:gap/gap.dart'; @@ -103,8 +105,10 @@ class _AppSharingListenerState extends State { @override void initState() { super.initState(); - _initialize(); - _initialHandle(); + if(!kIsWeb && (Platform.isAndroid || Platform.isIOS)) { + _initialize(); + _initialHandle(); + } } @override diff --git a/lib/widgets/chat/call/call_prejoin.dart b/lib/widgets/chat/call/call_prejoin.dart index bf1a13b1..68109e8d 100644 --- a/lib/widgets/chat/call/call_prejoin.dart +++ b/lib/widgets/chat/call/call_prejoin.dart @@ -1,4 +1,4 @@ -import 'package:dropdown_button2/dropdown_button2.dart'; + import 'package:dropdown_button2/dropdown_button2.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:livekit_client/livekit_client.dart'; @@ -130,7 +130,7 @@ class _ChatCallPrejoinPopupState extends State { Text('callCamera').tr(), Switch( value: call.enableVideo, - onChanged: (value) => call.setEnableAudio(value), + onChanged: call.setEnableVideo, ), ], ).padding(bottom: 5), diff --git a/macos/Runner/Info.plist b/macos/Runner/Info.plist index fc148163..59681288 100644 --- a/macos/Runner/Info.plist +++ b/macos/Runner/Info.plist @@ -31,16 +31,18 @@ NSPrincipalClass NSApplication NSCameraUsageDescription - Grant access to Photo Library will allow Solian take photo or video for your post. + Grant access to Camera will allow Solian use your camera during a call. NSMicrophoneUsageDescription - Grant access to Photo Library will allow Solian record audio for your post. + Grant access to Microphone will allow Solian use your microphone during a call. + NSPhotoLibraryAddUsageDescription + Grant access to Photo Library will allow Solian download photo to album for you. NSPhotoLibraryUsageDescription Grant access to Photo Library will allow Solian upload photo or video for your post. CFBundleDisplayName $(PRODUCT_NAME) + NSCameraUseContinuityCameraDeviceType + ITSAppUsesNonExemptEncryption - NSPhotoLibraryAddUsageDescription - Grant access to Photo Library will allow Solian download photo to album for you.