From c38ae1bd7881aa075f9c8f63b0c5ec4c6ffe8714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leon=20B=C3=B6sche?= <leonboesche1999@gmail.com>
Date: Wed, 14 Jan 2026 11:52:28 +0100
Subject: [PATCH] Refactor video viewer to remove web-specific handling and
 improve error messaging

---
 b0esche_cloud/lib/pages/video_viewer.dart    | 13 ++-----------
 b0esche_cloud/lib/services/file_service.dart | 10 +++++-----
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/b0esche_cloud/lib/pages/video_viewer.dart b/b0esche_cloud/lib/pages/video_viewer.dart
index 3efd305..dbfe127 100644
--- a/b0esche_cloud/lib/pages/video_viewer.dart
+++ b/b0esche_cloud/lib/pages/video_viewer.dart
@@ -1,7 +1,5 @@
 // ignore: unused_import
 import 'dart:io' show Platform;
-import 'package:flutter/foundation.dart' show kIsWeb;
-import 'video_viewer_web.dart';
 import 'package:flutter/material.dart';
 import 'package:video_player/video_player.dart';
 import '../theme/app_theme.dart';
@@ -46,13 +44,6 @@ class _VideoViewerState extends State<VideoViewer> {
 
   @override
   Widget build(BuildContext context) {
-    if (kIsWeb) {
-      // Use web-specific video viewer
-      return VideoViewerWeb(
-        videoUrl: widget.videoUrl,
-        fileName: widget.fileName,
-      );
-    }
     return Dialog(
       backgroundColor: Colors.transparent,
       child: ConstrainedBox(
@@ -85,8 +76,8 @@ class _VideoViewerState extends State<VideoViewer> {
               const SizedBox(height: 16),
               if (_isError)
                 const Text(
-                  'Failed to load video',
-                  style: TextStyle(color: Colors.red),
+                  'File type not supported or video could not be loaded',
+                  style: TextStyle(color: AppTheme.primaryText),
                 )
               else if (!_isInitialized)
                 const Center(
diff --git a/b0esche_cloud/lib/services/file_service.dart b/b0esche_cloud/lib/services/file_service.dart
index 6bad05c..2838156 100644
--- a/b0esche_cloud/lib/services/file_service.dart
+++ b/b0esche_cloud/lib/services/file_service.dart
@@ -121,11 +121,11 @@ class FileService {
     required String fileId,
     String? fileName,
   }) async {
-    // If you have a direct fileId-based endpoint, use it. Otherwise, fallback to path-based if needed.
-    if (orgId.isEmpty) {
-      return '/user/files/download?id=${Uri.encodeComponent(fileId)}';
-    }
-    return '/orgs/$orgId/files/download?id=${Uri.encodeComponent(fileId)}';
+    // Return the full download URL
+    final path = orgId.isEmpty
+        ? '/user/files/download?id=${Uri.encodeComponent(fileId)}'
+        : '/orgs/$orgId/files/download?id=${Uri.encodeComponent(fileId)}';
+    return '$baseUrl$path';
   }
 
   Future<void> createFolder(