Merge pull request #220 from dexsper/master

Minor bug fixes

Author: dddevid

lib/main.dart

@@ -49,6 +49,7 @@ final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
 
 /// Checks if the app is running on an emulator/simulator
 Future<bool> _isRunningOnEmulator() async {
+  if (kDebugMode) return false;
   if (kIsWeb) return false;
   if (!Platform.isAndroid && !Platform.isIOS) return false;
 
@@ -127,14 +128,10 @@ class _EmulatorWarningScreen extends StatelessWidget {
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
-  // Check if running on emulator (mobile only)
-  if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
-    final isEmulator = await _isRunningOnEmulator();
-    if (isEmulator) {
-      // Show emulator warning and don't load the actual app
-      runApp(const _EmulatorWarningScreen());
-      return;
-    }
+  final isEmulator = await _isRunningOnEmulator();
+  if (isEmulator) {
+    runApp(const _EmulatorWarningScreen());
+    return;
   }
 
   JustAudioMediaKit.ensureInitialized(linux: true, windows: false);

lib/screens/now_playing_screen.dart

@@ -135,6 +135,18 @@ class _NowPlayingScreenState extends State<NowPlayingScreen>
 
   void _onHorizontalDragStart(DragStartDetails details) {
     if (_showLyrics || _isSwipeAnimating) return;
+
+    if (!kIsWeb && Platform.isAndroid) {
+      final mediaQuery = MediaQuery.of(context);
+      final sysInsets = mediaQuery.systemGestureInsets;
+      final screenWidth = mediaQuery.size.width;
+      const kEdgeBuffer = 8.0;
+      final dx = details.globalPosition.dx;
+      final inLeftZone = dx < sysInsets.left + kEdgeBuffer;
+      final inRightZone = dx > screenWidth - sysInsets.right - kEdgeBuffer;
+      if (inLeftZone || inRightZone) return;
+    }
+
     _isHorizontalDragging = true;
     _hasTriggeredHaptic = false;
   }

lib/services/subsonic_service.dart

@@ -169,6 +169,18 @@ class SubsonicService {
       }
 
       HttpClient createClient() {
+        HttpClient buildClient(SecurityContext context) {
+          return HttpOverrides.runWithHttpOverrides(() {
+            final client = HttpClient(context: context);
+            client.connectionTimeout = const Duration(seconds: 15);
+            client.idleTimeout = const Duration(seconds: 15);
+            if (allowSelfSigned) {
+              client.badCertificateCallback = (cert, host, port) => true;
+            }
+            return client;
+          }, _RealHttpOverrides());
+        }
+
         try {
           final context = SecurityContext(withTrustedRoots: true);
 
@@ -185,23 +197,10 @@ class SubsonicService {
             context.usePrivateKeyBytes(clientCertBytes, password: password);
           }
 
-          final client = HttpClient(context: context);
-          client.connectionTimeout = const Duration(seconds: 15);
-          client.idleTimeout = const Duration(seconds: 15);
-          if (allowSelfSigned) {
-            client.badCertificateCallback = (cert, host, port) => true;
-          }
-          return client;
+          return buildClient(context);
         } catch (e) {
           debugPrint('Failed to configure TLS: $e');
-
-          final client = HttpClient();
-          client.connectionTimeout = const Duration(seconds: 15);
-          client.idleTimeout = const Duration(seconds: 15);
-          if (allowSelfSigned) {
-            client.badCertificateCallback = (cert, host, port) => true;
-          }
-          return client;
+          return buildClient(SecurityContext(withTrustedRoots: true));
         }
       }
 
@@ -1111,3 +1110,6 @@ class _TlsHttpOverrides extends HttpOverrides {
   @override
   HttpClient createHttpClient(SecurityContext? context) => _factory();
 }
+
+/// Bypasses [HttpOverrides.global] to create a real [HttpClient].
+class _RealHttpOverrides extends HttpOverrides {}