Merge pull request #75 from tom5079/dev

Version 4.17

.idea/codeStyles/Project.xml

@@ -1,9 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="RIGHT_MARGIN" value="120" />
-    <AndroidXmlCodeStyleSettings>
-      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>

.idea/gradle.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">

app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 42
-        versionName "4.6"
+        versionCode 52
+        versionName "4.17"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -35,9 +35,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         release {
-            minifyEnabled true
-            shrinkResources true
-
             buildConfigField('Boolean', 'CENSOR', 'false')
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
@@ -49,7 +46,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    buildToolsVersion = '29.0.2'
+    buildToolsVersion = '29.0.3'
 }
 
 dependencies {
@@ -57,31 +54,28 @@ dependencies {
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation "androidx.biometric:biometric:1.0.1"
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.multidex:multidex:2.0.1'
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
-    implementation 'com.google.android.material:material:1.2.0-alpha05'
-    implementation 'com.google.firebase:firebase-core:17.2.2'
-    implementation 'com.google.firebase:firebase-perf:19.0.5'
+    implementation 'com.google.android.material:material:1.3.0-alpha01'
+    implementation 'com.google.firebase:firebase-core:17.4.3'
+    implementation 'com.google.firebase:firebase-perf:19.0.7'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
     implementation 'com.github.arimorty:floatingsearchview:2.1.1'
     implementation 'com.github.clans:fab:1.6.4'
-
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
     kapt 'com.github.bumptech.glide:compiler:4.11.0'
     implementation ("com.github.bumptech.glide:recyclerview-integration:4.11.0") {
         transitive = false
     }
-
     implementation 'net.rdrei.android.dirchooser:library:3.2@aar'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'

app/proguard-rules.pro

@@ -23,8 +23,13 @@
 -dontobfuscate
 
 -keep public class * implements com.bumptech.glide.module.GlideModule
--keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep class * extends com.bumptech.glide.module.AppGlideModule {
+ <init>(...);
+}
 -keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
   **[] $VALUES;
   public *;
+}
+-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
+  *** rewind();
 }

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":42,"versionName":"4.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":52,"versionName":"4.17","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]

app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt

@@ -28,6 +28,7 @@ import androidx.test.rule.ActivityTestRule
 import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import org.junit.runner.RunWith
+import xyz.quaver.hitomi.getGalleryIDsFromNozomi
 import xyz.quaver.hiyobi.cookie
 import xyz.quaver.hiyobi.createImgList
 import xyz.quaver.hiyobi.getReader
@@ -62,6 +63,13 @@ class ExampleInstrumentedTest {
         }
     }
 
+    @Test
+    fun test_nozomi() {
+        val nozomi = getGalleryIDsFromNozomi(null, "index", "all")
+
+        Log.i("PUPILD", nozomi.size.toString())
+    }
+
     @Test
     fun test_doSearch() {
         val reader = getReader( 1426382)
@@ -105,9 +113,9 @@ class ExampleInstrumentedTest {
         val galleryID = 1561552
 
         runBlocking {
-            Log.i("PUPILD", Cache(context).getReader(galleryID)?.title ?: "null")
+            Log.i("PUPILD", Cache(context).getReader(galleryID)?.galleryInfo?.title ?: "null")
         }
 
-        Log.i("PUPILD", Cache(context).getReaderOrNull(galleryID)?.title ?: "null")
+        Log.i("PUPILD", Cache(context).getReaderOrNull(galleryID)?.galleryInfo?.title ?: "null")
     }
 }

app/src/main/AndroidManifest.xml

@@ -8,6 +8,8 @@
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+
 
     <application
         android:name=".Pupil"
@@ -19,7 +21,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:replace="android:theme"
-        android:requestLegacyExternalStorage="true">
+        android:requestLegacyExternalStorage="true"
+        tools:ignore="UnusedAttribute">
 
         <provider
             android:authorities="${applicationId}.provider"
@@ -33,6 +36,12 @@
 
         </provider>
 
+        <receiver android:name=".BroadcastReciever" android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
+            </intent-filter>
+        </receiver>
+
         <activity android:name=".ui.LockActivity" />
         <activity
             android:name=".ui.ReaderActivity"

app/src/main/java/xyz/quaver/pupil/BroadcastReciever.kt

@@ -0,0 +1,103 @@
+/*
+ *     Pupil, Hitomi.la viewer for Android
+ *     Copyright (C) 2020  tom5079
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package xyz.quaver.pupil
+
+import android.app.DownloadManager
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.webkit.MimeTypeMap
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.FileProvider
+import androidx.preference.PreferenceManager
+import xyz.quaver.pupil.util.NOTIFICATION_ID_UPDATE
+import xyz.quaver.pupil.util.cancelImport
+import java.io.File
+
+class BroadcastReciever : BroadcastReceiver() {
+
+    companion object {
+        const val ACTION_CANCEL_IMPORT = "ACTION_CANCEL_IMPORT"
+
+        const val EXTRA_IMPORT_NOTIFICATION_ID = "EXTRA_IMPORT_NOTIFICATION_ID"
+    }
+
+    override fun onReceive(context: Context?, intent: Intent?) {
+        context ?: return
+
+        when (intent?.action) {
+            DownloadManager.ACTION_DOWNLOAD_COMPLETE -> {
+
+                // Validate download
+
+                val preference = PreferenceManager.getDefaultSharedPreferences(context)
+                val downloadID = preference.getLong("update_download_id", -1)
+                val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+
+                if (intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) != downloadID)
+                    return
+
+                // Get target uri
+
+                val query = DownloadManager.Query()
+                    .setFilterById(downloadID)
+
+                val uri = downloadManager.query(query).use { cursor ->
+                    cursor.moveToFirst()
+
+                    cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)).let {
+                        val uri = Uri.parse(it)
+
+                        when (uri.scheme) {
+                            "file" ->
+                                FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", File(uri.path!!))
+                            "content" -> uri
+                            else -> return
+                        }
+                    }
+                }
+
+                // Build Notification
+
+                val notificationManager = NotificationManagerCompat.from(context)
+
+                val pendingIntent = PendingIntent.getActivity(context, 0, Intent(Intent.ACTION_VIEW).apply {
+                    flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK
+                    setDataAndType(uri, MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
+                }, 0)
+
+                val notification = NotificationCompat.Builder(context, "update")
+                    .setSmallIcon(android.R.drawable.stat_sys_download_done)
+                    .setContentTitle(context.getText(R.string.update_download_completed))
+                    .setContentText(context.getText(R.string.update_download_completed_description))
+                    .setContentIntent(pendingIntent)
+                    .build()
+
+                notificationManager.notify(NOTIFICATION_ID_UPDATE, notification)
+            }
+            ACTION_CANCEL_IMPORT -> {
+                cancelImport = true
+            }
+        }
+    }
+
+}

app/src/main/java/xyz/quaver/pupil/Pupil.kt

@@ -51,11 +51,21 @@ class Pupil : MultiDexApplication() {
         proxy = getProxy(this)
 
         try {
-            preference.getString("dl_location", null)
+            preference.getString("dl_location", null).also {
+                if (!File(it!!).canWrite())
+                    throw Exception()
+            }
         } catch (e: Exception) {
             preference.edit().remove("dl_location").apply()
         }
 
+        if (!preference.getBoolean("low_quality_reset", false)) {
+            preference.edit()
+                .putBoolean("low_quality", true)
+                .putBoolean("low_quality_reset", true)
+                .apply()
+        }
+
         histories = Histories(File(ContextCompat.getDataDir(this), "histories.json"))
         favorites = Histories(File(ContextCompat.getDataDir(this), "favorites.json"))
 
@@ -72,13 +82,27 @@ class Pupil : MultiDexApplication() {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-            val channel = NotificationChannel("download", getString(R.string.channel_download), NotificationManager.IMPORTANCE_MIN).apply {
+
+            manager.createNotificationChannel(NotificationChannel("download", getString(R.string.channel_download), NotificationManager.IMPORTANCE_LOW).apply {
                 description = getString(R.string.channel_download_description)
                 enableLights(false)
                 enableVibration(false)
                 lockscreenVisibility = Notification.VISIBILITY_SECRET
-            }
-            manager.createNotificationChannel(channel)
+            })
+
+            manager.createNotificationChannel(NotificationChannel("update", getString(R.string.channel_update), NotificationManager.IMPORTANCE_HIGH).apply {
+                description = getString(R.string.channel_update_description)
+                enableLights(true)
+                enableVibration(true)
+                lockscreenVisibility = Notification.VISIBILITY_SECRET
+            })
+
+            manager.createNotificationChannel(NotificationChannel("import", getString(R.string.channel_update), NotificationManager.IMPORTANCE_HIGH).apply {
+                description = getString(R.string.channel_update_description)
+                enableLights(false)
+                enableVibration(false)
+                lockscreenVisibility = Notification.VISIBILITY_SECRET
+            })
         }
 
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)

app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt

@@ -32,7 +32,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.bumptech.glide.Glide
+import com.bumptech.glide.RequestManager
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.daimajia.swipe.SwipeLayout
 import com.daimajia.swipe.adapters.RecyclerSwipeAdapter
@@ -49,13 +49,12 @@ import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.util.Histories
 import xyz.quaver.pupil.util.download.Cache
-import xyz.quaver.pupil.util.download.DownloadWorker
 import xyz.quaver.pupil.util.wordCapitalize
 import java.util.*
 import kotlin.collections.ArrayList
 import kotlin.concurrent.schedule
 
-class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryBlock>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
+class GalleryBlockAdapter(private val glide: RequestManager, private val galleries: List<GalleryBlock>) : RecyclerSwipeAdapter<RecyclerView.ViewHolder>(), SwipeAdapterInterface {
 
     enum class ViewType {
         NEXT,
@@ -63,16 +62,16 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
         PREV
     }
 
-    private val glide = Glide.with(context)
     private lateinit var favorites: Histories
 
     val timer = Timer()
 
+    var isThin = false
+
     inner class GalleryViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
         var timerTask: TimerTask? = null
 
         private fun updateProgress(context: Context, galleryID: Int) {
-            val cache = Cache(context).getCachedGallery(galleryID)
             val reader = Cache(context).getReaderOrNull(galleryID)
 
             CoroutineScope(Dispatchers.Main).launch {
@@ -84,9 +83,7 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
 
                 with(view.galleryblock_progressbar) {
 
-                    progress = cache.listFiles()?.count { file ->
-                        Regex("^[0-9]+.+\$").matches(file.name)
-                    } ?: 0
+                    progress = Cache(context).getImages(galleryID)?.size ?: 0
 
                     if (visibility == View.GONE) {
                         visibility = View.VISIBLE
@@ -126,6 +123,10 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
                 val artists = galleryBlock.artists
                 val series = galleryBlock.series
 
+                if (isThin)
+                    galleryblock_thumbnail.layoutParams.width = context.resources.getDimensionPixelSize(
+                        R.dimen.galleryblock_thumbnail_thin
+                    )
                 galleryblock_thumbnail.setImageDrawable(CircularProgressDrawable(context).also {
                     it.start()
                 })
@@ -138,16 +139,18 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
                             null
                     }
 
-                    glide
-                        .load(thumbnail)
-                        .skipMemoryCache(true)
-                        .diskCacheStrategy(DiskCacheStrategy.NONE)
-                        .error(R.drawable.image_broken_variant)
-                        .apply {
-                            if (BuildConfig.CENSOR)
-                                override(5, 8)
-                        }
-                        .into(galleryblock_thumbnail)
+                    galleryblock_thumbnail.post {
+                        glide
+                            .load(thumbnail)
+                            .skipMemoryCache(true)
+                            .diskCacheStrategy(DiskCacheStrategy.NONE)
+                            .error(R.drawable.image_broken_variant)
+                            .apply {
+                                if (BuildConfig.CENSOR)
+                                    override(5, 8)
+                            }
+                            .into(galleryblock_thumbnail)
+                    }
                 }
 
                 //Check cache
@@ -264,6 +267,14 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
                         }
                     }
                 }
+
+
+                // Make some views invisible to make it thinner
+                if (isThin) {
+                    galleryblock_language.visibility = View.GONE
+                    galleryblock_type.visibility = View.GONE
+                    galleryblock_tag_group.visibility = View.GONE
+                }
             }
         }
     }
@@ -341,10 +352,10 @@ class GalleryBlockAdapter(context: Context, private val galleries: List<GalleryB
                     mItemManger.closeAllExcept(layout)
 
                     holder.view.galleryblock_download.text =
-                        if (DownloadWorker.getInstance(holder.view.context).progress.indexOfKey(gallery.id) < 0)
-                            holder.view.context.getString(R.string.main_download)
-                        else
+                        if (Cache(holder.view.context).isDownloading(gallery.id))
                             holder.view.context.getString(android.R.string.cancel)
+                        else
+                            holder.view.context.getString(R.string.main_download)
                 }
 
                 override fun onClose(layout: SwipeLayout?) {}

app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt

@@ -18,16 +18,12 @@
 
 package xyz.quaver.pupil.adapters
 
-import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.bumptech.glide.ListPreloader
-import com.bumptech.glide.RequestBuilder
-import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader
+import com.bumptech.glide.RequestManager
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.crashlytics.android.Crashlytics
 import io.fabric.sdk.android.Fabric
@@ -36,46 +32,16 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import xyz.quaver.hitomi.Reader
-import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.util.download.Cache
 import xyz.quaver.pupil.util.download.DownloadWorker
-import java.io.File
 import java.util.*
 import kotlin.concurrent.schedule
 import kotlin.math.roundToInt
 
-class ReaderAdapter(private val context: Context,
+class ReaderAdapter(private val glide: RequestManager,
                     private val galleryID: Int) : RecyclerView.Adapter<ReaderAdapter.ViewHolder>() {
 
-    val glide = Glide.with(context)
-
-    //region Glide.RecyclerView
-    val sizeProvider = ListPreloader.PreloadSizeProvider<File> { _, _, position ->
-        Cache(context).getReaderOrNull(galleryID)?.galleryInfo?.files?.getOrNull(position)?.let {
-            arrayOf(it.width, it.height).toIntArray()
-        }
-    }
-    val modelProvider = object: ListPreloader.PreloadModelProvider<File> {
-        override fun getPreloadItems(position: Int): MutableList<File> {
-            return listOf(Cache(context).getImages(galleryID)?.getOrNull(position)).filterNotNullTo(mutableListOf())
-        }
-
-        override fun getPreloadRequestBuilder(item: File): RequestBuilder<*>? {
-            return glide
-                .load(item)
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
-                .skipMemoryCache(true)
-                .error(R.drawable.image_broken_variant)
-                .apply {
-                    if (BuildConfig.CENSOR)
-                        override(5, 8)
-                }
-        }
-    }
-    val preloader = RecyclerViewPreloader<File>(glide, modelProvider, sizeProvider, 10)
-    //endregion
-
     var reader: Reader? = null
     val timer = Timer()
 
@@ -102,6 +68,9 @@ class ReaderAdapter(private val context: Context,
         } else {
             holder.view.layoutParams.height = RecyclerView.LayoutParams.WRAP_CONTENT
             holder.view.container.layoutParams.height = 0
+
+            (holder.view.container.layoutParams as ConstraintLayout.LayoutParams)
+                .dimensionRatio = "W,${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
         }
 
         holder.view.image.setOnPhotoTapListener { _, _, _ ->
@@ -112,31 +81,32 @@ class ReaderAdapter(private val context: Context,
             onItemClickListener?.invoke(position)
         }
 
-        if (!isFullScreen)
-            (holder.view.container.layoutParams as ConstraintLayout.LayoutParams)
-                .dimensionRatio = "${reader!!.galleryInfo.files[position].width}:${reader!!.galleryInfo.files[position].height}"
-
         holder.view.reader_index.text = (position+1).toString()
 
-        val images = Cache(context).getImage(galleryID, position)
+        val images = Cache(holder.view.context).getImage(galleryID, position)
+        val progress = DownloadWorker.getInstance(holder.view.context).progress[galleryID]?.get(position)
+
+        if (progress?.isInfinite() == true && images != null) {
+            holder.view.reader_item_progressbar.visibility = View.INVISIBLE
+
+            holder.view.image.post {
+                glide
+                    .load(images)
+                    .diskCacheStrategy(DiskCacheStrategy.NONE)
+                    .skipMemoryCache(true)
+                    .fitCenter()
+                    .error(R.drawable.image_broken_variant)
+                    .into(holder.view.image)
+            }
 
-        if (images != null) {
-            glide
-                .load(images)
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
-                .skipMemoryCache(true)
-                .error(R.drawable.image_broken_variant)
-                .apply {
-                    if (BuildConfig.CENSOR)
-                        override(5, 8)
-                }
-                .into(holder.view.image)
         } else {
-            val progress = DownloadWorker.getInstance(context).progress[galleryID]?.get(position)
+            holder.view.reader_item_progressbar.visibility = View.VISIBLE
+
+            glide.clear(holder.view.image)
 
             if (progress?.isNaN() == true) {
                 if (Fabric.isInitialized())
-                    Crashlytics.logException(DownloadWorker.getInstance(context).exception[galleryID]?.get(position))
+                    Crashlytics.logException(DownloadWorker.getInstance(holder.view.context).exception[galleryID]?.get(position))
 
                 glide
                     .load(R.drawable.image_broken_variant)

app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt

@@ -45,13 +45,14 @@ import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.arlib.floatingsearchview.FloatingSearchView
 import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
 import com.arlib.floatingsearchview.util.view.SearchInputView
+import com.bumptech.glide.Glide
 import com.crashlytics.android.Crashlytics
 import com.google.android.material.appbar.AppBarLayout
 import io.fabric.sdk.android.Fabric
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.activity_main_content.*
 import kotlinx.coroutines.*
-import kotlinx.serialization.list
+import kotlinx.serialization.builtins.list
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.doSearch
 import xyz.quaver.hitomi.getGalleryIDsFromNozomi
@@ -195,7 +196,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
         val preference = PreferenceManager.getDefaultSharedPreferences(this)
-        val perPage = preference.getString("per_page", "25")!!.toInt()
+        val perPage = preference.getString("per_page", "25")!!.toIntOrNull() ?: 25
         val maxPage = ceil(totalItems / perPage.toDouble()).roundToInt()
 
         return when(keyCode) {
@@ -330,11 +331,18 @@ class MainActivity : AppCompatActivity() {
             true
         }
 
+        with(main_fab_cancel) {
+            setImageResource(R.drawable.cancel)
+            setOnClickListener {
+                DownloadWorker.getInstance(context).stop()
+            }
+        }
+
         with(main_fab_jump) {
             setImageResource(R.drawable.ic_jump)
             setOnClickListener {
                 val preference = PreferenceManager.getDefaultSharedPreferences(context)
-                val perPage = preference.getString("per_page", "25")!!.toInt()
+                val perPage = preference.getString("per_page", "25")!!.toIntOrNull() ?: 25
                 val editText = EditText(context)
 
                 AlertDialog.Builder(context).apply {
@@ -359,17 +367,42 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
+        with(main_fab_random) {
+            setImageResource(R.drawable.shuffle_variant)
+            setOnClickListener {
+                runBlocking {
+                    withTimeoutOrNull(100) {
+                        galleryIDs?.await()
+                    }
+                }.let {
+                    if (it?.isEmpty() == false) {
+                        val galleryID = it.random()
+
+                        val intent = Intent(this@MainActivity, ReaderActivity::class.java).apply {
+                            putExtra("galleryID", galleryID)
+                        }
+
+                        startActivity(intent)
+
+                        histories.add(galleryID)
+                    }
+                }
+            }
+        }
+
         with(main_fab_id) {
             setImageResource(R.drawable.numeric)
             setOnClickListener {
-                val editText = EditText(context)
+                val editText = EditText(context).apply {
+                    inputType = InputType.TYPE_CLASS_NUMBER
+                }
 
                 AlertDialog.Builder(context).apply {
                     setView(editText)
                     setTitle(R.string.main_open_gallery_by_id)
 
                     setPositiveButton(android.R.string.ok) { _, _ ->
-                            val galleryID = editText.text.toString().toInt()
+                            val galleryID = editText.text.toString().toIntOrNull() ?: return@setPositiveButton
                             val intent = Intent(this@MainActivity, ReaderActivity::class.java).apply {
                                 putExtra("galleryID", galleryID)
                             }
@@ -390,7 +423,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun setupRecyclerView() {
         with(main_recyclerview) {
-            adapter = GalleryBlockAdapter(this@MainActivity, galleries).apply {
+            adapter = GalleryBlockAdapter(Glide.with(this@MainActivity), galleries).apply {
                 onChipClickedHandler.add {
                     runOnUiThread {
                         query = it.toQuery()
@@ -404,18 +437,14 @@ class MainActivity : AppCompatActivity() {
                 }
                 onDownloadClickedHandler = { position ->
                     val galleryID = galleries[position].id
+                    val worker = DownloadWorker.getInstance(context)
 
-                    if (!completeFlag.get(galleryID, false)) {
-                        val worker = DownloadWorker.getInstance(context)
+                    if (Cache(context).isDownloading(galleryID))     //download in progress
+                        worker.cancel(galleryID)
+                    else {
+                        Cache(context).setDownloading(galleryID, true)
 
-                        if (worker.progress.indexOfKey(galleryID) >= 0)     //download in progress
-                            worker.cancel(galleryID)
-                        else {
-                            Cache(context).setDownloading(galleryID, true)
-
-                            if (!worker.queue.contains(galleryID))
-                                worker.queue.add(galleryID)
-                        }
+                        worker.queue.add(galleryID)
                     }
 
                     closeAllItems()
@@ -467,6 +496,7 @@ class MainActivity : AppCompatActivity() {
 
                     GalleryDialog(
                         this@MainActivity,
+                        Glide.with(this@MainActivity),
                         galleryID
                     ).apply {
                         onChipClickedHandler.add {
@@ -721,9 +751,28 @@ class MainActivity : AppCompatActivity() {
                 favoritesFile.writeText(json.stringify(serializer, Tags(listOf())))
             }
 
+            setOnLeftMenuClickListener(object: FloatingSearchView.OnLeftMenuClickListener {
+                override fun onMenuOpened() {
+                    (this@MainActivity.main_recyclerview.adapter as GalleryBlockAdapter).closeAllItems()
+                }
+
+                override fun onMenuClosed() {
+                    //Do Nothing
+                }
+            })
+
             setOnMenuItemClickListener {
                 when(it.itemId) {
                     R.id.main_menu_settings -> startActivityForResult(Intent(this@MainActivity, SettingsActivity::class.java), REQUEST_SETTINGS)
+                    R.id.main_menu_thin -> {
+                        main_recyclerview.apply {
+                            (adapter as GalleryBlockAdapter).apply {
+                                isThin = !isThin
+                            }
+
+                            adapter = adapter       // Force to redraw
+                        }
+                    }
                     R.id.main_menu_sort_newest -> {
                         sortMode = SortMode.NEWEST
                         it.isChecked = true
@@ -961,7 +1010,9 @@ class MainActivity : AppCompatActivity() {
                 }
                 Mode.DOWNLOAD -> {
                     val downloads = getDownloadDirectory(this@MainActivity).listFiles()?.filter { file ->
-                        file.isDirectory && (file.name.toIntOrNull() != null) && File(file, ".metadata").exists()
+                        file.isDirectory && file.name.toIntOrNull() != null
+                    }?.sortedByDescending {
+                        it.lastModified()
                     }?.map {
                         it.name.toInt()
                     } ?: emptyList()

app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt

@@ -32,6 +32,7 @@ import androidx.recyclerview.widget.PagerSnapHelper
 import androidx.recyclerview.widget.RecyclerView
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
+import com.bumptech.glide.Glide
 import com.crashlytics.android.Crashlytics
 import com.google.android.material.snackbar.Snackbar
 import io.fabric.sdk.android.Fabric
@@ -157,10 +158,10 @@ class ReaderActivity : AppCompatActivity() {
     override fun onOptionsItemSelected(item: MenuItem?): Boolean {
         when(item?.itemId) {
             R.id.reader_menu_page_indicator -> {
-                val view = LayoutInflater.from(this).inflate(R.layout.dialog_numberpicker, findViewById(android.R.id.content), false)
+                val view = LayoutInflater.from(this).inflate(R.layout.dialog_numberpicker, reader_layout, false)
                 with(view.dialog_number_picker) {
                     minValue=1
-                    maxValue=reader_recyclerview?.adapter?.itemCount ?: 0
+                    maxValue=Cache(context).getReaderOrNull(galleryID)?.galleryInfo?.files?.size ?: 0
                     value=currentPage
                 }
                 val dialog = AlertDialog.Builder(this).apply {
@@ -286,7 +287,7 @@ class ReaderActivity : AppCompatActivity() {
 
     private fun initView() {
         with(reader_recyclerview) {
-            adapter = ReaderAdapter(this@ReaderActivity, galleryID).apply {
+            adapter = ReaderAdapter(Glide.with(this@ReaderActivity), galleryID).apply {
                 onItemClickListener = {
                     if (isScroll) {
                         isScroll = false
@@ -300,7 +301,6 @@ class ReaderActivity : AppCompatActivity() {
                 }
             }
 
-            addOnScrollListener((adapter as ReaderAdapter).preloader)
             addOnScrollListener(object: RecyclerView.OnScrollListener() {
                 override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                     super.onScrolled(recyclerView, dx, dy)
@@ -361,6 +361,8 @@ class ReaderActivity : AppCompatActivity() {
 
             window.attributes = this
         }
+
+        reader_recyclerview.adapter = reader_recyclerview.adapter   // Force to redraw
     }
 
     private fun scrollMode(isScroll: Boolean) {
@@ -386,7 +388,7 @@ class ReaderActivity : AppCompatActivity() {
                         if (worker.progress[galleryID]?.all { !it.isFinite() } == true) // If download is finished, stop animating
                             post {
                                 setImageResource(R.drawable.ic_download)
-                                labelText = getString(R.string.reader_fab_download)
+                                labelText = getString(R.string.reader_fab_download_cancel)
                             }
                         else                                                            // Or continue animate
                             post {

app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt

@@ -30,8 +30,8 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.PreferenceManager
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.settings_activity.*
-import kotlinx.serialization.list
-import kotlinx.serialization.serializer
+import kotlinx.serialization.builtins.list
+import kotlinx.serialization.builtins.serializer
 import net.rdrei.android.dirchooser.DirectoryChooserActivity
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
@@ -156,6 +156,43 @@ class SettingsActivity : AppCompatActivity() {
                             .apply()
                 }
             }
+            REQUEST_IMPORT_OLD_GALLERIES -> {
+                if (resultCode == Activity.RESULT_OK) {
+                    data?.data?.also { uri ->
+                        val takeFlags: Int =
+                            intent.flags and (Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
+                            contentResolver.takePersistableUriPermission(uri, takeFlags)
+
+                        val file = uri.toFile(this)
+
+                        if (file?.canRead() != true)
+                            Snackbar.make(
+                                settings,
+                                resources.getText(R.string.import_old_galleries_folder_not_readable),
+                                Snackbar.LENGTH_LONG
+                            ).show()
+                        else
+                            importOldGalleries(this, file)
+                    }
+                }
+            }
+            REQUEST_IMPORT_OLD_GALLERIES_OLD -> {
+                if (resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) {
+                    val directory = data?.getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR)!!
+
+                    if (!File(directory).canRead())
+                        Snackbar.make(
+                            settings,
+                            resources.getText(R.string.import_old_galleries_folder_not_readable),
+                            Snackbar.LENGTH_LONG
+                        ).show()
+                    else {
+                        importOldGalleries(this, File(directory))
+                    }
+                }
+            }
             else -> super.onActivityResult(requestCode, resultCode, data)
         }
     }

app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt

@@ -18,6 +18,7 @@
 
 package xyz.quaver.pupil.ui.dialog
 
+import android.app.Activity
 import android.app.Dialog
 import android.content.Context
 import android.content.Intent
@@ -29,7 +30,7 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
+import com.bumptech.glide.RequestManager
 import com.google.android.material.chip.Chip
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.dialog_gallery.*
@@ -53,7 +54,7 @@ import xyz.quaver.pupil.util.ItemClickSupport
 import xyz.quaver.pupil.util.download.Cache
 import xyz.quaver.pupil.util.wordCapitalize
 
-class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(context) {
+class GalleryDialog(context: Context, private val glide: RequestManager, private val galleryID: Int) : Dialog(context) {
 
     private val languages = context.resources.getStringArray(R.array.languages).map {
         it.split("|").let { split ->
@@ -61,8 +62,6 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
         }
     }.toMap()
 
-    private val glide = Glide.with(context)
-
     val onChipClickedHandler = ArrayList<((Tag) -> (Unit))>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -90,7 +89,7 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
             try {
                 val gallery = getGallery(galleryID)
 
-                launch(Dispatchers.Main) {
+                gallery_cover.post {
                     gallery_progressbar.visibility = View.GONE
                     gallery_title.text = gallery.title
                     gallery_artist.text = gallery.artists.joinToString(", ") { it.wordCapitalize() }
@@ -112,7 +111,7 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
                         }
                     }
 
-                    Glide.with(context)
+                    glide
                         .load(gallery.cover)
                         .apply {
                             if (BuildConfig.CENSOR)
@@ -226,7 +225,7 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
         val inflater = LayoutInflater.from(context)
         val galleries = ArrayList<GalleryBlock>()
 
-        val adapter = GalleryBlockAdapter(context, galleries).apply {
+        val adapter = GalleryBlockAdapter(glide, galleries).apply {
             onChipClickedHandler.add { tag ->
                 this@GalleryDialog.onChipClickedHandler.forEach { handler ->
                     handler.invoke(tag)
@@ -264,6 +263,7 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte
                     .setOnItemLongClickListener { _, position, _ ->
                         GalleryDialog(
                             context,
+                            glide,
                             galleries[position].id
                         ).apply {
                             onChipClickedHandler.add { tag ->

app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt

@@ -18,17 +18,23 @@
 
 package xyz.quaver.pupil.ui.fragment
 
+import android.Manifest
 import android.content.Intent
 import android.content.SharedPreferences
+import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import com.google.android.material.snackbar.Snackbar
+import net.rdrei.android.dirchooser.DirectoryChooserActivity
+import net.rdrei.android.dirchooser.DirectoryChooserConfig
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.ui.LockActivity
@@ -168,6 +174,31 @@ class SettingsFragment :
 
                     activity?.startActivityForResult(intent, REQUEST_RESTORE)
                 }
+                "old_import_galleries" -> {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+
+                        if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
+                            ActivityCompat.requestPermissions(activity!!, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), REQUEST_WRITE_PERMISSION_AND_SAF)
+                        else {
+                            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply {
+                                putExtra("android.content.extra.SHOW_ADVANCED", true)
+                            }
+
+                            activity?.startActivityForResult(intent, REQUEST_IMPORT_OLD_GALLERIES)
+                        }
+                    } else {    // Can't use SAF on old Androids!
+                        val config = DirectoryChooserConfig.builder()
+                            .newDirectoryName("Pupil")
+                            .allowNewDirectoryNameModification(true)
+                            .build()
+
+                        val intent = Intent(context, DirectoryChooserActivity::class.java).apply {
+                            putExtra(DirectoryChooserActivity.EXTRA_CONFIG, config)
+                        }
+
+                        activity?.startActivityForResult(intent, REQUEST_IMPORT_OLD_GALLERIES_OLD)
+                    }
+                }
                 else -> return false
             }
         }
@@ -297,6 +328,9 @@ class SettingsFragment :
                         "restore" -> {
                             onPreferenceClickListener = this@SettingsFragment
                         }
+                        "old_import_galleries" -> {
+                            onPreferenceClickListener = this@SettingsFragment
+                        }
                     }
 
                 }

app/src/main/java/xyz/quaver/pupil/util/ConstValues.kt

@@ -20,11 +20,20 @@ package xyz.quaver.pupil.util
 
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
+import okhttp3.Dispatcher
+import okhttp3.OkHttpClient
+import xyz.quaver.proxy
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
 
 const val REQUEST_LOCK = 38238
 const val REQUEST_RESTORE = 16546
+const val REQUEST_IMPORT_OLD_GALLERIES = 6458
+const val REQUEST_IMPORT_OLD_GALLERIES_OLD = 5946
 const val REQUEST_DOWNLOAD_FOLDER = 3874
 const val REQUEST_DOWNLOAD_FOLDER_OLD = 3425
 const val REQUEST_WRITE_PERMISSION_AND_SAF = 13900
 
+const val NOTIFICATION_ID_UPDATE = 2345
+
 val json = Json(JsonConfiguration.Stable)

app/src/main/java/xyz/quaver/pupil/util/download/Cache.kt

@@ -21,23 +21,47 @@ package xyz.quaver.pupil.util.download
 import android.content.Context
 import android.content.ContextWrapper
 import android.util.Base64
+import android.util.Log
+import android.util.SparseArray
 import androidx.preference.PreferenceManager
 import com.crashlytics.android.Crashlytics
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.*
 import xyz.quaver.Code
 import xyz.quaver.hitomi.GalleryBlock
 import xyz.quaver.hitomi.Reader
+import xyz.quaver.proxy
 import xyz.quaver.pupil.util.getCachedGallery
 import xyz.quaver.pupil.util.getDownloadDirectory
+import xyz.quaver.pupil.util.isParentOf
 import xyz.quaver.pupil.util.json
+import java.io.BufferedInputStream
 import java.io.File
+import java.io.FileOutputStream
+import java.io.InputStream
 import java.net.URL
+import java.util.concurrent.locks.Lock
+import java.util.concurrent.locks.ReentrantLock
 
 class Cache(context: Context) : ContextWrapper(context) {
 
+    companion object {
+        private val moving = mutableListOf<Int>()
+    }
+
+    private val locks = SparseArray<Lock>()
+    private fun lock(galleryID: Int) {
+        synchronized(locks) {
+            if (locks.indexOfKey(galleryID) < 0)
+                locks.put(galleryID, ReentrantLock())
+        }
+
+        locks[galleryID].lock()
+    }
+
+    private fun unlock(galleryID: Int) {
+        locks[galleryID]?.unlock()
+    }
+
     private val preference = PreferenceManager.getDefaultSharedPreferences(this)
 
     // Search in this order
@@ -78,7 +102,9 @@ class Cache(context: Context) : ContextWrapper(context) {
             withContext(Dispatchers.IO) {
                 val thumbnails = getGalleryBlock(galleryID)?.thumbnails
                 try {
-                    Base64.encodeToString(URL(thumbnails?.firstOrNull()).readBytes(), Base64.DEFAULT)
+                    Base64.encodeToString(URL(thumbnails?.firstOrNull()).openConnection(proxy).getInputStream().use {
+                        it.readBytes()
+                    }, Base64.DEFAULT)
                 } catch (e: Exception) {
                     null
                 }
@@ -212,27 +238,44 @@ class Cache(context: Context) : ContextWrapper(context) {
         return null
     }
 
-    fun putImage(galleryID: Int, name: String, data: ByteArray) {
-        val cache = File(getCachedGallery(galleryID), name).also {
+
+    fun putImage(galleryID: Int, index: Int, ext: String, data: InputStream) {
+        val cache = File(getCachedGallery(galleryID), "%05d.$ext".format(index)).also {
             if (!it.exists())
                 it.createNewFile()
         }
 
-        if (!Regex("""^[0-9]+.+$""").matches(name))
-            throw IllegalArgumentException("File name is not a number")
-
-        cache.writeBytes(data)
+        BufferedInputStream(data).use {
+            it.copyTo(FileOutputStream(cache))
+        }
     }
 
     fun moveToDownload(galleryID: Int) {
-        val cache = getCachedGallery(galleryID).also {
-            if (!it.exists())
-                return
-        }
-        val download = File(getDownloadDirectory(this), galleryID.toString())
+        if (moving.contains(galleryID))
+            return
 
-        cache.copyRecursively(download, true)
-        cache.deleteRecursively()
+        CoroutineScope(Dispatchers.IO).launch {
+            val cache = getCachedGallery(galleryID).also {
+                if (!it.exists())
+                    return@launch
+            }
+            val download = File(getDownloadDirectory(this@Cache), galleryID.toString())
+
+            if (download.isParentOf(cache))
+                return@launch
+
+            Log.i("PUPILD", "MOVING ${cache.canonicalPath} --> ${download.canonicalPath}")
+
+            cache.copyRecursively(download, true) { file, err ->
+                Log.i("PUPILD", "MOVING ERROR ${file.canonicalPath} ${err.message}")
+                OnErrorAction.SKIP
+            }
+            Log.i("PUPILD", "MOVED ${cache.canonicalPath}")
+
+            Log.i("PUPILD", "DELETING ${cache.canonicalPath}")
+            cache.deleteRecursively()
+            Log.i("PUPILD", "DELETED ${cache.canonicalPath}")
+        }
     }
 
     fun isDownloading(galleryID: Int) = getCachedMetadata(galleryID)?.isDownloading == true

app/src/main/java/xyz/quaver/pupil/util/download/DownloadWorker.kt

@@ -23,6 +23,7 @@ import android.content.Context
 import android.content.ContextWrapper
 import android.content.Intent
 import android.content.SharedPreferences
+import android.util.Log
 import android.util.SparseArray
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -36,18 +37,19 @@ import okio.*
 import xyz.quaver.Code
 import xyz.quaver.hitomi.Reader
 import xyz.quaver.hitomi.getReferer
-import xyz.quaver.hitomi.urlFromUrlFromHash
+import xyz.quaver.hitomi.imageUrlFromImage
 import xyz.quaver.hiyobi.cookie
 import xyz.quaver.hiyobi.createImgList
 import xyz.quaver.hiyobi.user_agent
 import xyz.quaver.proxy
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.ui.ReaderActivity
+import java.io.File
 import java.io.IOException
-import java.util.concurrent.Executors
 import java.util.concurrent.LinkedBlockingQueue
+import java.util.concurrent.TimeUnit
 
-@UseExperimental(ExperimentalCoroutinesApi::class)
+@OptIn(ExperimentalCoroutinesApi::class)
 class DownloadWorker private constructor(context: Context) : ContextWrapper(context) {
 
     private val preferences : SharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
@@ -146,20 +148,25 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
 
     private val loop = loop()
     private val worker = SparseArray<Job?>()
-    val clients = SparseArray<OkHttpClient>()
 
     val interceptor = Interceptor { chain ->
         val request = chain.request()
         val response = chain.proceed(request)
 
         response.newBuilder()
-        .body(ProgressResponseBody(request.tag(), response.body(), progressListener))
-        .build()
+            .body(ProgressResponseBody(request.tag(), response.body(), progressListener))
+            .build()
     }
-    fun buildClient() =
+
+    val client =
         OkHttpClient.Builder()
+            .connectTimeout(0, TimeUnit.SECONDS)
             .addInterceptor(interceptor)
-            .dispatcher(Dispatcher(Executors.newFixedThreadPool(4)))
+            .readTimeout(0, TimeUnit.SECONDS)
+            .dispatcher(Dispatcher().apply {
+                maxRequests = 4
+                maxRequestsPerHost = 4
+            })
             .proxy(proxy)
             .build()
 
@@ -167,17 +174,18 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         queue.clear()
 
         loop.cancel()
-        for (i in 0..worker.size()) {
+        for (i in 0 until worker.size()) {
             val galleryID = worker.keyAt(i)
 
             Cache(this@DownloadWorker).setDownloading(galleryID, false)
             worker[galleryID]?.cancel()
         }
 
-        for (i in 0 until clients.size()) {
-            clients.valueAt(i).dispatcher().cancelAll()
+        client.dispatcher().queuedCalls().filter {
+            it.request().tag() is Pair<*, *>
+        }.forEach {
+            it.cancel()
         }
-        clients.clear()
 
         progress.clear()
         exception.clear()
@@ -189,17 +197,19 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         queue.remove(galleryID)
         worker[galleryID]?.cancel()
 
-        clients[galleryID]?.dispatcher()?.cancelAll()
-        clients.remove(galleryID)
+        client.dispatcher().queuedCalls().filter {
+            ((it.request().tag() as Pair<*, *>).first as Int) == galleryID
+        }.forEach {
+            it.cancel()
+        }
 
         progress.remove(galleryID)
         exception.remove(galleryID)
         notification.remove(galleryID)
         notificationManager.cancel(galleryID)
 
-        if (progress.indexOfKey(galleryID) >= 0) {
+        if (progress.indexOfKey(galleryID) >= 0)
             Cache(this@DownloadWorker).setDownloading(galleryID, false)
-        }
     }
 
     fun isCompleted(galleryID: Int) = progress[galleryID]?.all { !it.isFinite() } == true
@@ -211,10 +221,10 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
             when (reader.code) {
                 Code.HITOMI -> {
                     url(
-                        urlFromUrlFromHash(
+                        imageUrlFromImage(
                             galleryID,
                             reader.galleryInfo.files[index],
-                            if (lowQuality) "webp" else null
+                            !lowQuality
                         )
                     )
                     addHeader("Referer", getReferer(galleryID))
@@ -231,10 +241,9 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
             tag(galleryID to index)
         }.build()
 
-        if (clients.get(galleryID) == null)
-            clients.put(galleryID, buildClient())
+        client.newCall(request).enqueue(callback)
 
-        clients[galleryID]?.newCall(request)?.enqueue(callback)
+        Log.i("PUPILD", "DOWNLOADING ($galleryID, $index) from ${request.url()}")
     }
 
     private fun download(galleryID: Int) = CoroutineScope(Dispatchers.IO).launch {
@@ -252,7 +261,7 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         val cache = Cache(this@DownloadWorker).getImages(galleryID)
 
         progress.put(galleryID, reader.galleryInfo.files.indices.map { index ->
-            if (cache?.getOrNull(index) != null)
+            if (cache?.firstOrNull { it?.nameWithoutExtension?.toIntOrNull()  == index } != null)
                 Float.POSITIVE_INFINITY
             else
                 0F
@@ -279,6 +288,7 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         for (i in reader.galleryInfo.files.indices) {
             val callback = object : Callback {
                 override fun onFailure(call: Call, e: IOException) {
+                    Log.i("PUPILD", "FAIL ${call.request().tag()} (${e.message})")
                     if (Fabric.isInitialized() && e.message != "Canceled")
                         Crashlytics.logException(e)
 
@@ -287,43 +297,74 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
 
                     notify(galleryID)
 
-                    if (isCompleted(galleryID)) {
-                        with(Cache(this@DownloadWorker)) {
-                            if (isDownloading(galleryID)) {
-                                moveToDownload(galleryID)
-                                setDownloading(galleryID, false)
+                    CoroutineScope(Dispatchers.IO).launch {
+                        if (isCompleted(galleryID)) {
+                            with(Cache(this@DownloadWorker)) {
+                                if (isDownloading(galleryID)) {
+                                    moveToDownload(galleryID)
+                                    setDownloading(galleryID, false)
+                                }
                             }
                         }
-                        clients.remove(galleryID)
                     }
                 }
 
                 override fun onResponse(call: Call, response: Response) {
-                    response.body().use {
-                        val res = it.bytes()
-                        val ext =
-                            call.request().url().encodedPath().split('.').last()
+                    Log.i("PUPILD", "OK ${call.request().tag()}")
 
-                        Cache(this@DownloadWorker).putImage(galleryID, "%05d.%s".format(i, ext), res)
+                    val ext = call.request().url().encodedPath().split('.').last()
+
+                    try {
+                        response.body().use {
+                            Cache(this@DownloadWorker).putImage(galleryID, i, ext, it.byteStream())
+                        }
                         progress[galleryID]?.set(i, Float.POSITIVE_INFINITY)
-                    }
 
-                    notify(galleryID)
+                        notify(galleryID)
 
-                    if (isCompleted(galleryID)) {
-                        with(Cache(this@DownloadWorker)) {
-                            if (isDownloading(galleryID)) {
-                                moveToDownload(galleryID)
-                                setDownloading(galleryID, false)
+                        CoroutineScope(Dispatchers.IO).launch {
+                            if (isCompleted(galleryID)) {
+                                with(Cache(this@DownloadWorker)) {
+                                    if (isDownloading(galleryID)) {
+                                        moveToDownload(galleryID)
+                                        setDownloading(galleryID, false)
+                                    }
+                                }
                             }
                         }
-                        clients.remove(galleryID)
+
+                        Log.i("PUPILD", "SUCCESS ${call.request().tag()}")
+                    } catch (e: Exception) {
+
+                        progress[galleryID]?.set(i, Float.NaN)
+                        exception[galleryID]?.set(i, e)
+
+                        notify(galleryID)
+
+                        CoroutineScope(Dispatchers.IO).launch {
+                            if (isCompleted(galleryID)) {
+                                with(Cache(this@DownloadWorker)) {
+                                    if (isDownloading(galleryID)) {
+                                        moveToDownload(galleryID)
+                                        setDownloading(galleryID, false)
+                                    }
+                                }
+                            }
+                        }
+
+                        File(Cache(this@DownloadWorker).getCachedGallery(galleryID), "%05d.$ext".format(i)).delete()
+
+                        Log.i("PUPILD", "FAIL ON OK ${call.request().tag()} (${e.message})")
                     }
                 }
             }
 
-            if (progress[galleryID]?.get(i)?.isFinite() == true)
+            if (progress[galleryID]?.get(i)?.isFinite() == true) {
                 queueDownload(galleryID, reader, i, callback)
+                Log.i("PUPILD", "$galleryID QUEUED $i")
+            } else {
+                Log.i("PUPILD", "$galleryID SKIPPED $i (${progress[galleryID]?.get(i)})")
+            }
         }
     }
 
@@ -331,13 +372,17 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         val max = progress[galleryID]?.size ?: 0
         val progress = progress[galleryID]?.count { !it.isFinite() } ?: 0
 
-        if (isCompleted(galleryID))
+        Log.i("PUPILD", "NOTIFY $galleryID ${isCompleted(galleryID)} $progress/$max")
+
+        if (isCompleted(galleryID)) {
             notification[galleryID]
                 ?.setContentText(getString(R.string.reader_notification_complete))
                 ?.setSmallIcon(android.R.drawable.stat_sys_download_done)
                 ?.setProgress(0, 0, false)
                 ?.setOngoing(false)
-        else
+
+            notificationManager.cancel(galleryID)
+        } else
             notification[galleryID]
                 ?.setProgress(max, progress, false)
                 ?.setContentText("$progress/$max")
@@ -354,7 +399,7 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
         }
         val pendingIntent = TaskStackBuilder.create(this).run {
             addNextIntentWithParentStack(intent)
-            getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT)
+            getPendingIntent(galleryID, PendingIntent.FLAG_UPDATE_CURRENT)
         }
 
         notification.put(galleryID, NotificationCompat.Builder(this, "download").apply {
@@ -369,18 +414,24 @@ class DownloadWorker private constructor(context: Context) : ContextWrapper(cont
 
     private fun loop() = CoroutineScope(Dispatchers.Default).launch {
         while (true) {
-            if (queue.isEmpty() || clients.size() > preferences.getInt("max_download", 4))
+            if (queue.isEmpty())
                 continue
 
-            val galleryID = queue.poll() ?: continue
+            val galleryID = queue.peek() ?: continue
 
-            if (clients.indexOfKey(galleryID) >= 0)    // Gallery already downloading!
-                continue
+            if (progress.indexOfKey(galleryID) >= 0)    // Gallery already downloading!
+                cancel(galleryID)
+
+            if (notification[galleryID] == null)
+                initNotification(galleryID)
 
-            initNotification(galleryID)
             if (Cache(this@DownloadWorker).isDownloading(galleryID))
                 notificationManager.notify(galleryID, notification[galleryID].build())
+
+            Log.i("PUPILD", "QUEUED $galleryID")
+
             worker.put(galleryID, download(galleryID))
+            queue.poll()
         }
     }
 

app/src/main/java/xyz/quaver/pupil/util/file.kt

@@ -211,4 +211,7 @@ fun Uri.toFile(context: Context): File? {
     }
 
     return File(context.getExternalFilesDir(null)?.canonicalPath?.substringBeforeLast("/Android/data") ?: return null, folderName)
-}
+}
+
+fun File.isParentOf(another: File) =
+    another.absolutePath.startsWith(this.absolutePath)

app/src/main/java/xyz/quaver/pupil/util/history.kt

@@ -18,13 +18,14 @@
 
 package xyz.quaver.pupil.util
 
-import kotlinx.serialization.list
-import kotlinx.serialization.serializer
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.builtins.list
+import kotlinx.serialization.builtins.serializer
 import java.io.File
 
 class Histories(private val file: File) : ArrayList<Int>() {
 
-    val serializer = Int.serializer().list
+    val serializer: KSerializer<List<Int>> = Int.serializer().list
 
     init {
         if (!file.exists())

app/src/main/java/xyz/quaver/pupil/util/lock.kt

@@ -22,9 +22,7 @@ import android.content.Context
 import android.content.ContextWrapper
 import androidx.core.content.ContextCompat
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
-import kotlinx.serialization.list
+import kotlinx.serialization.builtins.list
 import java.io.File
 import java.security.MessageDigest
 

app/src/main/java/xyz/quaver/pupil/util/misc.kt

@@ -22,7 +22,7 @@ import android.annotation.SuppressLint
 import java.util.*
 import kotlin.collections.ArrayList
 
-@UseExperimental(ExperimentalStdlibApi::class)
+@OptIn(ExperimentalStdlibApi::class)
 fun String.wordCapitalize() : String {
     val result = ArrayList<String>()
 

app/src/main/java/xyz/quaver/pupil/util/update.kt

@@ -18,30 +18,40 @@
 
 package xyz.quaver.pupil.util
 
+import android.annotation.SuppressLint
+import android.app.DownloadManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.webkit.MimeTypeMap
+import android.net.Uri
+import android.util.Base64
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.FileProvider
-import androidx.lifecycle.Lifecycle
 import androidx.preference.PreferenceManager
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.boolean
 import kotlinx.serialization.json.content
+import okhttp3.*
 import ru.noties.markwon.Markwon
+import xyz.quaver.hitomi.GalleryBlock
+import xyz.quaver.hitomi.Reader
+import xyz.quaver.hitomi.getGalleryBlock
+import xyz.quaver.hitomi.getReader
+import xyz.quaver.proxy
+import xyz.quaver.pupil.BroadcastReciever
 import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.util.download.Cache
+import xyz.quaver.pupil.util.download.Metadata
 import java.io.File
+import java.io.IOException
 import java.net.URL
 import java.util.*
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
 
 fun getReleases(url: String) : JsonArray {
     return try {
@@ -81,7 +91,7 @@ fun getApkUrl(releases: JsonObject) : String? {
 }
 
 const val UPDATE_NOTIFICATION_ID = 384823
-fun checkUpdate(context: AppCompatActivity, force: Boolean = false) {
+fun checkUpdate(context: Context, force: Boolean = false) {
 
     val preferences = PreferenceManager.getDefaultSharedPreferences(context)
     val ignoreUpdateUntil = preferences.getLong("ignore_update_until", 0)
@@ -143,56 +153,27 @@ fun checkUpdate(context: AppCompatActivity, force: Boolean = false) {
             setMessage(Markwon.create(context).toMarkdown(msg))
             setPositiveButton(android.R.string.yes) { _, _ ->
 
-                val notificationManager = NotificationManagerCompat.from(context)
-                val builder = NotificationCompat.Builder(context, "download").apply {
-                    setContentTitle(context.getString(R.string.update_notification_description))
-                    setSmallIcon(android.R.drawable.stat_sys_download)
-                    priority = NotificationCompat.PRIORITY_LOW
-                    setOngoing(true)
+                val preference = PreferenceManager.getDefaultSharedPreferences(context)
+
+                val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+
+                //Cancel any download queued before
+
+                val id = preference.getLong("update_download_id", -1)
+
+                if (id != -1L)
+                    downloadManager.remove(id)
+
+                val target = File(context.getExternalFilesDir(null), "Pupil.apk").also {
+                    it.delete()
                 }
 
-                CoroutineScope(Dispatchers.IO).launch io@{
-                    val target = File(getDownloadDirectory(context), "Pupil.apk")
+                val request = DownloadManager.Request(Uri.parse(url))
+                    .setTitle(context.getText(R.string.update_notification_description))
+                    .setDestinationUri(Uri.fromFile(target))
 
-                    try {
-                        URL(url).download(target) { progress, fileSize ->
-                            builder.setProgress(fileSize.toInt(), progress.toInt(), false)
-                            notificationManager.notify(UPDATE_NOTIFICATION_ID, builder.build())
-                        }
-                    } catch (e: Exception) {
-                        builder.apply {
-                            setContentText(context.getString(R.string.update_failed))
-                            setMessage(context.getString(R.string.update_failed_message))
-                            setSmallIcon(android.R.drawable.stat_sys_download_done)
-                            setOngoing(false)
-                        }
-
-                        notificationManager.cancel(UPDATE_NOTIFICATION_ID)
-                        notificationManager.notify(UPDATE_NOTIFICATION_ID, builder.build())
-
-                        return@io
-                    }
-
-                    val install = Intent(Intent.ACTION_VIEW).apply {
-                        flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_GRANT_READ_URI_PERMISSION
-                        setDataAndType(FileProvider.getUriForFile(context, context.applicationContext.packageName + ".provider", target), MimeTypeMap.getSingleton().getMimeTypeFromExtension("apk"))
-                    }
-
-                    builder.apply {
-                        setContentIntent(PendingIntent.getActivity(context, 0, install, 0))
-                        setProgress(0, 0, false)
-                        setSmallIcon(android.R.drawable.stat_sys_download_done)
-                        setContentTitle(context.getString(R.string.update_download_completed))
-                        setContentText(context.getString(R.string.update_download_completed_description))
-                        setOngoing(false)
-                    }
-
-                    notificationManager.cancel(UPDATE_NOTIFICATION_ID)
-
-                    if (context.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED))
-                        context.startActivity(install)
-                    else
-                        notificationManager.notify(UPDATE_NOTIFICATION_ID, builder.build())
+                downloadManager.enqueue(request).also {
+                    preference.edit().putLong("update_download_id", it).apply()
                 }
             }
             setNegativeButton(if (force) android.R.string.no else R.string.ignore_update) { _, _ ->
@@ -207,4 +188,149 @@ fun checkUpdate(context: AppCompatActivity, force: Boolean = false) {
             dialog.show()
         }
     }
+}
+
+var cancelImport = false
+@SuppressLint("RestrictedApi")
+fun importOldGalleries(context: Context, folder: File) = CoroutineScope(Dispatchers.IO).launch {
+    val client = OkHttpClient.Builder()
+        .connectTimeout(0, TimeUnit.SECONDS)
+        .readTimeout(0, TimeUnit.SECONDS)
+        .proxy(proxy)
+        .build()
+
+    val cancelIntent = Intent(context, BroadcastReciever::class.java).apply {
+        action = BroadcastReciever.ACTION_CANCEL_IMPORT
+        putExtra(BroadcastReciever.EXTRA_IMPORT_NOTIFICATION_ID, 0)
+    }
+    val pendingIntent = PendingIntent.getBroadcast(context, 0, cancelIntent, 0)
+
+    val notificationManager = NotificationManagerCompat.from(context)
+    val notificationBuilder = NotificationCompat.Builder(context, "import").apply {
+        setContentTitle(context.getText(R.string.import_old_galleries_notification))
+        setProgress(0, 0, true)
+        setSmallIcon(R.drawable.ic_notification)
+        addAction(0, context.getText(android.R.string.cancel), pendingIntent)
+        setOngoing(true)
+    }
+
+    notificationManager.notify(0, notificationBuilder.build())
+
+    if (!folder.isDirectory)
+        return@launch
+
+    val galleryRegex = Regex("""[0-9]+$""")
+    val imageRegex = Regex("""^[0-9]+\..+$""")
+    var size = 0
+    fun setProgress(progress: Int) {
+        notificationBuilder.apply {
+            setContentText(
+                context.getString(
+                    R.string.import_old_galleries_notification_text,
+                    progress,
+                    size
+                )
+            )
+            setProgress(size, progress, false)
+        }
+
+        notificationManager.notify(0, notificationBuilder.build())
+    }
+
+    folder.listFiles { _, name ->
+        galleryRegex.matches(name)
+    }?.also {
+        size = it.size
+        setProgress(0)
+    }?.forEachIndexed { index, gallery ->
+        if (cancelImport)
+            return@forEachIndexed
+
+        setProgress(index)
+
+        val galleryID = gallery.name.toIntOrNull() ?: return@forEachIndexed
+
+        File(getDownloadDirectory(context), galleryID.toString()).mkdirs()
+
+        val reader = async {
+            kotlin.runCatching {
+                json.parse(Reader.serializer(), File(gallery, "reader.json").readText())
+            }.getOrElse {
+                getReader(galleryID)
+            }
+        }
+        val galleryBlock = async {
+            kotlin.runCatching {
+                json.parse(GalleryBlock.serializer(), File(gallery, "galleryBlock.json").readText())
+            }.getOrElse {
+                getGalleryBlock(galleryID)
+            }
+        }
+        @Suppress("NAME_SHADOWING")
+        val thumbnail = async thumbnail@{
+            val galleryBlock = galleryBlock.await()
+
+            Base64.encodeToString(try {
+                File(gallery, "thumbnail.jpg").readBytes()
+            } catch (e: Exception) {
+                val url = galleryBlock?.thumbnails?.firstOrNull()
+
+                if (url == null)
+                    null
+                else {
+                    val request = Request.Builder().url(url).build()
+
+                    var done = false
+                    var result: ByteArray? = null
+                    client.newCall(request).enqueue(object : Callback {
+                        override fun onFailure(call: Call?, e: IOException?) {
+                            done = true
+                        }
+
+                        override fun onResponse(call: Call?, response: Response?) {
+                            result = response?.body()?.use {
+                                it.bytes()
+                            }
+                            done = true
+                        }
+                    })
+
+                    if (!done)
+                        yield()
+
+                    result
+                }
+            } ?: return@thumbnail null, Base64.DEFAULT)
+        }
+
+        Cache(context).setCachedMetadata(galleryID,
+            Metadata(
+                thumbnail.await(),
+                galleryBlock.await(),
+                reader.await()
+            )
+        )
+
+        File(gallery, "images").listFiles { _, name ->
+            imageRegex.matches(name)
+        }?.forEach {
+            if (cancelImport)
+                return@forEach
+
+            @Suppress("NAME_SHADOWING")
+            val index = it.nameWithoutExtension.toIntOrNull() ?: return@forEach
+
+            Cache(context).putImage(galleryID, index, it.extension, it.inputStream())
+        }
+    }
+
+    notificationBuilder.apply {
+        setContentText(context.getText(R.string.import_old_galleries_notification_done))
+        setProgress(0, 0, false)
+        setOngoing(false)
+        mActions.clear()
+    }
+    notificationManager.notify(0, notificationBuilder.build())
+
+    cancelImport = false
 }

app/src/main/res/drawable/cancel.xml

@@ -0,0 +1,8 @@
+<!-- drawable/cancel.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2M12,4A8,8 0 0,0 4,12C4,13.85 4.63,15.55 5.68,16.91L16.91,5.68C15.55,4.63 13.85,4 12,4M12,20A8,8 0 0,0 20,12C20,10.15 19.37,8.45 18.32,7.09L7.09,18.32C8.45,19.37 10.15,20 12,20Z" />
+</vector>

app/src/main/res/drawable/shuffle_variant.xml

@@ -0,0 +1,8 @@
+<!-- drawable/shuffle_variant.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M17,3L22.25,7.5L17,12L22.25,16.5L17,21V18H14.26L11.44,15.18L13.56,13.06L15.5,15H17V12L17,9H15.5L6.5,18H2V15H5.26L14.26,6H17V3M2,6H6.5L9.32,8.82L7.2,10.94L5.26,9H2V6Z" />
+</vector>

app/src/main/res/drawable/thumb.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2020  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:topLeftRadius="44dp"
+        android:topRightRadius="44dp"
+        android:bottomLeftRadius="44dp" />
+
+    <padding
+        android:paddingLeft="22dp"
+        android:paddingRight="22dp" />
+
+    <solid android:color="@color/colorPrimary" />
+
+</shape>

app/src/main/res/drawable/thumb_drawable.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2020  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/thumb"/>
+
+    <item
+        android:drawable="@drawable/thumb"/>
+</selector>

app/src/main/res/drawable/track.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2020  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@android:color/transparent" />
+
+    <padding
+        android:top="10dp"
+        android:left="10dp"
+        android:right="10dp"
+        android:bottom="10dp"/>
+</shape>

app/src/main/res/drawable/track_drawable.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Pupil, Hitomi.la viewer for Android
+  ~     Copyright (C) 2020  tom5079
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/track"/>
+
+    <item
+        android:drawable="@drawable/track"/>
+</selector>

app/src/main/res/layout/activity_main_content.xml

@@ -71,7 +71,11 @@
             android:layout_height="match_parent"
             android:paddingTop="64dp"
             android:clipToPadding="false"
-            android:scrollbars="vertical"
+            app:fastScrollEnabled="true"
+            app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
+            app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
+            app:fastScrollHorizontalTrackDrawable="@drawable/track_drawable"
+            app:fastScrollVerticalTrackDrawable="@drawable/track_drawable"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
 
         <com.github.clans.fab.FloatingActionMenu
@@ -82,6 +86,13 @@
                 android:layout_margin="16dp"
                 app:menu_colorNormal="@color/colorAccent">
 
+            <com.github.clans.fab.FloatingActionButton
+                android:id="@+id/main_fab_cancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:fab_label="@string/main_fab_cancel"
+                app:fab_size="mini"/>
+
             <com.github.clans.fab.FloatingActionButton
                 android:id="@+id/main_fab_jump"
                 android:layout_width="wrap_content"
@@ -89,6 +100,13 @@
                 app:fab_label="@string/main_jump_title"
                 app:fab_size="mini"/>
 
+            <com.github.clans.fab.FloatingActionButton
+                android:id="@+id/main_fab_random"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:fab_label="@string/main_fab_random"
+                app:fab_size="mini"/>
+
             <com.github.clans.fab.FloatingActionButton
                 android:id="@+id/main_fab_id"
                 android:layout_width="wrap_content"

app/src/main/res/layout/activity_reader.xml

@@ -30,6 +30,11 @@
         android:id="@+id/reader_recyclerview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        app:fastScrollEnabled="true"
+        app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
+        app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
+        app:fastScrollHorizontalTrackDrawable="@drawable/track_drawable"
+        app:fastScrollVerticalTrackDrawable="@drawable/track_drawable"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
 
     <LinearLayout

app/src/main/res/layout/item_reader.xml

@@ -25,10 +25,13 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/container"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
+        app:layout_constraintHeight_max="2000dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
         android:background="@drawable/reader_item_boundary">
 
         <LinearLayout
@@ -61,11 +64,12 @@
 
         <com.github.chrisbanes.photoview.PhotoView
             android:id="@+id/image"
-            android:contentDescription="@string/reader_imageview_description"
             android:adjustViewBounds="true"
             android:scaleType="fitCenter"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
             android:paddingBottom="8dp"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/menu/main.xml

@@ -20,6 +20,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
+	<item android:id="@+id/main_menu_thin"
+		android:title="@string/main_menu_thin"/>
+
 	<item
 		android:id="@+id/main_menu_sort"
 		android:title="@string/main_menu_sort">

app/src/main/res/values-ja/strings.xml

@@ -130,4 +130,15 @@
     <string name="proxy_dialog_error">エラー</string>
     <string name="proxy_dialog_addr_hint">サーバーアドレス</string>
     <string name="proxy_dialog_server">サーバー</string>
+    <string name="main_menu_thin">簡単モード</string>
+    <string name="main_fab_cancel">すべてのダウンロードキャンセル</string>
+    <string name="channel_update">アップデート</string>
+    <string name="channel_update_description">アップデートの進行状態を表示</string>
+    <string name="channel_import">インポート</string>
+    <string name="channel_import_description">インポート状態を表示</string>
+    <string name="settings_import_old_galleries">旧ギャラリーインポート</string>
+    <string name="import_old_galleries_folder_not_readable">フォルダを読めません</string>
+    <string name="import_old_galleries_notification">旧ギャラリーインポート中…</string>
+    <string name="import_old_galleries_notification_done">インポート完了</string>
+    <string name="main_fab_random">ランダムギャラリーを開く</string>
 </resources>

app/src/main/res/values-ko/strings.xml

@@ -130,4 +130,15 @@
     <string name="proxy_dialog_error">잘못된 값</string>
     <string name="proxy_dialog_addr_hint">서버 주소</string>
     <string name="proxy_dialog_server">서버</string>
+    <string name="main_menu_thin">간단히 보기 모드</string>
+    <string name="main_fab_cancel">다운로드 모두 취소</string>
+    <string name="channel_update">업데이트</string>
+    <string name="channel_update_description">업데이트 진행상황 표시</string>
+    <string name="channel_import">가져오기</string>
+    <string name="channel_import_description">가져오기 상태 표시</string>
+    <string name="settings_import_old_galleries">이전 버전 갤러리 가져오기</string>
+    <string name="import_old_galleries_folder_not_readable">폴더를 읽을 수 없습니다</string>
+    <string name="import_old_galleries_notification">이전 버전 갤러리 가져오는 중…</string>
+    <string name="import_old_galleries_notification_done">가져오기 완료</string>
+    <string name="main_fab_random">무작위 갤러리 열기</string>
 </resources>

app/src/main/res/values/dimen.xml

@@ -11,6 +11,6 @@
 
 	<dimen name="thumbnail_margin">8dp</dimen>
 
-	<dimen name="galleryblock_thumbnail_thin">50dp</dimen>
+	<dimen name="galleryblock_thumbnail_thin">100dp</dimen>
 	<dimen name="galleryblock_thumbnail_normal">150dp</dimen>
 </resources>

app/src/main/res/values/strings.xml

@@ -35,6 +35,12 @@
     <string name="channel_download">Download</string>
     <string name="channel_download_description">Shows download status</string>
 
+    <string name="channel_update">Update</string>
+    <string name="channel_update_description">Shows update progress</string>
+
+    <string name="channel_import">Import</string>
+    <string name="channel_import_description">Shows progress of import</string>
+
     <string name="unable_to_connect">Unable to connect to hitomi.la</string>
     
     <string name="lock_corrupted">Lock file corrupted! Please re-install Pupil</string>
@@ -53,6 +59,8 @@
     <string name="main_drawer_group_contact_email">Email me!</string>
     <string name="main_drawer_grouop_contact_discord">Discord</string>
 
+    <string name="main_menu_thin">Toggle Thin Mode</string>
+
     <string name="main_menu_sort">Sort</string>
     <string name="main_menu_sort_newest">Newest</string>
     <string name="main_menu_sort_popular">Popular</string>
@@ -61,6 +69,8 @@
     <string name="main_jump_message">Current page: %1$d\nMaximum page: %2$d</string>
     <string name="main_open_gallery_by_id">Open Gallery by ID</string>
     <string name="reader_failed_to_find_gallery">Failed to open gallery</string>
+    <string name="main_fab_random">Open a random gallery</string>
+    <string name="main_fab_cancel">Cancel all downloads</string>
 
     <string name="main_move">Move to page %1$d</string>
 
@@ -167,6 +177,7 @@
     <string name="settings_restore_title">Restore favorites</string>
     <string name="settings_restore_failed">Restore failed</string>
     <string name="settings_restore_successful">%1$d entries restored</string>
+    <string name="settings_import_old_galleries">Import old galleries</string>
 
     <!-- SETTINGS/APP LOCK ACTIVITY -->
 
@@ -199,4 +210,10 @@
     <string name="proxy_dialog_error">Wrong value</string>
     <string name="proxy_dialog_server">server</string>
 
+    <!-- IMPORT OLD GALLERIES -->
+    <string name="import_old_galleries_folder_not_readable">This folder is not readable</string>
+    <string name="import_old_galleries_notification">Importing old galleries…</string>
+    <string name="import_old_galleries_notification_text" translatable="false">%1$d/%2$d</string>
+    <string name="import_old_galleries_notification_done">Importing completed</string>
+
 </resources>

app/src/main/res/xml/root_preferences.xml

@@ -50,7 +50,8 @@
         <SwitchPreferenceCompat
             app:key="low_quality"
             app:title="@string/settings_low_quality"
-            app:summary="@string/settings_low_quality_summary"/>
+            app:summary="@string/settings_low_quality_summary"
+            app:defaultValue="true"/>
 
     </PreferenceCategory>
 
@@ -99,6 +100,10 @@
             app:key="restore"
             app:title="@string/settings_restore_title"/>
 
+        <Preference
+            app:key="old_import_galleries"
+            app:title="@string/settings_import_old_galleries"/>
+
     </PreferenceCategory>
 
 </androidx.preference.PreferenceScreen>

app/src/test/java/xyz/quaver/pupil/ExampleUnitTest.kt

@@ -34,8 +34,6 @@ class ExampleUnitTest {
     @Test
     fun test() {
         val arr = SparseArray<Float>()
-
-        print(arr.indexOfKey(34))
     }
 
 }

build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.3.72'
     repositories {
         google()
         jcenter()
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"

gradle.properties

@@ -14,5 +14,4 @@
 kotlin.code.style=official
 android.enableJetifier=true
 org.gradle.jvmargs=-Xmx1024M -Dkotlin.daemon.jvm.options\="-Xmx1024M"
-android.useAndroidX=true
-android.enableR8.fullMode=true
+android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Aug 23 08:21:15 KST 2019
+#Sat Feb 29 09:07:20 KST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

libpupil/build.gradle

@@ -6,13 +6,11 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0"
     implementation 'org.jsoup:jsoup:1.12.1'
     testImplementation 'junit:junit:4.13'
 }
 
-sourceCompatibility = "7"
-targetCompatibility = "7"
 buildscript {
     repositories {
         mavenCentral()

libpupil/src/main/java/xyz/quaver/Utils.kt

@@ -16,10 +16,20 @@
 
 package xyz.quaver
 
+import kotlinx.serialization.UnstableDefault
+import kotlinx.serialization.json.Json
 import java.net.Proxy
 
 var proxy = Proxy.NO_PROXY
 
+@OptIn(UnstableDefault::class)
+var json = Json {
+    isLenient = true
+    ignoreUnknownKeys = true
+    serializeSpecialFloatingPointValues = true
+    useArrayPolymorphism = true
+}
+
 fun availableInHiyobi(galleryID: Int) : Boolean {
     return try {
         xyz.quaver.hiyobi.getReader(galleryID)

libpupil/src/main/java/xyz/quaver/hitomi/common.kt

@@ -16,7 +16,7 @@
 
 package xyz.quaver.hitomi
 
-import kotlinx.serialization.json.Json
+import xyz.quaver.json
 import xyz.quaver.proxy
 import java.net.URL
 
@@ -24,7 +24,7 @@ const val protocol = "https:"
 
 @Suppress("EXPERIMENTAL_API_USAGE")
 fun getGalleryInfo(galleryID: Int) =
-    Json.nonstrict.parse(
+    json.parse(
         GalleryInfo.serializer(),
         URL("$protocol//$domain/galleries/$galleryID.js").openConnection(proxy).getInputStream().use {
             it.reader().readText()

libpupil/src/main/java/xyz/quaver/hitomi/search.kt

@@ -39,7 +39,7 @@ fun sha256(data: ByteArray) : ByteArray {
     return MessageDigest.getInstance("SHA-256").digest(data)
 }
 
-@UseExperimental(ExperimentalUnsignedTypes::class)
+@OptIn(ExperimentalUnsignedTypes::class)
 fun hashTerm(term: String) : UByteArray {
     return sha256(term.toByteArray()).toUByteArray().sliceArray(0 until 4)
 }
@@ -175,8 +175,12 @@ fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : List
                 else -> "$protocol//$domain/$compressed_nozomi_prefix/$area/$tag-$language$nozomiextension"
             }
 
-    val bytes = URL(nozomiAddress).openConnection(proxy).getInputStream().use {
-        it.readBytes()
+    val bytes = try {
+        URL(nozomiAddress).openConnection(proxy).getInputStream().use {
+            it.readBytes()
+        }
+    } catch (e: Exception) {
+        return emptyList()
     }
 
     val nozomi = ArrayList<Int>()
@@ -254,9 +258,9 @@ fun getURLAtRange(url: String, range: LongRange) : ByteArray? {
     }
 }
 
-@UseExperimental(ExperimentalUnsignedTypes::class)
+@OptIn(ExperimentalUnsignedTypes::class)
 data class Node(val keys: List<UByteArray>, val datas: List<Pair<Long, Int>>, val subNodeAddresses: List<Long>)
-@UseExperimental(ExperimentalUnsignedTypes::class)
+@OptIn(ExperimentalUnsignedTypes::class)
 fun decodeNode(data: ByteArray) : Node {
     val buffer = ByteBuffer
         .wrap(data)
@@ -298,7 +302,7 @@ fun decodeNode(data: ByteArray) : Node {
     return Node(keys, datas, subNodeAddresses)
 }
 
-@UseExperimental(ExperimentalUnsignedTypes::class)
+@OptIn(ExperimentalUnsignedTypes::class)
 fun bSearch(field: String, key: UByteArray, node: Node) : Pair<Long, Int>? {
     fun compareArrayBuffers(dv1: UByteArray, dv2: UByteArray) : Int {
         val top = Math.min(dv1.size, dv2.size)

libpupil/src/main/java/xyz/quaver/hiyobi/reader.kt

@@ -17,19 +17,20 @@
 package xyz.quaver.hiyobi
 
 import kotlinx.serialization.UnstableDefault
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.list
+import kotlinx.serialization.builtins.list
 import org.jsoup.Jsoup
 import xyz.quaver.Code
 import xyz.quaver.hitomi.GalleryFiles
 import xyz.quaver.hitomi.GalleryInfo
 import xyz.quaver.hitomi.Reader
 import xyz.quaver.hitomi.protocol
+import xyz.quaver.json
 import xyz.quaver.proxy
 import java.net.URL
 import javax.net.ssl.HttpsURLConnection
 
 const val hiyobi = "hiyobi.me"
+const val primary_img_domain = "cdn.hiyobi.me"
 const val user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.131 Safari/537.36"
 
 var cookie: String = ""
@@ -61,14 +62,14 @@ fun renewCookie() : String {
     }
 }
 
-@UseExperimental(UnstableDefault::class)
+@OptIn(UnstableDefault::class)
 fun getReader(galleryID: Int) : Reader {
     val reader = "https://$hiyobi/reader/$galleryID"
     val url = "https://cdn.hiyobi.me/data/json/${galleryID}_list.json"
 
     val title = Jsoup.connect(reader).proxy(proxy).get().title()
 
-    val galleryFiles = Json.nonstrict.parse(
+    val galleryFiles = json.parse(
         GalleryFiles.serializer().list,
         with(URL(url).openConnection(proxy) as HttpsURLConnection) {
             setRequestProperty("User-Agent", user_agent)
@@ -87,7 +88,7 @@ fun createImgList(galleryID: Int, reader: Reader, lowQuality: Boolean = false) =
     if (lowQuality)
         reader.galleryInfo.files.map {
             val name = it.name.replace(Regex("""\.[^/.]+$"""), "")
-            Images("$protocol//$hiyobi/data_r/$galleryID/$name.jpg", galleryID, it.name)
+            Images("$protocol//$primary_img_domain/data_r/$galleryID/$name.jpg", galleryID, it.name)
         }
     else
-        reader.galleryInfo.files.map { Images("$protocol//$hiyobi/data/$galleryID/${it.name}", galleryID, it.name) }
+        reader.galleryInfo.files.map { Images("$protocol//$primary_img_domain/data/$galleryID/${it.name}", galleryID, it.name) }

libpupil/src/test/java/xyz/quaver/hitomi/UnitTest.kt

@@ -75,7 +75,7 @@ class UnitTest {
 
     @Test
     fun test_getReader() {
-        val reader = getReader(1567569)
+        val reader = getReader(1574736)
 
         print(reader)
     }