From 01c1537ae83d30c1be4211740211e07589221b9a Mon Sep 17 00:00:00 2001 From: tom5079 Date: Thu, 6 Jun 2019 02:02:20 +0900 Subject: [PATCH] deleted hiyobi support --- .../java/xyz/quaver/pupil/MainActivity.kt | 11 +++++++++- .../quaver/pupil/util/GalleryDownloader.kt | 21 +++++-------------- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/xml/root_preferences.xml | 5 ----- .../src/main/java/xyz/quaver/hiyobi/reader.kt | 9 +++++--- .../test/java/xyz/quaver/hitomi/UnitTest.kt | 7 ++++--- 8 files changed, 28 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/xyz/quaver/pupil/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/MainActivity.kt index 63b2ff44..28079aaf 100644 --- a/app/src/main/java/xyz/quaver/pupil/MainActivity.kt +++ b/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( diff --git a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt index 7f8e1405..3ce9999e 100644 --- a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt +++ b/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) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c0b571d8..8742adff 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -19,7 +19,6 @@ 新しいアップデートがあります 注意 その他 - ロード速度を向上させるためhiyobi.meからイメージロード hiyobi.meからロード 履歴を削除 履歴を削除しますか？ @@ -67,4 +66,5 @@ ダウンロード完了後自動的にエクスポート ダウンロード削除 ダウンロードしたギャラリーを全て削除します。\n実行しますか？ + 点検中 \ No newline at end of file diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index bd1f8e0c..1277a72f 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -19,7 +19,6 @@ 검색 캐시 기타 - 속도 향상을 위해 가능한 경우 hiyobi.me에서 이미지 로드 hiyobi.me 사용 기록 삭제 기록을 삭제하시겠습니까? @@ -67,4 +66,5 @@ 다운로드가 끝난 후 자동 내보내기 다운로드 삭제 다운로드 된 만화를 모두 삭제합니다.\n계속하시겠습니까? + 점검중 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d8232b53..edad79da 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -88,7 +88,7 @@ %1$d histories saved Miscellaneous Use hiyobi.me - Load images from hiyobi.me to improve loading speed (if available) + Under maintenance Export zip Export to zip instead of image folder Auto Export diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml index 00e29ae6..231daef9 100644 --- a/app/src/main/res/xml/root_preferences.xml +++ b/app/src/main/res/xml/root_preferences.xml @@ -41,11 +41,6 @@ - -