mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-07 11:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a crash when trying to change the downloads directory on some devices

Browse Source
This commit is contained in:
len 2016-05-12 16:45:35 +02:00
parent 88e64c878b
commit 43fafbc747
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadsFragment.kt
View File

@ -40,13 +40,13 @@ class SettingsDownloadsFragment : SettingsNestedFragment() {
downloadDirPref.setOnPreferenceClickListener { downloadDirPref.setOnPreferenceClickListener {
val currentDir = preferences.downloadsDirectory().getOrDefault() val currentDir = preferences.downloadsDirectory().getOrDefault()
val externalDirs = getExternalFilesDirs() val externalDirs = getExternalFilesDirs() + getString(R.string.custom_dir)
val selectedIndex = externalDirs.indexOf(File(currentDir)) val selectedIndex = externalDirs.indexOf(File(currentDir))
MaterialDialog.Builder(activity) MaterialDialog.Builder(activity)
.items(externalDirs + getString(R.string.custom_dir)) .items(externalDirs)
.itemsCallbackSingleChoice(selectedIndex, { dialog, view, which, text -> .itemsCallbackSingleChoice(selectedIndex, { dialog, view, which, text ->
if (which == externalDirs.size) { if (which == externalDirs.lastIndex) {
// Custom dir selected, open directory selector // Custom dir selected, open directory selector
val i = Intent(activity, CustomLayoutPickerActivity::class.java) val i = Intent(activity, CustomLayoutPickerActivity::class.java)
i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false) i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false)
@ -80,7 +80,8 @@ class SettingsDownloadsFragment : SettingsNestedFragment() {
File.separator + getString(R.string.app_name) + File.separator + getString(R.string.app_name) +
File.separator + "downloads" File.separator + "downloads"
return mutableListOf(File(defaultDir)) + ContextCompat.getExternalFilesDirs(activity, "") return mutableListOf(File(defaultDir)) +
ContextCompat.getExternalFilesDirs(activity, "").filterNotNull()
} }
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {