Merge branch 'dev'

Author: RobbWatershed

app/src/main/java/me/devsaki/hentoid/adapters/ImagePagerAdapter.kt

@@ -408,7 +408,7 @@ class ImagePagerAdapter(context: Context) :
             else imageAvailable = false
 
             val isStreaming = img != null && !imageAvailable && img.status == StatusContent.ONLINE
-            val isExtracting = img != null && !imageAvailable && !img.url.startsWith("http")
+            val isExtracting = img != null && !imageAvailable && (img.isArchived || img.isPdf)
 
             @StringRes var text: Int = R.string.image_not_found
             if (isStreaming) text = R.string.image_streaming

app/src/main/java/me/devsaki/hentoid/database/domains/ImageFile.kt

@@ -88,7 +88,7 @@ data class ImageFile(
     var isForceRefresh: Boolean = false
 
 
-    constructor(img: ImageFile, populateContent: Boolean, populateChapter: Boolean) : this(
+    constructor(img: ImageFile, populateContent: Boolean = true, populateChapter: Boolean = true) : this(
         img.id,
         img.order,
         img.url,
@@ -107,6 +107,7 @@ data class ImageFile(
         this.uniqueHash = img.uniqueHash
         this.displayOrder = img.displayOrder
         this.displayUri = img.displayUri
+        this.imageType = img.imageType
         this.backupUrl = img.backupUrl
         this.isBackup = img.isBackup
         this.isForceRefresh = img.isForceRefresh

app/src/main/java/me/devsaki/hentoid/json/sources/deviantart/DeviantArtGallection.kt

@@ -15,15 +15,9 @@ data class DeviantArtGallection(
         val result: MutableList<ImageFile> = ArrayList()
         results.forEach { res ->
             val imgs = res.getImages()
-            result.addAll(imgs.filter { it.isReadable }.map { ImageFile(it,
-                populateContent = true,
-                populateChapter = true
-            ) })
+            result.addAll(imgs.filter { it.isReadable }.map { ImageFile(it) })
             if (null == result.find { it.isCover }) {
-                val cover = ImageFile(imgs.first { it.isCover },
-                    populateContent = true,
-                    populateChapter = true
-                )
+                val cover = ImageFile(imgs.first { it.isCover })
                 result.add(0, cover)
             }
         }

app/src/main/java/me/devsaki/hentoid/util/ImportHelper.kt

@@ -1040,7 +1040,7 @@ private fun mapMetadata(recipient: List<ImageFile>, ref: List<ImageFile>) {
  */
 fun createCover(images: MutableList<ImageFile>) {
     if (images.isNotEmpty()) {
-        val img = ImageFile(images[0], populateContent = true, populateChapter = true)
+        val img = ImageFile(images[0])
         img.isCover = true
         img.name = THUMB_FILE_NAME
         // Create a new cover entry from the 1st element

app/src/main/java/me/devsaki/hentoid/viewmodels/ReaderViewModel.kt

@@ -562,8 +562,6 @@ class ReaderViewModel(
         startingIndex: Int,
         imageFiles: List<ImageFile>
     ) {
-        setViewerStartingIndex(startingIndex)
-
         // Init the read pages write cache
         readPageNumbers.clear()
 
@@ -653,7 +651,7 @@ class ReaderViewModel(
                 viewerImagesInternal.clear()
                 viewerImagesInternal.addAll(imgs)
             }
-            if (startIndex > -1) onPageChange(startIndex - 1, 1)
+            if (startIndex > -1) onPageChange(startIndex - 1, 1, true)
             else viewerImages.postValue(viewerImagesInternal.toList())
         }
     }
@@ -1201,10 +1199,11 @@ class ReaderViewModel(
      * @param viewerIndex Viewer index of the page that has just been displayed
      * @param direction   Direction the viewer is going to (1 : forward; -1 : backward; 0 : no movement)
      */
-    fun onPageChange(viewerIndex: Int, direction: Int) {
+    fun onPageChange(viewerIndex: Int, direction: Int, setIndex: Boolean = false) {
         onPageChange(viewerIndex, direction) {
             // Instanciate a new list to trigger an actual Adapter UI refresh
             viewerImages.postValue(ArrayList(viewerImagesInternal))
+            if (setIndex) setViewerStartingIndex(viewerIndex + 1)
         }
     }
 
@@ -1379,12 +1378,7 @@ class ReaderViewModel(
                         if (viewerImagesInternal.size <= downloadedPageIndex) return@launch
 
                         // Instanciate a new ImageFile not to modify the one used by the UI
-                        val downloadedPic =
-                            ImageFile(
-                                viewerImagesInternal[downloadedPageIndex],
-                                populateContent = true,
-                                populateChapter = true
-                            )
+                        val downloadedPic = ImageFile(viewerImagesInternal[downloadedPageIndex])
                         downloadedPic.displayUri = resultOpt.second
                         viewerImagesInternal.removeAt(downloadedPageIndex)
                         viewerImagesInternal.add(downloadedPageIndex, downloadedPic)
@@ -1578,7 +1572,7 @@ class ReaderViewModel(
         refresh: Boolean
     ) {
         // Instanciate a new ImageFile not to modify the one used by the UI
-        val extractedPic = ImageFile(img, populateContent = true, populateChapter = true)
+        val extractedPic = ImageFile(img)
         extractedPic.displayUri = uri.toString()
         synchronized(viewerImagesInternal) {
             viewerImagesInternal.removeAt(idx)
@@ -2058,7 +2052,11 @@ class ReaderViewModel(
                     img.imageType = readImageType(application, uri.toUri())
                     Timber.d("${img.id} : Set image type to ${img.imageType}")
                     // Make image usable by reader if not set yet
-                    if (img.displayUri.isBlank()) img.displayUri = img.fileUri
+                    if (img.displayUri.isBlank()) {
+                        val updatedImg = ImageFile(img)
+                        updatedImg.displayUri = img.fileUri
+                        viewerImagesInternal[it] = updatedImg
+                    }
                 }
             }
             onDone?.invoke()