fix: handle nullable timestamps in audio model and service (#1320)

* fix: handle nullable timestamps in audio model and service * fix: update audio progress indicator to handle zero values correctly
freeCodeCamp · Feb 10, 2025 · 42c8530 · 42c8530
1 parent 91eaf5c
commit 42c8530
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 29 deletions.
diff --git a/mobile-app/lib/models/learn/challenge_model.dart b/mobile-app/lib/models/learn/challenge_model.dart
@@ -273,8 +273,8 @@ class Blank {
 class EnglishAudio {
   final String fileName;
   final String startTime;
-  final String startTimeStamp;
-  final String finishTimeStamp;
+  final String? startTimeStamp;
+  final String? finishTimeStamp;
 
   const EnglishAudio({
     required this.fileName,
@@ -287,8 +287,8 @@ class EnglishAudio {
     return EnglishAudio(
       fileName: data['filename'],
       startTime: data['startTime'].toString(),
-      startTimeStamp: data['startTimestamp'].toString(),
-      finishTimeStamp: data['finishTimestamp'].toString(),
+      startTimeStamp: data['startTimestamp']?.toString(),
+      finishTimeStamp: data['finishTimestamp']?.toString(),
     );
   }
 }
diff --git a/mobile-app/lib/service/audio/audio_service.dart b/mobile-app/lib/service/audio/audio_service.dart
@@ -174,10 +174,11 @@ class AudioPlayerHandler extends BaseAudioHandler {
     }
   }
 
-  Duration parseTimeStamp(String timeStamp) {
-    if (timeStamp == '0') {
+  Duration parseTimeStamp(String? timeStamp) {
+    if (timeStamp == null || timeStamp == '0') {
       return const Duration(milliseconds: 0);
     }
+
     return Duration(
       milliseconds: (double.parse(timeStamp) * 1000).round(),
     );
@@ -205,7 +206,9 @@ class AudioPlayerHandler extends BaseAudioHandler {
     _audioPlayer.setAudioSource(
       ClippingAudioSource(
         start: parseTimeStamp(audio.startTimeStamp),
-        end: parseTimeStamp(audio.finishTimeStamp),
+        end: audio.finishTimeStamp == null
+            ? null
+            : parseTimeStamp(audio.finishTimeStamp),
         child: AudioSource.uri(
           Uri.parse(
             returnUrl(audio.fileName),

diff --git a/mobile-app/lib/ui/views/learn/challenge/templates/english/english_view.dart b/mobile-app/lib/ui/views/learn/challenge/templates/english/english_view.dart
@@ -143,25 +143,26 @@ class EnglishView extends StatelessWidget {
                           ),
                         ),
                       ),
-                      Container(
-                        color: const Color(0xFF0a0a23),
-                        margin: const EdgeInsets.all(8),
-                        child: Row(
-                          children: [
-                            Expanded(
-                              child: Padding(
-                                padding: const EdgeInsets.all(16.0),
-                                child: Wrap(
-                                  children: model.getFillInBlankWidgets(
-                                    challenge,
-                                    context,
+                      if (challenge.fillInTheBlank != null)
+                        Container(
+                          color: const Color(0xFF0a0a23),
+                          margin: const EdgeInsets.all(8),
+                          child: Row(
+                            children: [
+                              Expanded(
+                                child: Padding(
+                                  padding: const EdgeInsets.all(16.0),
+                                  child: Wrap(
+                                    children: model.getFillInBlankWidgets(
+                                      challenge,
+                                      context,
+                                    ),
                                   ),
                                 ),
-                              ),
-                            )
-                          ],
+                              )
+                            ],
+                          ),
                         ),
-                      ),
                       Row(
                         children: [
                           Expanded(

diff --git a/mobile-app/lib/ui/views/learn/widgets/audio/audio_player_view.dart b/mobile-app/lib/ui/views/learn/widgets/audio/audio_player_view.dart
@@ -88,14 +88,14 @@ class InnerAudioWidget extends StatelessWidget {
           );
 
           Duration? totalDuration = model.audioService.duration();
-
+          int handleTotal = totalDuration?.inMilliseconds ?? 0;
+          bool hasZeroValue = handleTotal == 0 || position.inMilliseconds == 0;
           return Column(
             children: [
-              if (totalDuration != null)
-                LinearProgressIndicator(
-                  value: position.inMilliseconds / totalDuration.inMilliseconds,
-                  minHeight: 8,
-                ),
+              LinearProgressIndicator(
+                value: hasZeroValue ? 0 : position.inMilliseconds / handleTotal,
+                minHeight: 8,
+              ),
               Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [