Skip to content

Support storage ID formats for NTFS and ChromeOS #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlecJY wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support storage ID formats for NTFS and ChromeOS #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion storage/src/main/java/com/anggrayudi/storage/extension/TextExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fun String.parent(): String {
}
val parentPath = folderTree.take(folderTree.size - 1).joinToString("/", "/")
return if (parentPath.startsWith(SimpleStorage.externalStoragePath)
|| parentPath.matches(Regex("/storage/[A-Z0-9]{4}-[A-Z0-9]{4}(.*?)"))
|| parentPath.matches(Regex("/storage/[A-Z0-9-]+(.*?)"))
|| Build.VERSION.SDK_INT < 21 && parentPath.startsWith(SimpleStorage.KITKAT_SD_CARD_PATH)
) {
parentPath
Expand Down
2 changes: 1 addition & 1 deletion storage/src/main/java/com/anggrayudi/storage/file/DocumentFileCompat.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ object DocumentFileCompat {
val FILE_NAME_DUPLICATION_REGEX_WITHOUT_EXTENSION = Regex("(.*?) \\(\\d+\\)")

@RestrictTo(RestrictTo.Scope.LIBRARY)
val SD_CARD_STORAGE_ID_REGEX = Regex("[A-Z0-9]{4}-[A-Z0-9]{4}")
val SD_CARD_STORAGE_ID_REGEX = Regex("[A-Z0-9-]+")

@RestrictTo(RestrictTo.Scope.LIBRARY)
val SD_CARD_STORAGE_PATH_REGEX = Regex("/storage/$SD_CARD_STORAGE_ID_REGEX(.*?)")
Expand Down