deleted hiyobi support

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

@@ -1,6 +1,8 @@
 package xyz.quaver.pupil
 
+import android.Manifest
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Bundle
 import android.os.Environment
@@ -15,8 +17,8 @@ import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.cardview.widget.CardView
+import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.GravityCompat
 import com.arlib.floatingsearchview.FloatingSearchView
@@ -75,6 +77,8 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        checkPermissions()
+
         val preference = PreferenceManager.getDefaultSharedPreferences(this)
 
         if (Locale.getDefault().language == "ko") {
@@ -245,6 +249,11 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun checkPermissions() {
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
+            ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 13489)
+    }
+
     private fun initView() {
         var prevP1 = 0
         main_appbar_layout.addOnOffsetChangedListener(

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

@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.ContextWrapper
 import android.content.Intent
 import android.os.Environment
+import android.util.Log
 import android.util.SparseArray
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -17,6 +18,8 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 import kotlinx.serialization.list
 import xyz.quaver.hitomi.*
+import xyz.quaver.hiyobi.cookie
+import xyz.quaver.hiyobi.user_agent
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.ReaderActivity
@@ -88,8 +91,6 @@ class GalleryDownloader(
             download = _notify
             val json = Json(JsonConfiguration.Stable)
             val serializer = ReaderItem.serializer().list
-            val preference = PreferenceManager.getDefaultSharedPreferences(this@GalleryDownloader)
-            val useHiyobi = preference.getBoolean("use_hiyobi", false)
 
             //Check cache
             val cache = File(ContextCompat.getDataDir(this@GalleryDownloader), "images/${galleryBlock.id}/reader.json").let {
@@ -109,19 +110,7 @@ class GalleryDownloader(
             }
 
             //Cache doesn't exist. Load from internet
-            val reader = when {
-                useHiyobi -> {
-                    xyz.quaver.hiyobi.getReader(galleryBlock.id).let {
-                        when {
-                            it.isEmpty() -> getReader(galleryBlock.id)
-                            else -> it
-                        }
-                    }
-                }
-                else -> {
-                    getReader(galleryBlock.id)
-                }
-            }
+            val reader = getReader(galleryBlock.id)
 
             if (reader.isNotEmpty()) {
                 //Save cache
@@ -191,7 +180,7 @@ class GalleryDownloader(
                             } catch (e: Exception) {
                                 cache.delete()
 
-                                downloads.remove(galleryBlock.id)
+                                Log.e("Pupil", e.toString())
 
                                 onErrorHandler?.invoke(e)