From 0e35f7c6c51cd3616ed1db18ebaf7b235a5c8c51 Mon Sep 17 00:00:00 2001
From: Sebastian Klingler <sliptype@gmail.com>
Date: Sun, 27 Nov 2022 14:01:18 -0600
Subject: [PATCH] Fix android double play (#2309)

---
 .../now-playing-drawer/NowPlayingDrawer.tsx   | 94 +++++++++----------
 1 file changed, 46 insertions(+), 48 deletions(-)

diff --git a/packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx b/packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx
index 246dc0a9a6..690a623103 100644
--- a/packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx
+++ b/packages/mobile/src/components/now-playing-drawer/NowPlayingDrawer.tsx
@@ -294,55 +294,53 @@ export const NowPlayingDrawer = memo(function NowPlayingDrawer(
       // Disable safe area view edges because they are handled manually
       disableSafeAreaView
     >
-      {track ? (
-        <View
-          style={[
-            styles.container,
-            { paddingTop: staticTopInset.current, paddingBottom: insets.bottom }
-          ]}
-        >
-          <View style={styles.playBarContainer}>
-            <PlayBar
-              track={track}
-              user={user}
-              onPress={onDrawerOpen}
-              translationAnim={translationAnim}
-            />
-          </View>
-          <Logo translationAnim={translationAnim} />
-          <View style={styles.titleBarContainer}>
-            <TitleBar onClose={handleDrawerCloseFromSwipe} />
-          </View>
-          <Pressable onPress={handlePressTitle} style={styles.artworkContainer}>
-            <Artwork track={track} />
-          </Pressable>
-          <View style={styles.trackInfoContainer}>
-            <TrackInfo
-              onPressArtist={handlePressArtist}
-              onPressTitle={handlePressTitle}
-              track={track}
-              user={user}
-            />
-          </View>
-          <View style={styles.scrubberContainer}>
-            <Scrubber
-              mediaKey={`${mediaKey}`}
-              isPlaying={isPlaying}
-              onPressIn={onPressScrubberIn}
-              onPressOut={onPressScrubberOut}
-              duration={track?.duration ?? 0}
-            />
-          </View>
-          <View style={styles.controlsContainer}>
-            <AudioControls
-              onNext={onNext}
-              onPrevious={onPrevious}
-              isPodcast={track?.genre === Genre.PODCASTS}
-            />
-            <ActionsBar track={track} />
-          </View>
+      <View
+        style={[
+          styles.container,
+          { paddingTop: staticTopInset.current, paddingBottom: insets.bottom }
+        ]}
+      >
+        <View style={styles.playBarContainer}>
+          <PlayBar
+            track={track}
+            user={user}
+            onPress={onDrawerOpen}
+            translationAnim={translationAnim}
+          />
         </View>
-      ) : null}
+        <Logo translationAnim={translationAnim} />
+        <View style={styles.titleBarContainer}>
+          <TitleBar onClose={handleDrawerCloseFromSwipe} />
+        </View>
+        <Pressable onPress={handlePressTitle} style={styles.artworkContainer}>
+          <Artwork track={track} />
+        </Pressable>
+        <View style={styles.trackInfoContainer}>
+          <TrackInfo
+            onPressArtist={handlePressArtist}
+            onPressTitle={handlePressTitle}
+            track={track}
+            user={user}
+          />
+        </View>
+        <View style={styles.scrubberContainer}>
+          <Scrubber
+            mediaKey={`${mediaKey}`}
+            isPlaying={isPlaying}
+            onPressIn={onPressScrubberIn}
+            onPressOut={onPressScrubberOut}
+            duration={track?.duration ?? 0}
+          />
+        </View>
+        <View style={styles.controlsContainer}>
+          <AudioControls
+            onNext={onNext}
+            onPrevious={onPrevious}
+            isPodcast={track?.genre === Genre.PODCASTS}
+          />
+          <ActionsBar track={track} />
+        </View>
+      </View>
     </Drawer>
   )
 })