gabehf/Fladder
1
0
Fork 0
mirror of https://github.com/gabehf/Fladder.git synced 2026-03-14 09:46:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Properly parse null values api (#230)

Browse source 
Co-authored-by: PartyDonut <PartyDonut@users.noreply.github.com>
This commit is contained in:
PartyDonut 2025-02-16 13:39:32 +01:00 • committed by GitHub
parent 492857a8ad
commit 3d82207694
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/models/items/media_streams_model.dart
View file

@ -2,7 +2,6 @@ import 'dart:convert';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
// ignore_for_file: public_member_api_docs, sort_constructors_first
import 'package:collection/collection.dart'; import 'package:collection/collection.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
@ -38,7 +37,7 @@ class MediaStreamsModel {
} }
AudioStreamModel? get currentAudioStream { AudioStreamModel? get currentAudioStream {
if (defaultAudioStreamIndex == -1) { if (defaultAudioStreamIndex == -1 || defaultAudioStreamIndex == null) {
return AudioStreamModel.no(); return AudioStreamModel.no();
} }
return audioStreams.firstWhereOrNull((element) => element.index == defaultAudioStreamIndex) ?? return audioStreams.firstWhereOrNull((element) => element.index == defaultAudioStreamIndex) ??
@ -46,7 +45,7 @@ class MediaStreamsModel {
} }
SubStreamModel? get currentSubStream { SubStreamModel? get currentSubStream {
if (defaultSubStreamIndex == -1) { if (defaultSubStreamIndex == -1 || defaultSubStreamIndex == null) {
return SubStreamModel.no(); return SubStreamModel.no();
} }
return subStreams.firstWhereOrNull((element) => element.index == defaultSubStreamIndex) ?? subStreams.firstOrNull; return subStreams.firstWhereOrNull((element) => element.index == defaultSubStreamIndex) ?? subStreams.firstOrNull;

4
lib/models/video_stream_model.dart
View file

@ -104,7 +104,7 @@ class VideoStream {
final MediaStreamsModel? mediaStreamsModel; final MediaStreamsModel? mediaStreamsModel;
AudioStreamModel? get currentAudioStream { AudioStreamModel? get currentAudioStream {
if (audioStreamIndex == -1) { if (audioStreamIndex == -1 || audioStreamIndex == null) {
return null; return null;
} }
return mediaStreamsModel?.audioStreams.firstWhereOrNull( return mediaStreamsModel?.audioStreams.firstWhereOrNull(
@ -112,7 +112,7 @@ class VideoStream {
} }
SubStreamModel? get currentSubStream { SubStreamModel? get currentSubStream {
if (subtitleStreamIndex == -1) { if (subtitleStreamIndex == -1 || subtitleStreamIndex == null) {
return null; return null;
} }
return mediaStreamsModel?.subStreams.firstWhereOrNull( return mediaStreamsModel?.subStreams.firstWhereOrNull(