From f7a2393d991d1ac8e258e59395dedb19539b38d5 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 5 Jan 2022 19:09:18 -0600
Subject: [PATCH] Fix:Downloaded audiobook progress sync #77, Fix:Downloads
 page not showing, Fix: Audio player dropdown menu staying open

---
 .../app/AudiobookProgressSyncer.kt            |   4 +-
 components/app/AudioPlayer.vue                |   9 +-
 components/ui/DropdownMenu.vue                |   2 +-
 pages/downloads.vue                           | 158 +++++++++---------
 4 files changed, 88 insertions(+), 85 deletions(-)

diff --git a/android/app/src/main/java/com/audiobookshelf/app/AudiobookProgressSyncer.kt b/android/app/src/main/java/com/audiobookshelf/app/AudiobookProgressSyncer.kt
index 83282c61..4420ed98 100644
--- a/android/app/src/main/java/com/audiobookshelf/app/AudiobookProgressSyncer.kt
+++ b/android/app/src/main/java/com/audiobookshelf/app/AudiobookProgressSyncer.kt
@@ -70,8 +70,10 @@ class AudiobookProgressSyncer constructor(playerNotificationService:PlayerNotifi
     if (!listeningTimerRunning) return
     Log.d(tag, "stop: Stopping listening for $listeningBookTitle")
 
+    if (!webviewOpenOnStart) {
+      sync()
+    }
     reset()
-    sync()
   }
 
   fun reset() {
diff --git a/components/app/AudioPlayer.vue b/components/app/AudioPlayer.vue
index 3472e2e9..ea0f4f5e 100644
--- a/components/app/AudioPlayer.vue
+++ b/components/app/AudioPlayer.vue
@@ -8,7 +8,7 @@
         <span class="material-icons text-3xl" @click="castClick">cast</span>
       </div>
       <div class="top-4 right-4 absolute cursor-pointer">
-        <ui-dropdown-menu :items="menuItems" @action="clickMenuAction">
+        <ui-dropdown-menu ref="dropdownMenu" :items="menuItems" @action="clickMenuAction">
           <span class="material-icons text-3xl">more_vert</span>
         </ui-dropdown-menu>
       </div>
@@ -321,6 +321,7 @@ export default {
     },
     collapseFullscreen() {
       this.showFullscreen = false
+      this.forceCloseDropdownMenu()
     },
     jumpNextChapter() {
       if (this.loading) return
@@ -706,6 +707,11 @@ export default {
       } else if (action === 'close') {
         this.$emit('close')
       }
+    },
+    forceCloseDropdownMenu() {
+      if (this.$refs.dropdownMenu && this.$refs.dropdownMenu.closeMenu) {
+        this.$refs.dropdownMenu.closeMenu()
+      }
     }
   },
   mounted() {
@@ -715,6 +721,7 @@ export default {
     this.$nextTick(this.init)
   },
   beforeDestroy() {
+    this.forceCloseDropdownMenu()
     document.body.removeEventListener('touchstart', this.touchstart)
     document.body.removeEventListener('touchend', this.touchend)
 
diff --git a/components/ui/DropdownMenu.vue b/components/ui/DropdownMenu.vue
index 9d6344f4..fc3c3a81 100644
--- a/components/ui/DropdownMenu.vue
+++ b/components/ui/DropdownMenu.vue
@@ -91,8 +91,8 @@ export default {
       this.closeMenu()
     },
     clickedOption(itemValue) {
-      this.$emit('action', itemValue)
       this.closeMenu()
+      this.$emit('action', itemValue)
     }
   },
   mounted() {}
diff --git a/pages/downloads.vue b/pages/downloads.vue
index 20009c47..b86a6ffe 100644
--- a/pages/downloads.vue
+++ b/pages/downloads.vue
@@ -2,96 +2,90 @@
   <div class="w-full h-full py-6">
     <h1 class="text-2xl px-4">Downloads</h1>
 
-    <template v-if="isIos"></template>
-  </div>
-</template>
-<template v-else>
-  <div class="w-full px-2 py-2" :class="hasStoragePermission ? '' : 'text-error'">
-    <div class="flex items-center">
-      <span class="material-icons" @click="changeDownloadFolderClick">{{ hasStoragePermission ? 'folder' : 'error' }}</span>
-      <p v-if="hasStoragePermission" class="text-sm px-4" @click="changeDownloadFolderClick">{{ downloadFolderSimplePath || 'No Download Folder Selected' }}</p>
-      <p v-else class="text-sm px-4" @click="changeDownloadFolderClick">No Storage Permissions. Click here</p>
-    </div>
-    <!-- <p v-if="hasStoragePermission" class="text-xs text-gray-400 break-all max-w-full">{{ downloadFolderUri }}</p> -->
-  </div>
-
-  <div class="w-full h-10 relative">
-    <div class="absolute top-px left-0 z-10 w-full h-full flex">
-      <div class="flex-grow h-full bg-primary rounded-t-md mr-px" @click="showingDownloads = true">
-        <div class="flex items-center justify-center rounded-t-md border-t border-l border-r border-white border-opacity-20 h-full" :class="showingDownloads ? 'text-gray-100' : 'border-b bg-black bg-opacity-20 text-gray-400'">
-          <p>Downloads</p>
-        </div>
+    <div v-if="!isIos" class="w-full px-2 py-2" :class="hasStoragePermission ? '' : 'text-error'">
+      <div class="flex items-center">
+        <span class="material-icons" @click="changeDownloadFolderClick">{{ hasStoragePermission ? 'folder' : 'error' }}</span>
+        <p v-if="hasStoragePermission" class="text-sm px-4" @click="changeDownloadFolderClick">{{ downloadFolderSimplePath || 'No Download Folder Selected' }}</p>
+        <p v-else class="text-sm px-4" @click="changeDownloadFolderClick">No Storage Permissions. Click here</p>
       </div>
-      <div class="flex-grow h-full bg-primary rounded-t-md ml-px" @click="showingDownloads = false">
-        <div class="flex items-center justify-center h-full rounded-t-md border-t border-l border-r border-white border-opacity-20" :class="!showingDownloads ? 'text-gray-100' : 'border-b bg-black bg-opacity-20 text-gray-400'">
-          <p>Files</p>
+      <!-- <p v-if="hasStoragePermission" class="text-xs text-gray-400 break-all max-w-full">{{ downloadFolderUri }}</p> -->
+    </div>
+
+    <div v-if="!isIos" class="w-full h-10 relative">
+      <div class="absolute top-px left-0 z-10 w-full h-full flex">
+        <div class="flex-grow h-full bg-primary rounded-t-md mr-px" @click="showingDownloads = true">
+          <div class="flex items-center justify-center rounded-t-md border-t border-l border-r border-white border-opacity-20 h-full" :class="showingDownloads ? 'text-gray-100' : 'border-b bg-black bg-opacity-20 text-gray-400'">
+            <p>Downloads</p>
+          </div>
+        </div>
+        <div class="flex-grow h-full bg-primary rounded-t-md ml-px" @click="showingDownloads = false">
+          <div class="flex items-center justify-center h-full rounded-t-md border-t border-l border-r border-white border-opacity-20" :class="!showingDownloads ? 'text-gray-100' : 'border-b bg-black bg-opacity-20 text-gray-400'">
+            <p>Files</p>
+          </div>
         </div>
       </div>
     </div>
-  </div>
-  <div class="list-content-body relative w-full overflow-x-hidden bg-primary">
-    <template v-if="showingDownloads">
-      <div v-if="!totalDownloads" class="flex items-center justify-center h-40">
-        <p>No Downloads</p>
-      </div>
-      <ul v-else class="h-full w-full" role="listbox" aria-labelledby="listbox-label">
-        <template v-for="download in downloadsDownloading">
-          <li :key="download.id" class="text-gray-400 select-none relative px-4 py-5 border-b border-white border-opacity-10 bg-black bg-opacity-10">
-            <div class="flex items-center justify-center">
-              <div class="w-3/4">
-                <span class="text-xs">({{ downloadingProgress[download.id] || 0 }}%) {{ download.isPreparing ? 'Preparing' : 'Downloading' }}...</span>
-                <p class="font-normal truncate text-sm">{{ download.audiobook.book.title }}</p>
-              </div>
-              <div class="flex-grow" />
-
-              <div class="shadow-sm text-white flex items-center justify-center rounded-full animate-spin">
-                <span class="material-icons">refresh</span>
-              </div>
-            </div>
-          </li>
-        </template>
-        <template v-for="download in downloadsReady">
-          <li :key="download.id" class="text-gray-50 select-none relative pr-4 pl-2 py-5 border-b border-white border-opacity-10" @click="jumpToAudiobook(download)">
-            <modals-downloads-download-item :download="download" @play="playDownload" @delete="clickDeleteDownload" />
-          </li>
-        </template>
-      </ul>
-    </template>
-    <template v-else>
-      <div class="w-full h-full">
-        <div class="w-full flex justify-around py-4 px-2">
-          <ui-btn small @click="searchFolder">Re-Scan</ui-btn>
-          <ui-btn small @click="changeDownloadFolderClick">Change Folder</ui-btn>
-          <ui-btn small color="error" @click="resetFolder">Reset</ui-btn>
+    <div v-if="!isIos" class="list-content-body relative w-full overflow-x-hidden bg-primary">
+      <template v-if="showingDownloads">
+        <div v-if="!totalDownloads" class="flex items-center justify-center h-40">
+          <p>No Downloads</p>
         </div>
-        <p v-if="isScanning" class="text-center my-8">Scanning Folder..</p>
-        <p v-else-if="!mediaScanResults" class="text-center my-8">No Files Found</p>
-        <template v-else>
-          <template v-for="mediaFolder in mediaScanResults.folders">
-            <div :key="mediaFolder.uri" class="w-full px-2 py-2">
-              <div class="flex items-center">
-                <span class="material-icons text-base text-white text-opacity-50">folder</span>
-                <p class="ml-1 py-0.5">{{ mediaFolder.name }}</p>
+        <ul v-else class="h-full w-full" role="listbox" aria-labelledby="listbox-label">
+          <template v-for="download in downloadsDownloading">
+            <li :key="download.id" class="text-gray-400 select-none relative px-4 py-5 border-b border-white border-opacity-10 bg-black bg-opacity-10">
+              <div class="flex items-center justify-center">
+                <div class="w-3/4">
+                  <span class="text-xs">({{ downloadingProgress[download.id] || 0 }}%) {{ download.isPreparing ? 'Preparing' : 'Downloading' }}...</span>
+                  <p class="font-normal truncate text-sm">{{ download.audiobook.book.title }}</p>
+                </div>
+                <div class="flex-grow" />
+
+                <div class="shadow-sm text-white flex items-center justify-center rounded-full animate-spin">
+                  <span class="material-icons">refresh</span>
+                </div>
               </div>
-              <div v-for="mediaFile in mediaFolder.files" :key="mediaFile.uri" class="ml-3 flex items-center">
-                <span class="material-icons text-base text-white text-opacity-50">{{ mediaFile.isAudio ? 'music_note' : 'image' }}</span>
-                <p class="ml-1 py-0.5">{{ mediaFile.name }}</p>
-              </div>
-            </div>
+            </li>
           </template>
-          <template v-for="mediaFile in mediaScanResults.files">
-            <div :key="mediaFile.uri" class="w-full px-2 py-2">
-              <div class="flex items-center">
-                <span class="material-icons text-base text-white text-opacity-50">{{ mediaFile.isAudio ? 'music_note' : 'image' }}</span>
-                <p class="ml-1 py-0.5">{{ mediaFile.name }}</p>
-              </div>
-            </div>
+          <template v-for="download in downloadsReady">
+            <li :key="download.id" class="text-gray-50 select-none relative pr-4 pl-2 py-5 border-b border-white border-opacity-10" @click="jumpToAudiobook(download)">
+              <modals-downloads-download-item :download="download" @play="playDownload" @delete="clickDeleteDownload" />
+            </li>
           </template>
-        </template>
-      </div>
-    </template>
-  </div>
-</template>
+        </ul>
+      </template>
+      <template v-else>
+        <div class="w-full h-full">
+          <div class="w-full flex justify-around py-4 px-2">
+            <ui-btn small @click="searchFolder">Re-Scan</ui-btn>
+            <ui-btn small @click="changeDownloadFolderClick">Change Folder</ui-btn>
+            <ui-btn small color="error" @click="resetFolder">Reset</ui-btn>
+          </div>
+          <p v-if="isScanning" class="text-center my-8">Scanning Folder..</p>
+          <p v-else-if="!mediaScanResults" class="text-center my-8">No Files Found</p>
+          <template v-else>
+            <template v-for="mediaFolder in mediaScanResults.folders">
+              <div :key="mediaFolder.uri" class="w-full px-2 py-2">
+                <div class="flex items-center">
+                  <span class="material-icons text-base text-white text-opacity-50">folder</span>
+                  <p class="ml-1 py-0.5">{{ mediaFolder.name }}</p>
+                </div>
+                <div v-for="mediaFile in mediaFolder.files" :key="mediaFile.uri" class="ml-3 flex items-center">
+                  <span class="material-icons text-base text-white text-opacity-50">{{ mediaFile.isAudio ? 'music_note' : 'image' }}</span>
+                  <p class="ml-1 py-0.5">{{ mediaFile.name }}</p>
+                </div>
+              </div>
+            </template>
+            <template v-for="mediaFile in mediaScanResults.files">
+              <div :key="mediaFile.uri" class="w-full px-2 py-2">
+                <div class="flex items-center">
+                  <span class="material-icons text-base text-white text-opacity-50">{{ mediaFile.isAudio ? 'music_note' : 'image' }}</span>
+                  <p class="ml-1 py-0.5">{{ mediaFile.name }}</p>
+                </div>
+              </div>
+            </template>
+          </template>
+        </div>
+    </div>
   </div>
 </template>