Fixed app crashing when deleting cache/download

# Conflicts:
#	app/build.gradle
#	app/release/app-release.apk
#	app/release/output-metadata.json

.idea/jarRepositories.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="http://guardian.github.com/maven/repo-releases" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://guardian.github.com/maven/repo-releases" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://s3.amazonaws.com/fabric-artifacts-private/internal-snapshots" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven4" />
+      <option name="name" value="maven4" />
+      <option name="url" value="https://maven.fabric.io/public" />
+    </remote-repository>
+  </component>
+</project>

app/build.gradle

@@ -20,7 +20,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 29
         versionCode 57
-        versionName "4.19-hotfix2"
+        versionName "4.20-hotfix1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true

app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "properties": [],
       "versionCode": 57,
-      "versionName": "4.19-hotfix2",
+      "versionName": "4.20-hotfix1",
       "enabled": true,
       "outputFile": "app-release.apk"
     }

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

@@ -21,7 +21,6 @@
 package xyz.quaver.pupil
 
 import android.util.Log
-import androidx.core.content.ContextCompat
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
@@ -36,6 +35,8 @@ import xyz.quaver.hiyobi.user_agent
 import xyz.quaver.pupil.ui.LockActivity
 import xyz.quaver.pupil.util.download.Cache
 import xyz.quaver.pupil.util.download.DownloadWorker
+import xyz.quaver.pupil.util.getDownloadDirectory
+import java.io.InputStreamReader
 import java.net.URL
 import javax.net.ssl.HttpsURLConnection
 
@@ -58,8 +59,10 @@ class ExampleInstrumentedTest {
         val activityTestRule = ActivityTestRule(LockActivity::class.java)
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
 
-        ContextCompat.getExternalFilesDirs(appContext, null).forEachIndexed { index, file ->
+        Runtime.getRuntime().exec("du -hs " + getDownloadDirectory(appContext)).let {
-            Log.i("PUPILD", "$index: ${file?.absolutePath}")
+            InputStreamReader(it.inputStream).readLines().forEach { res ->
+                Log.i("PUPILD", res)
+            }
         }
     }
 

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

@@ -98,6 +98,7 @@ class MainActivity : AppCompatActivity() {
                 setText(query, TextView.BufferType.EDITABLE)
         }
     }
+    private var queryStack = mutableListOf<String>()
 
     private var mode = Mode.SEARCH
     private var sortMode = SortMode.NEWEST
@@ -159,11 +160,12 @@ class MainActivity : AppCompatActivity() {
         initView()
     }
 
+    @OptIn(ExperimentalStdlibApi::class)
     override fun onBackPressed() {
         when {
             main_drawer_layout.isDrawerOpen(GravityCompat.START) -> main_drawer_layout.closeDrawer(GravityCompat.START)
-            query.isNotEmpty() -> runOnUiThread {
+            queryStack.removeLastOrNull() != null && queryStack.isNotEmpty() -> runOnUiThread {
-                query = ""
+                query = queryStack.last()
 
                 cancelFetch()
                 clearGalleries()
@@ -278,6 +280,7 @@ class MainActivity : AppCompatActivity() {
                         clearGalleries()
                         currentPage = 0
                         query = ""
+                        queryStack.clear()
                         mode = Mode.SEARCH
                         fetchGalleries(query, sortMode)
                         loadBlocks()
@@ -287,6 +290,7 @@ class MainActivity : AppCompatActivity() {
                         clearGalleries()
                         currentPage = 0
                         query = ""
+                        queryStack.clear()
                         mode = Mode.HISTORY
                         fetchGalleries(query, sortMode)
                         loadBlocks()
@@ -296,6 +300,7 @@ class MainActivity : AppCompatActivity() {
                         clearGalleries()
                         currentPage = 0
                         query = ""
+                        queryStack.clear()
                         mode = Mode.DOWNLOAD
                         fetchGalleries(query, sortMode)
                         loadBlocks()
@@ -305,6 +310,7 @@ class MainActivity : AppCompatActivity() {
                         clearGalleries()
                         currentPage = 0
                         query = ""
+                        queryStack.clear()
                         mode = Mode.FAVORITE
                         fetchGalleries(query, sortMode)
                         loadBlocks()
@@ -377,13 +383,24 @@ class MainActivity : AppCompatActivity() {
                     if (it?.isEmpty() == false) {
                         val galleryID = it.random()
 
-                        val intent = Intent(this@MainActivity, ReaderActivity::class.java).apply {
+                        GalleryDialog(
-                            putExtra("galleryID", galleryID)
+                            this@MainActivity,
+                            Glide.with(this@MainActivity),
+                            galleryID
+                        ).apply {
+                            onChipClickedHandler.add {
+                                runOnUiThread {
+                                    query = it.toQuery()
+                                    currentPage = 0
+
+                                    cancelFetch()
+                                    clearGalleries()
+                                    fetchGalleries(query, sortMode)
+                                    loadBlocks()
                                 }
-
+                                dismiss()
-                        startActivity(intent)
+                            }
-
+                        }.show()
-                        histories.add(galleryID)
                     }
                 }
             }
@@ -979,6 +996,11 @@ class MainActivity : AppCompatActivity() {
         val preference = PreferenceManager.getDefaultSharedPreferences(this)
         val defaultQuery = preference.getString("default_query", "")!!
 
+        if (query != queryStack.lastOrNull()) {
+            queryStack.remove(query)
+            queryStack.add(query)
+        }
+
         galleryIDs = null
 
         if (galleryIDs?.isActive == true)

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

@@ -33,6 +33,9 @@ import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import com.google.android.material.snackbar.Snackbar
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import net.rdrei.android.dirchooser.DirectoryChooserActivity
 import net.rdrei.android.dirchooser.DirectoryChooserConfig
 import xyz.quaver.pupil.Pupil
@@ -44,7 +47,9 @@ import xyz.quaver.pupil.ui.dialog.DownloadLocationDialog
 import xyz.quaver.pupil.ui.dialog.MirrorDialog
 import xyz.quaver.pupil.ui.dialog.ProxyDialog
 import xyz.quaver.pupil.util.*
+import java.io.BufferedReader
 import java.io.File
+import java.io.InputStreamReader
 
 
 class SettingsFragment :
@@ -74,9 +79,13 @@ class SettingsFragment :
     }
 
     private fun getDirSize(dir: File) : String {
-        val size = dir.walk().map { it.length() }.sum()
+        return getString(R.string.settings_storage_usage,
-
+            Runtime.getRuntime().exec("du -hs " + dir.absolutePath).let {
-        return getString(R.string.settings_clear_summary, byteToString(size))
+                BufferedReader(InputStreamReader(it.inputStream)).use { reader ->
+                    reader.readLine()?.split('\t')?.firstOrNull() ?: "0"
+                }
+            }
+        )
     }
 
     override fun onPreferenceClick(preference: Preference?): Boolean {
@@ -97,7 +106,15 @@ class SettingsFragment :
                             if (dir.exists())
                                 dir.deleteRecursively()
 
-                            summary = getDirSize(dir)
+                            summary = getString(R.string.settings_storage_usage_loading)
+
+                            CoroutineScope(Dispatchers.IO).launch {
+                                getDirSize(dir).let {
+                                    launch(Dispatchers.Main) {
+                                        this@with.summary = getDirSize(dir)
+                                    }
+                                }
+                            }
                         }
                         setNegativeButton(android.R.string.no) { _, _ -> }
                     }.show()
@@ -112,7 +129,15 @@ class SettingsFragment :
                             if (dir.exists())
                                 dir.deleteRecursively()
 
-                            summary = getDirSize(dir)
+                            summary = getString(R.string.settings_storage_usage_loading)
+
+                            CoroutineScope(Dispatchers.IO).launch {
+                                getDirSize(dir).let {
+                                    launch(Dispatchers.Main) {
+                                        this@with.summary = getDirSize(dir)
+                                    }
+                                }
+                            }
                         }
                         setNegativeButton(android.R.string.no) { _, _ -> }
                     }.show()
@@ -276,13 +301,27 @@ class SettingsFragment :
                         }
                         "delete_cache" -> {
                             val dir = File(requireContext().cacheDir, "imageCache")
-                            summary = getDirSize(dir)
+
+                            CoroutineScope(Dispatchers.IO).launch {
+                                summary = getString(R.string.settings_storage_usage_loading)
+
+                                launch(Dispatchers.Main) {
+                                    this@with.summary = getDirSize(dir)
+                                }
+                            }
 
                             onPreferenceClickListener = this@SettingsFragment
                         }
                         "delete_downloads" -> {
                             val dir = getDownloadDirectory(requireContext())
-                            summary = getDirSize(dir)
+
+                            CoroutineScope(Dispatchers.IO).launch {
+                                summary = getString(R.string.settings_storage_usage_loading)
+
+                                launch(Dispatchers.Main) {
+                                    this@with.summary = getDirSize(dir)
+                                }
+                            }
 
                             onPreferenceClickListener = this@SettingsFragment
                         }

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

@@ -9,7 +9,8 @@
     <string name="search_hint_with_page">ギャラリー検索</string>
     <string name="settings_clear_cache">キャッシュクリア</string>
     <string name="settings_clear_cache_alert_message">キャッシュをクリアするとイメージのロード速度に影響を与えます。実行しますか？</string>
-    <string name="settings_clear_summary">サイズ: %s</string>
+    <string name="settings_storage_usage">%s使用中</string>
+    <string name="settings_storage_usage_loading">ストレージ使用量読み込み中…</string>
     <string name="settings_default_query">デフォルトキーワード</string>
     <string name="settings_galleries_per_page">一回にロードするギャラリー数</string>
     <string name="settings_search_title">検索設定</string>

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

@@ -8,7 +8,8 @@
     <string name="settings_default_query">기본 검색어</string>
     <string name="settings_clear_cache">캐시 정리하기</string>
     <string name="settings_clear_cache_alert_message">캐시를 정리하면 이미지 로딩속도가 느려질 수 있습니다. 계속하시겠습니까?</string>
-    <string name="settings_clear_summary">사용량: %s</string>
+    <string name="settings_storage_usage">%s 사용중</string>
+    <string name="settings_storage_usage_loading">저장공간 사용량 계산 중…</string>
     <string name="settings_galleries_per_page">한 번에 로드할 갤러리 수</string>
     <string name="settings_search_title">검색 설정</string>
     <string name="settings_title">설정</string>

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

@@ -142,9 +142,10 @@
     <!-- SETTINGS/STORAGE -->
 
     <string name="settings_storage">Storage</string>
+    <string name="settings_storage_usage">Currently using %s</string>
+    <string name="settings_storage_usage_loading">Calculating storage usage…</string>
     <string name="settings_clear_cache">Clear cache</string>
     <string name="settings_clear_cache_alert_message">Deleting cache can affect image loading speed. Do you want to continue?</string>
-    <string name="settings_clear_summary">Currently using %s</string>
     <string name="settings_clear_downloads">Clear downloads</string>
     <string name="settings_clear_downloads_alert_message">Delete all downloaded galleries.\nDo you want to continue?</string>
     <string name="settings_clear_history">Clear history</string>