yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Avoid crashing if invalid download and backup location is set

Browse Source 
Fixes #8252
This commit is contained in:
arkon 2022-10-20 22:34:27 -04:00
parent 824d5e22bc
commit a8ca7b690f
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt
View File

@ -205,7 +205,7 @@ class AboutScreen : Screen {
BuildConfig.DEBUG -> { BuildConfig.DEBUG -> {
"Debug ${BuildConfig.COMMIT_SHA}".let { "Debug ${BuildConfig.COMMIT_SHA}".let {
if (withBuildDate) { if (withBuildDate) {
"$it (${getFormattedBuildTime()}" "$it (${getFormattedBuildTime()})"
} else { } else {
it it
} }

6
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt
View File

@ -380,8 +380,10 @@ class SettingsBackupScreen : SearchableSettings {
Preference.PreferenceItem.TextPreference( Preference.PreferenceItem.TextPreference(
title = stringResource(R.string.pref_backup_directory), title = stringResource(R.string.pref_backup_directory),
subtitle = remember(backupDir) { subtitle = remember(backupDir) {
UniFile.fromUri(context, backupDir.toUri()).filePath!! + "/automatic" (UniFile.fromUri(context, backupDir.toUri())?.filePath)?.let {
}, "$it/automatic"
}
} ?: stringResource(R.string.invalid_location, backupDir),
onClick = { onClick = {
try { try {
pickBackupLocation.launch(null) pickBackupLocation.launch(null)

4
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDownloadScreen.kt
View File

@ -102,8 +102,8 @@ class SettingsDownloadScreen : SearchableSettings {
pref = currentDirPref, pref = currentDirPref,
title = stringResource(R.string.pref_download_directory), title = stringResource(R.string.pref_download_directory),
subtitle = remember(currentDir) { subtitle = remember(currentDir) {
UniFile.fromUri(context, currentDir.toUri()).filePath!! UniFile.fromUri(context, currentDir.toUri())?.filePath
}, } ?: stringResource(R.string.invalid_location, currentDir),
entries = mapOf( entries = mapOf(
defaultDirPair, defaultDirPair,
customDirEntryKey to stringResource(R.string.custom_dir), customDirEntryKey to stringResource(R.string.custom_dir),

2
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt
View File

@ -57,7 +57,7 @@ class DownloadProvider(private val context: Context) {
.createDirectory(getMangaDirName(mangaTitle)) .createDirectory(getMangaDirName(mangaTitle))
} catch (e: Throwable) { } catch (e: Throwable) {
logcat(LogPriority.ERROR, e) { "Invalid download directory" } logcat(LogPriority.ERROR, e) { "Invalid download directory" }
throw Exception(context.getString(R.string.invalid_download_dir)) throw Exception(context.getString(R.string.invalid_location, downloadsDir))
} }
} }

2
i18n/src/main/res/values/strings.xml
View File

@ -422,6 +422,7 @@
<string name="pref_remove_bookmarked_chapters">Allow deleting bookmarked chapters</string> <string name="pref_remove_bookmarked_chapters">Allow deleting bookmarked chapters</string>
<string name="pref_remove_exclude_categories">Excluded categories</string> <string name="pref_remove_exclude_categories">Excluded categories</string>
<string name="custom_dir">Custom location</string> <string name="custom_dir">Custom location</string>
<string name="invalid_location">Invalid location: %s</string>
<string name="disabled">Disabled</string> <string name="disabled">Disabled</string>
<string name="last_read_chapter">Last read chapter</string> <string name="last_read_chapter">Last read chapter</string>
<string name="second_to_last">Second to last read chapter</string> <string name="second_to_last">Second to last read chapter</string>
@ -658,7 +659,6 @@
<string name="error_saving_cover">Error saving cover</string> <string name="error_saving_cover">Error saving cover</string>
<string name="error_sharing_cover">Error sharing cover</string> <string name="error_sharing_cover">Error sharing cover</string>
<string name="confirm_delete_chapters">Are you sure you want to delete the selected chapters?</string> <string name="confirm_delete_chapters">Are you sure you want to delete the selected chapters?</string>
<string name="invalid_download_dir">Invalid download location</string>
<string name="chapter_settings">Chapter settings</string> <string name="chapter_settings">Chapter settings</string>
<string name="confirm_set_chapter_settings">Are you sure you want to save these settings as default?</string> <string name="confirm_set_chapter_settings">Are you sure you want to save these settings as default?</string>
<string name="also_set_chapter_settings_for_library">Also apply to all manga in my library</string> <string name="also_set_chapter_settings_for_library">Also apply to all manga in my library</string>