Hotfixes

lib/api/api.dart

@@ -18,6 +18,7 @@
  */
 
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:bluecherry_client/api/api_helpers.dart';
 import 'package:bluecherry_client/models/device.dart';
@@ -52,6 +53,8 @@ class API {
     }
   }
 
+  static String get cookieHeader => HttpHeaders.cookieHeader;
+
   /// Checks details of a [server] entered by the user.
   /// If the attributes present in [Server] are correct, then the
   /// returned object will have [Server.serverUUID] & [Server.cookie]
@@ -139,7 +142,7 @@ class API {
           },
         ),
         headers: {
-          if (server.cookie != null) 'Cookie': server.cookie!,
+          if (server.cookie != null) API.cookieHeader: server.cookie!,
         },
       );
       // debugPrint(response.body);
@@ -207,7 +210,7 @@ class API {
           '/mobile-app-config.json',
         ),
         headers: {
-          'Cookie': server.cookie!,
+          if (server.cookie != null) API.cookieHeader: server.cookie!,
         },
       );
       final body = jsonDecode(response.body);
@@ -235,8 +238,8 @@ class API {
       final response = await client.post(
         Uri.parse('${uri!}store-token'),
         headers: {
-          'Cookie': server.cookie!,
-          'Content-Type': 'application/json',
+          API.cookieHeader: server.cookie!,
+          HttpHeaders.contentTypeHeader: 'application/json',
         },
         body: jsonEncode(
           {
@@ -279,7 +282,7 @@ class API {
       final response = await client.post(
         Uri.parse('${uri!}remove-token'),
         headers: {
-          'Cookie': server.cookie!,
+          API.cookieHeader: server.cookie!,
           'Content-Type': 'application/json',
         },
         body: jsonEncode(

lib/api/events.dart

@@ -85,8 +85,12 @@ extension EventsExtension on API {
         if (deviceId != null) 'device_id': '$deviceId',
       },
     );
-    final response =
-        await API.client.get(uri, headers: {'Cookie': server.cookie!});
+    final response = await API.client.get(
+      uri,
+      headers: {
+        if (server.cookie != null) API.cookieHeader: server.cookie!,
+      },
+    );
 
     var events = const Iterable<Event>.empty();
 

lib/api/ptz.dart

@@ -17,6 +17,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'dart:io';
+
 import 'package:bluecherry_client/api/api.dart';
 import 'package:bluecherry_client/models/device.dart';
 import 'package:flutter/widgets.dart';
@@ -116,7 +118,7 @@ extension PtzApiExtension on API {
       url,
       headers: {
         'Content-Type': 'application/x-www-form-urlencoded',
-        'Cookie': server.cookie!,
+        if (server.cookie != null) API.cookieHeader: server.cookie!,
       },
     );
 
@@ -158,8 +160,8 @@ extension PtzApiExtension on API {
     final response = await API.client.get(
       url,
       headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        'Cookie': server.cookie!,
+        HttpHeaders.contentTypeHeader: 'application/x-www-form-urlencoded',
+        if (server.cookie != null) API.cookieHeader: server.cookie!,
       },
     );
 

lib/main.dart

@@ -153,11 +153,11 @@ Future<void> main(List<String> args) async {
     // wait time at the splash screen
     // settings provider needs to be initalized alone
     await SettingsProvider.ensureInitialized();
+    await ServersProvider.ensureInitialized();
     await Future.wait([
       DownloadsManager.ensureInitialized(),
       MobileViewProvider.ensureInitialized(),
       DesktopViewProvider.ensureInitialized(),
-      ServersProvider.ensureInitialized(),
       UpdateManager.ensureInitialized(),
       EventsProvider.ensureInitialized(),
     ]);

lib/models/device.dart

@@ -277,7 +277,10 @@ class Device {
     );
 
     try {
-      var response = await API.client.get(uri);
+      var response = await API.client.get(uri, headers: {
+        if (device.server.cookie != null)
+          API.cookieHeader: device.server.cookie!,
+      });
 
       if (response.statusCode == 200) {
         var ret = json.decode(response.body) as Map;

lib/providers/events_provider.dart

@@ -24,6 +24,7 @@ import 'package:bluecherry_client/providers/app_provider_interface.dart';
 import 'package:bluecherry_client/providers/server_provider.dart';
 import 'package:bluecherry_client/screens/events_browser/filter.dart';
 import 'package:bluecherry_client/utils/constants.dart';
+import 'package:bluecherry_client/utils/extensions.dart';
 import 'package:bluecherry_client/utils/logging.dart';
 import 'package:bluecherry_client/utils/storage.dart';
 import 'package:flutter/foundation.dart';
@@ -133,6 +134,19 @@ class EventsProvider extends UnityProvider {
 
     selectedDevices =
         List<String>.from(data['selectedDevices'] as List).toSet();
+    selectedDevices.removeWhere((device) {
+      final server = ServersProvider.instance.servers.firstWhereOrNull(
+        (server) => server.devices.any((d) => d.streamURL == device),
+      );
+      return server == null ||
+          !server.devices.any((d) {
+            if (d.streamURL == device) {
+              return d.status;
+            } else {
+              return false;
+            }
+          });
+    });
 
     super.restore(notifyListeners: notifyListeners);
   }

lib/providers/settings_provider.dart

@@ -435,7 +435,7 @@ class SettingsProvider extends UnityProvider {
     };
   }
 
-  // TODO(bdlukaa): remove this in future releases
+  // TODO(bdlukaa): Remove this migration in future releases
   var _hasMigratedTimezone = false;
   late final kConvertTimeToLocalTimezone = _SettingsOption<bool>(
     def: true,

lib/utils/logging.dart

@@ -45,12 +45,12 @@ void handleError(
   writeErrorToFile(error, stackTrace, context);
 }
 
-Future<File> getLogFile() async {
+Future<File?> getLogFile() async {
   try {
     return File(path.join(supportDir.path, 'logs.txt'));
   } catch (e) {
-    debugPrint('Error getting log file: $e');
-    return File('./logs.txt');
+    // debugPrint('Error getting log file: $e');
+    return null;
   }
 }
 
@@ -67,9 +67,8 @@ Future<void> writeErrorToFile(
       '[$time]Stack trace: $stackTrace';
 
   final file = await getLogFile();
-
-  await file.writeAsString(errorLog, mode: FileMode.append);
-  Logger.root.log(Level.INFO, 'Wrote log file to "${file.path}"');
+  await file?.writeAsString(errorLog, mode: FileMode.append);
+  Logger.root.log(Level.INFO, 'Wrote log file to "${file?.path}"');
   Logger.root.log(Level.SEVERE, errorLog);
 }
 
@@ -78,8 +77,8 @@ Future<void> writeLogToFile(String text, {bool print = false}) async {
     final time = DateTime.now().toIso8601String();
     final file = await getLogFile();
 
-    await file.writeAsString('\n[$time] $text', mode: FileMode.append);
-    if (print) Logger.root.log(Level.INFO, 'Wrote log file to "${file.path}"');
+    await file?.writeAsString('\n[$time] $text', mode: FileMode.append);
+    if (print) Logger.root.log(Level.INFO, 'Wrote log file to "${file?.path}"');
   }
   if (print) debugPrint(text);
 }

lib/utils/video_player.dart

@@ -19,6 +19,7 @@
 
 import 'dart:async';
 
+import 'package:bluecherry_client/api/api.dart';
 import 'package:bluecherry_client/models/device.dart';
 import 'package:bluecherry_client/models/event.dart';
 import 'package:bluecherry_client/providers/settings_provider.dart';
@@ -100,7 +101,10 @@ class UnityPlayers with ChangeNotifier {
         };
         debugPrint('Initializing $source');
         controller.fallbackUrl = fallback;
-        await controller.setDataSource(source);
+        await controller.setDataSource(source, headers: {
+          if (device.server.cookie != null)
+            API.cookieHeader: device.server.cookie!,
+        });
 
         _reloadable.add(source);
       }
@@ -155,12 +159,20 @@ class UnityPlayers with ChangeNotifier {
       softwareZoom: settings().kSoftwareZooming.value,
       onLog: (message) {
         logStreamToFile(
-          event.mediaURL?.toString() ?? 'Event ${event.title} (${event.id})',
+          event.mediaURL == null
+              ? 'Event ${event.title} (${event.id})'
+              : event.mediaPath,
           message,
         );
       },
     )
-      ..setDataSource(event.mediaPath.toString())
+      ..setDataSource(
+        event.mediaPath,
+        headers: {
+          if (event.server.cookie != null)
+            API.cookieHeader: event.server.cookie!,
+        },
+      )
       ..setVolume(1.0)
       ..setSpeed(1.0);
 

linux/flutter/generated_plugins.cmake

@@ -13,7 +13,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
-  media_kit_native_event_loop
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)

packages/unity_video_player/unity_video_player_flutter/lib/unity_video_player_flutter.dart

@@ -164,7 +164,11 @@ class UnityVideoPlayerFlutter extends UnityVideoPlayer {
       _videoStream.stream.map((value) => value.isPlaying);
 
   @override
-  Future<void> setDataSource(String url, {bool autoPlay = true}) async {
+  Future<void> setDataSource(
+    String url, {
+    bool autoPlay = true,
+    Map<String, String>? headers,
+  }) async {
     if (url == dataSource) return Future.value();
 
     if (player != null) {
@@ -180,7 +184,10 @@ class UnityVideoPlayerFlutter extends UnityVideoPlayer {
     if (uri.scheme == 'file') {
       player = VideoPlayerController.file(File.fromUri(uri));
     } else {
-      player = VideoPlayerController.networkUrl(uri);
+      player = VideoPlayerController.networkUrl(
+        uri,
+        httpHeaders: headers ?? const <String, String>{},
+      );
     }
 
     try {

packages/unity_video_player/unity_video_player_main/lib/unity_video_player_main.dart

@@ -306,13 +306,20 @@ class UnityVideoPlayerMediaKit extends UnityVideoPlayer {
   }
 
   @override
-  Future<void> setDataSource(String url, {bool autoPlay = true}) {
+  Future<void> setDataSource(
+    String url, {
+    bool autoPlay = true,
+    Map<String, String>? headers,
+  }) {
     if (url == dataSource) return Future.value();
     debugPrint('Playing $url');
     return ensureVideoControllerInitialized((controller) async {
       await mkPlayer.setPlaylistMode(PlaylistMode.loop);
       // do not use mkPlayer.add because it doesn't support auto play
-      await mkPlayer.open(Playlist([Media(url)]), play: autoPlay);
+      await mkPlayer.open(
+        Playlist([Media(url, httpHeaders: headers)]),
+        play: autoPlay,
+      );
     });
   }
 

packages/unity_video_player/unity_video_player_main/pubspec.yaml

@@ -22,10 +22,10 @@ dependencies:
   #   git:
   #     url: https://github.com/media-kit/media-kit/
   #     path: media_kit/
-  media_kit_native_event_loop:
-    git:
-      url: https://github.com/media-kit/media-kit/
-      path: media_kit_native_event_loop/
+  # media_kit_native_event_loop:
+  #   git:
+  #     url: https://github.com/media-kit/media-kit/
+  #     path: media_kit_native_event_loop/
   # media_kit_video:
   #   git:
   #     url: https://github.com/media-kit/media-kit/
@@ -57,18 +57,18 @@ dev_dependencies:
   flutter_lints: ^2.0.0
 
 dependency_overrides:
-  media_kit:
-    git:
-     url: https://github.com/media-kit/media-kit/
-     path: media_kit/
+  # media_kit:
+  #   git:
+  #    url: https://github.com/media-kit/media-kit/
+  #    path: media_kit/
   #media_kit_native_event_loop:
   #  git:
   #    url: https://github.com/media-kit/media-kit/
   #    path: media_kit_native_event_loop/
-  media_kit_video:
-    git:
-      url: https://github.com/media-kit/media-kit/
-      path: media_kit_video/
+  # media_kit_video:
+  #   git:
+  #     url: https://github.com/media-kit/media-kit/
+  #     path: media_kit_video/
 #   media_kit_libs_android_video:
 #     git:
 #       url: https://github.com/media-kit/media-kit/

packages/unity_video_player/unity_video_player_platform_interface/lib/unity_video_player_platform_interface.dart

@@ -395,7 +395,11 @@ abstract class UnityVideoPlayer with ChangeNotifier {
   /// Whether the media is seekable
   bool get isSeekable;
 
-  Future<void> setDataSource(String url, {bool autoPlay = true});
+  Future<void> setDataSource(
+    String url, {
+    bool autoPlay = true,
+    Map<String, String>? headers,
+  });
   Future<void> setMultipleDataSource(
     Iterable<String> url, {
     bool autoPlay = true,