From 6fbb644e4be47a7be8c56d430ec9a5d24edc0019 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Sat, 4 Jan 2020 13:16:39 +0900
Subject: [PATCH] Added download directory entry on preferences Changed
 download folder

---
 .../xyz/quaver/pupil/ui/SettingsActivity.kt   | 11 +++++++++++
 .../main/java/xyz/quaver/pupil/util/file.kt   | 12 +++++-------
 app/src/main/res/values-ja/strings.xml        |  1 +
 app/src/main/res/values-ko/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           | 19 +++++++++++++++++++
 app/src/main/res/xml/root_preferences.xml     |  6 +++++-
 6 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
index 60f9a724..229a5836 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
@@ -208,6 +208,17 @@ class SettingsActivity : AppCompatActivity() {
                 }
             }
 
+            with(findPreference<Preference>("dl_location")) {
+                this!!
+
+                summary = getDownloadDirectory(context).absolutePath
+
+                onPreferenceClickListener = Preference.OnPreferenceClickListener {
+
+                    true
+                }
+            }
+
             with(findPreference<Preference>("default_query")) {
                 this!!
 
diff --git a/app/src/main/java/xyz/quaver/pupil/util/file.kt b/app/src/main/java/xyz/quaver/pupil/util/file.kt
index 84342718..746687db 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/file.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/file.kt
@@ -19,8 +19,8 @@
 package xyz.quaver.pupil.util
 
 import android.content.Context
-import android.os.Build
-import android.os.Environment
+import androidx.core.content.ContextCompat
+import androidx.preference.PreferenceManager
 import java.io.File
 
 fun getCachedGallery(context: Context, galleryID: Int): File {
@@ -32,10 +32,8 @@ fun getCachedGallery(context: Context, galleryID: Int): File {
     }
 }
 
-@Suppress("DEPRECATION")
 fun getDownloadDirectory(context: Context): File {
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
-        context.getExternalFilesDir("Pupil")!!
-    else
-        File(Environment.getExternalStorageDirectory(), "Pupil")
+    val dlLocation = PreferenceManager.getDefaultSharedPreferences(context).getInt("dl_location", 0)
+
+    return ContextCompat.getExternalFilesDirs(context, null)[dlLocation]
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 3614852e..f161508d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -110,4 +110,5 @@
     <string name="settings_backup_checkout">確認</string>
     <string name="settings_restore_failed">復元に失敗しました</string>
     <string name="settings_restore_successful">%1$d項目を復元しました</string>
+    <string name="settings_dl_location">ダウンロード場所</string>
 </resources>
\ 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 e93e36cf..03d91747 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -110,4 +110,5 @@
     <string name="settings_backup_checkout">확인</string>
     <string name="settings_restore_failed">복원에 실패했습니다</string>
     <string name="settings_restore_successful">%1$d개 항목을 복원했습니다</string>
+    <string name="settings_dl_location">다운로드 위치</string>
 </resources>
\ 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 5f695d13..47d7b3b6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -96,6 +96,8 @@
     <string name="galleryblock_type">Type: %1$s</string>
     <string name="galleryblock_language">Language: %1$s</string>
 
+    <!-- READER -->
+
     <string name="reader_loading">Loading</string>
     <string name="reader_go_to_page">Go to page</string>
     <string name="reader_fab_fullscreen">Fullscreen</string>
@@ -107,11 +109,17 @@
 
     <string name="reader_help">Help</string>
 
+    <!-- SETTINGS -->
+
     <string name="settings_title">Settings</string>
+
     <string name="settings_app_version_title">App version</string>
     <string name="settings_search_title">Search Settings</string>
     <string name="settings_galleries_per_page">Galleries per page</string>
     <string name="settings_default_query">Default query</string>
+
+    <!-- SETTINGS/STORAGE -->
+
     <string name="settings_storage">Storage</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>
@@ -121,8 +129,15 @@
     <string name="settings_clear_history">Clear history</string>
     <string name="settings_clear_history_alert_message">Do you want to clear histories?</string>
     <string name="settings_clear_history_summary">%1$d histories saved</string>
+    <string name="settings_dl_location">Download directory</string>
+
+    <!-- SETTINGS/APP LOCK -->
+
     <string name="settings_app_lock">App lock</string>
     <string name="settings_app_lock_type">App lock type</string>
+
+    <!-- SETTINGS/MISCELLANEOUS -->
+
     <string name="settings_miscellaneous_title">Miscellaneous</string>
     <string name="settings_use_hiyobi_title">Use hiyobi.me</string>
     <string name="settings_use_hiyobi_summary">Load images from hiyobi.me to improve loading speed (if available)</string>
@@ -139,6 +154,8 @@
     <string name="settings_restore_failed">Restore failed</string>
     <string name="settings_restore_successful">%1$d entries restored</string>
 
+    <!-- SETTINGS/APP LOCK ACTIVITY -->
+
     <string name="settings_lock_none">None</string>
     <string name="settings_lock_pattern">Pattern</string>
     <string name="settings_lock_pin" translatable="false">PIN</string>
@@ -150,6 +167,8 @@
     <string name="settings_lock_remove_message">Do you want to remove lock?</string>
     <string name="settings_lock_wrong_confirm">Lock is different from last one. Please try again.</string>
 
+    <!-- SETTINGS/DEFAULT QUERY DIALOG -->
+
     <string name="default_query_dialog_title">Set default query</string>
     <string name="default_query_dialog_language">Language: </string>
     <string name="default_query_dialog_filter_BL">Filter BL</string>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 244a015f..5730bbfa 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -20,7 +20,7 @@
         <Preference
             app:key="default_query"
             app:title="@string/settings_default_query"
-            app:useSimpleSummaryProvider="true"/>
+            app:useSimpleSummaryPrKovider="true"/>
 
     </PreferenceCategory>
 
@@ -39,6 +39,10 @@
             app:title="@string/settings_clear_history"
             app:key="clear_history"/>
 
+        <Preference
+            app:title="@string/settings_dl_location"
+            app:key="dl_location"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory