search bug fix

Resolves #109

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AndroidLintNewerVersionAvailable" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

README.md

@@ -2,7 +2,7 @@
 *Pupil, Hitomi.la viewer for Android*  
 
 ![](https://img.shields.io/github/downloads/tom5079/Pupil/total)  
-[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.1.5/Pupil-v5.1.5.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.5/Pupil-v5.1.5.apk)  
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.1.6-hotfix6/Pupil-v5.1.6-hotfix6.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.1.6-hotfix6/Pupil-v5.1.6-hotfix6.apk)  
 [![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)  
 
 # Features

app/build.gradle

@@ -38,7 +38,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 30
         versionCode 63
-        versionName "5.1.5"
+        versionName "5.1.6-hotfix6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -77,13 +77,14 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0-M1"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0-RC2"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0"
     
     implementation "androidx.appcompat:appcompat:1.2.0"
     implementation "androidx.activity:activity-ktx:1.2.0-beta01"
     implementation "androidx.fragment:fragment-ktx:1.3.0-beta01"
     implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.0.2"
     implementation "androidx.gridlayout:gridlayout:1.0.0"
     implementation "androidx.biometric:biometric:1.0.1"
@@ -122,7 +123,7 @@ dependencies {
 
     implementation "ru.noties.markwon:core:3.1.0"
 
-    implementation "xyz.quaver:libpupil:1.7.2"
+    implementation "xyz.quaver:libpupil:1.8.15"
     implementation "xyz.quaver:documentfilex:0.4-alpha02"
     implementation "xyz.quaver:floatingsearchview:1.0.7"
 

app/release/output-metadata.json

@@ -11,7 +11,7 @@
       "type": "SINGLE",
       "filters": [],
       "versionCode": 63,
-      "versionName": "5.1.5",
+      "versionName": "5.1.6-hotfix6",
       "outputFile": "app-release.apk"
     }
   ]

app/src/main/AndroidManifest.xml

@@ -25,7 +25,8 @@
         android:theme="@style/AppTheme"
         android:networkSecurityConfig="@xml/network_security_config"
         tools:replace="android:theme"
-        tools:ignore="UnusedAttribute">
+        tools:ignore="UnusedAttribute"
+        android:largeHeap="true">
 
         <meta-data
             android:name="com.google.mlkit.vision.DEPENDENCIES"

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

@@ -18,7 +18,10 @@
 
 package xyz.quaver.pupil
 
-import android.app.*
+import android.app.Application
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
 import android.net.Uri

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

@@ -18,6 +18,8 @@
 
 package xyz.quaver.pupil.adapters
 
+import android.content.ClipData
+import android.content.ClipboardManager
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.util.Log
@@ -26,6 +28,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
+import android.widget.Toast
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
@@ -94,6 +97,13 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
                             visibility = View.VISIBLE
                     }
 
+                    view.galleryblock_id.setOnClickListener {
+                        (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
+                            ClipData.newPlainText("gallery_id", galleryID.toString())
+                        )
+                        Toast.makeText(context, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
+                    }
+
                     if (!imageList.contains(null)) {
                         val downloadManager = DownloadManager.getInstance(context)
 

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

@@ -19,7 +19,6 @@
 package xyz.quaver.pupil.adapters
 
 import android.content.Context
-import android.graphics.DiscretePathEffect
 import android.graphics.drawable.Animatable
 import android.net.Uri
 import android.view.LayoutInflater

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

@@ -125,11 +125,15 @@ class MainActivity :
         if (Preferences["download_folder", ""].isEmpty())
             DownloadLocationDialogFragment().show(supportFragmentManager, "Download Location Dialog")
 
-        checkUpdate(this)
-
         initView()
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        checkUpdate(this)
+    }
+
     @OptIn(ExperimentalStdlibApi::class)
     override fun onBackPressed() {
         when {
@@ -934,7 +938,7 @@ class MainActivity :
                         }
                     }
                 }
-            }
+            }.toList()
         }
     }
 

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

@@ -258,7 +258,7 @@ class ReaderActivity : BaseActivity() {
         //currentPage is 1-based
         return when(keyCode) {
             KeyEvent.KEYCODE_VOLUME_UP -> {
-                (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPositionWithOffset(currentPage-2, 0)
+                (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-2, 0)
 
                 true
             }
@@ -339,7 +339,7 @@ class ReaderActivity : BaseActivity() {
                         scrollMode(false)
                         fullscreen(true)
                     } else {
-                        (reader_recyclerview.layoutManager as LinearLayoutManager?)?.scrollToPosition(currentPage) //Moves to next page because currentPage is 1-based indexing
+                        (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage, 0) //Moves to next page because currentPage is 1-based indexing
                     }
                 }
             }
@@ -359,7 +359,6 @@ class ReaderActivity : BaseActivity() {
                         return
                     currentPage = layoutManager.findFirstVisibleItemPosition()+1
                     menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/${recyclerView.adapter!!.itemCount}"
-
                 }
             })
         }
@@ -455,7 +454,11 @@ class ReaderActivity : BaseActivity() {
             reader_recyclerview.layoutManager = LinearLayoutManager(this)
         } else {
             snapHelper.attachToRecyclerView(reader_recyclerview)
-            reader_recyclerview.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, Preferences["rtl", false])
+            reader_recyclerview.layoutManager = object: LinearLayoutManager(this, HORIZONTAL, Preferences["rtl", false]) {
+                override fun calculateExtraLayoutSpace(state: RecyclerView.State, extraLayoutSpace: IntArray) {
+                    extraLayoutSpace.fill(600)
+                }
+            }
         }
 
         (reader_recyclerview.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(currentPage-1, 0)

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

@@ -21,11 +21,9 @@ package xyz.quaver.pupil.ui.fragment
 import android.app.Activity
 import android.content.*
 import android.os.Bundle
-import android.os.LocaleList
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.os.LocaleListCompat
 import androidx.preference.*
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 import kotlinx.coroutines.CoroutineScope
@@ -112,7 +110,7 @@ class SettingsFragment :
                     (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
                         ClipData.newPlainText("user_id", Preferences.get<String>("user_id"))
                     )
-                    Toast.makeText(context, R.string.settings_user_id_toast, Toast.LENGTH_SHORT).show()
+                    Toast.makeText(context, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
                 }
                 else -> return false
             }
@@ -126,7 +124,7 @@ class SettingsFragment :
             this ?: return false
 
             when (key) {
-                "tag_language" -> {
+                "tag_translation" -> {
                     updateTranslations()
                 }
                 "nomedia" -> {
@@ -249,19 +247,21 @@ class SettingsFragment :
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
-                        "tag_language" -> {
+                        "tag_translation" -> {
                             this as ListPreference
 
                             isEnabled = false
 
                             CoroutineScope(Dispatchers.IO).launch {
-                                val languages = getAvailableLanguages().distinct().toTypedArray()
+                                kotlin.runCatching {
+                                    val languages = getAvailableLanguages().distinct().toTypedArray()
 
-                                entries = languages.map { Locale(it).let { loc -> loc.getDisplayLanguage(loc) } }.toTypedArray()
+                                    entries = languages.map { Locale(it).let { loc -> loc.getDisplayLanguage(loc) } }.toTypedArray()
-                                entryValues = languages
+                                    entryValues = languages
 
-                                launch(Dispatchers.Main) {
+                                    launch(Dispatchers.Main) {
-                                    isEnabled = true
+                                        isEnabled = true
+                                    }
                                 }
                             }
 

app/src/main/java/xyz/quaver/pupil/ui/view/TagChipGroup.kt

@@ -24,10 +24,7 @@ import android.util.AttributeSet
 import android.util.Log
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tag
 import xyz.quaver.pupil.types.Tags
@@ -71,10 +68,12 @@ class TagChipGroup @JvmOverloads constructor(context: Context, attr: AttributeSe
         maxChipSize = attr.getInt(R.styleable.TagChipGroup_maxTag, Defaults.maxChipSize)
     }
 
+    private var refreshJob: Job? = null
     fun refresh() {
+        refreshJob?.cancel()
         this.removeAllViews()
 
-        CoroutineScope(Dispatchers.Main).launch {
+        refreshJob = CoroutineScope(Dispatchers.Main).launch {
             tags.take(maxChipSize).map {
                 CoroutineScope(Dispatchers.Default).async {
                     TagChip(context, it).apply {

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

@@ -24,7 +24,7 @@ import kotlinx.serialization.json.Json
 import java.io.File
 import java.util.*
 
-class SavedSet <T: Any> (private val file: File, private val any: T, private val set: MutableSet<T> = Collections.synchronizedSet(mutableSetOf())) : MutableSet<T> by set {
+class SavedSet <T: Any> (private val file: File, private val any: T, private val set: MutableSet<T> = mutableSetOf()) : MutableSet<T> by set {
 
     @Suppress("UNCHECKED_CAST")
     @OptIn(ExperimentalSerializationApi::class)
@@ -39,24 +39,23 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
         load()
     }
 
+    @Synchronized
     fun load() {
-        synchronized(this) {
+        set.clear()
-            set.clear()
+        kotlin.runCatching {
-            kotlin.runCatching {
+            Json.decodeFromString(serializer, file.readText())
-                Json.decodeFromString(serializer, file.readText())
+        }.onSuccess {
-            }.onSuccess {
+            set.addAll(it)
-                set.addAll(it)
-            }
         }
     }
 
+    @Synchronized
     @OptIn(ExperimentalSerializationApi::class)
     fun save() {
-        synchronized(this) {
+        file.writeText(Json.encodeToString(serializer, set.toList()))
-            file.writeText(Json.encodeToString(serializer, set.toList()))
-        }
     }
 
+    @Synchronized
     override fun add(element: T): Boolean {
         load()
 
@@ -67,6 +66,7 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
         }
     }
 
+    @Synchronized
     override fun addAll(elements: Collection<T>): Boolean {
         load()
 
@@ -77,6 +77,7 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
         }
     }
 
+    @Synchronized
     override fun remove(element: T): Boolean {
         load()
 
@@ -85,6 +86,7 @@ class SavedSet <T: Any> (private val file: File, private val any: T, private val
         }
     }
 
+    @Synchronized
     override fun clear() {
         set.clear()
         save()

app/src/main/java/xyz/quaver/pupil/util/downloader/DownloadManager.kt

@@ -80,7 +80,7 @@ class DownloadManager private constructor(context: Context) : ContextWrapper(con
                 }.invoke()
             }
 
-            return downloadFolderMapInstance!!
+            return downloadFolderMapInstance ?: mutableMapOf()
         }
 
 

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

@@ -55,10 +55,12 @@ fun cleanCache(context: Context) = CoroutineScope(Dispatchers.IO).launch {
             while (cacheSize.invoke() > limit/2) {
                 val caches = cacheFolder.list() ?: return@withLock
 
-                (histories.toList().firstOrNull {
+                synchronized(histories) {
-                    caches.contains(it.toString()) && !downloadManager.isDownloading(it)
+                    (histories.firstOrNull {
-                } ?: return@withLock).let {
+                        caches.contains(it.toString()) && !downloadManager.isDownloading(it)
-                    Cache.delete(context, it)
+                    } ?: return@withLock).let {
+                        Cache.delete(context, it)
+                    }
                 }
             }
     }

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

@@ -42,11 +42,13 @@ var translations: Map<String, String> = run {
 @Suppress("BlockingMethodInNonBlockingContext")
 fun updateTranslations() = CoroutineScope(Dispatchers.IO).launch {
     translations = emptyMap()
-    translations = Json.decodeFromString<Map<String, String>>(client.newCall(
+    kotlin.runCatching {
-        Request.Builder()
+        translations = Json.decodeFromString<Map<String, String>>(client.newCall(
-            .url(contentURL + "${Preferences["tag_language", ""]}.json")
+            Request.Builder()
-            .build()
+                .url(contentURL + "${Preferences["tag_translation", ""].let { if (it.isEmpty()) Locale.getDefault().language else it }}.json")
-    ).execute().also { if (it.code() != 200) return@launch }.body()?.use { it.string() } ?: return@launch).filterValues { it.isNotEmpty() }
+                .build()
+        ).execute().also { if (it.code() != 200) return@launch }.body()?.use { it.string() } ?: return@launch).filterValues { it.isNotEmpty() }
+    }
 }
 
 fun getAvailableLanguages(): List<String> {

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

@@ -197,9 +197,7 @@
 				android:id="@+id/galleryblock_id"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_marginLeft="8dp"
+				android:layout_margin="8dp"
-				android:layout_marginTop="8dp"
-				android:layout_marginBottom="8dp"
 				app:layout_constraintTop_toBottomOf="@id/divider"
 				app:layout_constraintBottom_toBottomOf="parent"
 				app:layout_constraintLeft_toLeftOf="parent"/>

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

@@ -128,7 +128,7 @@
     <string name="settings_lock_fingerprint_prompt_subtitle">こうかはばつぐんだ!</string>
     <string name="default_query_dialog_filter_loli">登場人物を全て18歳以上にする</string>
     <string name="settings_user_id">ユーザーID</string>
-    <string name="settings_user_id_toast">ユーザーIDをクリップボードにコピーしました</string>
+    <string name="copied_to_clipboard">クリップボードにコピーしました</string>
     <string name="reader_fab_retry">リトライ</string>
     <string name="reader_fab_auto">まばたき検知スクロール</string>
     <string name="search_all">全てのギャラリーを対象に検索</string>
@@ -152,6 +152,7 @@
     <string name="error">エラー</string>
     <string name="settings_cache_limit">キャッシュサイズ制限</string>
     <string name="settings_cache_unlimited">制限なし</string>
-    <string name="settings_tag_language">タグ言語</string>
+    <string name="settings_tag_translation">タグ言語</string>
-    <string name="settings_tag_language_message">Githubにて翻訳に参加できます</string>
+    <string name="settings_tag_translation_message">Githubにて翻訳に参加できます</string>
+    <string name="settings_concurrent_download">並列ダウンロード</string>
 </resources>

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

@@ -128,7 +128,7 @@
     <string name="settings_lock_fingerprint_prompt_subtitle">힘세고 강한 지문 인식</string>
     <string name="default_query_dialog_filter_loli">판사님 저는 페도가 아닙니다</string>
     <string name="settings_user_id">유저 ID</string>
-    <string name="settings_user_id_toast">유저 ID를 클립보드에 복사했습니다</string>
+    <string name="copied_to_clipboard">클립보드에 복사됨</string>
     <string name="reader_fab_retry">재시도</string>
     <string name="reader_fab_auto">눈 깜빡임 감지 스크롤</string>
     <string name="search_all">모든 갤러리 검색</string>
@@ -152,6 +152,7 @@
     <string name="error">오류</string>
     <string name="settings_cache_limit">캐시 크기 제한</string>
     <string name="settings_cache_unlimited">무제한</string>
-    <string name="settings_tag_language">태그 언어</string>
+    <string name="settings_tag_translation">태그 언어</string>
-    <string name="settings_tag_language_message">Github에서 번역에 참여하세요</string>
+    <string name="settings_tag_translation_message">Github에서 번역에 참여하세요</string>
+    <string name="settings_concurrent_download">병렬 다운로드</string>
 </resources>

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

@@ -30,6 +30,8 @@
 
     <string name="ignore_update">Ignore</string>
 
+    <string name="copied_to_clipboard">Copied to clipboard</string>
+
     <string name="channel_download">Download</string>
     <string name="channel_download_description">Shows download status</string>
 
@@ -175,8 +177,9 @@
     <!-- SETTINGS/MISCELLANEOUS -->
 
     <string name="settings_miscellaneous_title">Miscellaneous</string>
-    <string name="settings_tag_language">Tag Language</string>
+    <string name="settings_tag_translation">Tag Language</string>
-    <string name="settings_tag_language_message">Participate in translation on Github</string>
+    <string name="settings_concurrent_download">Concurrent Download</string>
+    <string name="settings_tag_translation_message">Participate in translation on Github</string>
     <string name="settings_mirror_summary">Load images from mirrors</string>
     <string name="settings_proxy_title">Proxy</string>
     <string name="settings_rtl">Turn pages Right-to-Left</string>
@@ -186,7 +189,6 @@
     <string name="settings_dark_mode_summary">Protect yourself against light attacks!</string>
     <string name="settings_import_old_galleries">Import old galleries</string>
     <string name="settings_user_id">User ID</string>
-    <string name="settings_user_id_toast">User ID is copied to clipboard</string>
     <string name="settings_oss">Open Source Notice</string>
 
     <!-- MANAGE FAVORITES -->

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

@@ -76,9 +76,8 @@
         app:title="@string/settings_miscellaneous_title">
 
         <ListPreference
-            app:key="tag_language"
+            app:key="tag_translation"
-            app:title="@string/settings_tag_language"
+            app:title="@string/settings_tag_translation"
-            app:defaultValue="en"
             app:useSimpleSummaryProvider="true"/>
 
         <Preference