mirrors/NewPipe
1
0 Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2026-10-24 08:22:33 +00:00
Code Issues Releases Wiki Activity

code refactor

Browse Source
This commit is contained in:
Ida Delphine authored and Aayush Gupta committed 2026-10-20 16:21:56 +08:00
1 parent acc9a39bb1
commit 9c398043ec
2 files changed
+54 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

shared/src/androidMain/kotlin/net/newpipe/app/platform/AndroidDownloadStorageActions.kt
+9 -5
View File
@@ -65,10 +65,13 @@ class AndroidDownloadStorageActions(context: Context) : DownloadStorageActions {
val bridge = host
currentOnResult(
when {
folder == null || bridge == null ->
folder == null || bridge == null -> {
FolderPickResult.Failed(DownloadFolderError.INVALID_DIRECTORY)
}
else -> bridge.acquireFolder(folder)
else -> {
bridge.acquireFolder(folder)
}
}
)
}
@@ -93,9 +96,10 @@ class AndroidDownloadStorageActions(context: Context) : DownloadStorageActions {
}
}
private fun newPipeFolderIn(directoryName: String): String = File(File(Environment.getExternalStorageDirectory(), directoryName), NEWPIPE_FOLDER)
.toURI()
.toString()
private fun newPipeFolderIn(directoryName: String): String {
val directory = File(Environment.getExternalStorageDirectory(), directoryName)
return File(directory, NEWPIPE_FOLDER).toURI().toString()
}
private fun loadHost(context: Context): DownloadStorageHost? = runCatching {
Class.forName(HOST_CLASS)
shared/src/commonMain/kotlin/net/newpipe/app/screen/settings/DownloadSettingsScreen.kt
+45 -21
View File
@@ -197,16 +197,22 @@ fun DownloadSettingsScreenContent(
}
val storageAskSummary = when {
storageAccessFrameworkConfigurable ->
storageAccessFrameworkConfigurable -> {
stringResource(Res.string.downloads_storage_ask_summary)
}
else -> stringResource(Res.string.downloads_storage_ask_summary_no_saf_notice)
else -> {
stringResource(Res.string.downloads_storage_ask_summary_no_saf_notice)
}
}
val useStorageAccessFrameworkSummary = when {
storageAccessFrameworkConfigurable ->
storageAccessFrameworkConfigurable -> {
stringResource(Res.string.downloads_storage_use_saf_summary)
}
else -> stringResource(Res.string.downloads_storage_use_saf_summary_api_29)
else -> {
stringResource(Res.string.downloads_storage_use_saf_summary_api_29)
}
}
Scaffold(
@@ -312,28 +318,46 @@ private fun DownloadFolderErrorDialog(
val safTitle = stringResource(Res.string.downloads_storage_use_saf_title)
val title = when (error) {
DownloadFolderError.NO_FILE_MANAGER -> stringResource(Res.string.no_app_to_open_intent)
DownloadFolderError.EXTERNAL_STORAGE_UNAVAILABLE ->
stringResource(Res.string.download_to_sdcard_error_title)
DownloadFolderError.INVALID_DIRECTORY,
DownloadFolderError.NOT_WRITABLE -> stringResource(Res.string.general_error)
}
val message = when (error) {
DownloadFolderError.NO_FILE_MANAGER -> when {
storageAccessFrameworkConfigurable ->
stringResource(Res.string.no_appropriate_file_manager_message, safTitle)
else -> stringResource(Res.string.no_appropriate_file_manager_message_android_10)
DownloadFolderError.NO_FILE_MANAGER -> {
stringResource(Res.string.no_app_to_open_intent)
}
DownloadFolderError.INVALID_DIRECTORY -> stringResource(Res.string.invalid_directory)
DownloadFolderError.EXTERNAL_STORAGE_UNAVAILABLE -> {
stringResource(Res.string.download_to_sdcard_error_title)
}
DownloadFolderError.NOT_WRITABLE -> stringResource(Res.string.no_available_dir)
DownloadFolderError.INVALID_DIRECTORY,
DownloadFolderError.NOT_WRITABLE -> {
stringResource(Res.string.general_error)
}
}
DownloadFolderError.EXTERNAL_STORAGE_UNAVAILABLE ->
// Only Android 9 and below can be told to turn SAF off
val fileManagerMessage = when {
storageAccessFrameworkConfigurable -> {
stringResource(Res.string.no_appropriate_file_manager_message, safTitle)
}
else -> {
stringResource(Res.string.no_appropriate_file_manager_message_android_10)
}
}
val message = when (error) {
DownloadFolderError.NO_FILE_MANAGER -> {
fileManagerMessage
}
DownloadFolderError.INVALID_DIRECTORY -> {
stringResource(Res.string.invalid_directory)
}
DownloadFolderError.NOT_WRITABLE -> {
stringResource(Res.string.no_available_dir)
}
DownloadFolderError.EXTERNAL_STORAGE_UNAVAILABLE -> {
stringResource(Res.string.download_to_sdcard_error_message)
}
}
AlertDialog(