lzw-723/ClashMetaForAndroid
1
0
Fork 0
mirror of https://github.com/MetaCubeX/ClashMetaForAndroid.git synced 2026-05-09 18:11:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix uri case

Browse Source
This commit is contained in:
Kr328
2020-02-27 16:03:28 +08:00
parent 126291d544
commit 2ae75e876d
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/github/kr328/clash/ProfileEditActivity.kt
View File

@@ -149,7 +149,10 @@ class ProfileEditActivity : BaseActivity() {
}
if (url == null || url == Uri.EMPTY ||
(url.scheme != "http" && url.scheme != "https" && url.scheme != "content")
(!url.scheme.equals("http", ignoreCase = true)
&& !url.scheme.equals("https", ignoreCase = true)
&& !url.scheme.equals("content", ignoreCase = true)
&& !url.scheme.equals("file", ignoreCase = true))
) {
Snackbar.make(rootView, R.string.invalid_url, Snackbar.LENGTH_LONG).show()
return@setOnClickListener

3
service/src/main/java/com/github/kr328/clash/service/ProfileProcessor.kt
View File

@@ -64,7 +64,8 @@ class ProfileProcessor(private val context: Context) {
target.parentFile?.mkdirs()
baseDir.mkdirs()
if (source.scheme == "content" || source.scheme == "file") {
if (source.scheme.equals("content", ignoreCase = true)
|| source.scheme.equals("file", ignoreCase = true)) {
val parcelFileDescriptor = context.contentResolver.openFileDescriptor(source, "r")
?: throw FileNotFoundException("Unable to open file $source")

2
service/src/main/java/com/github/kr328/clash/service/ProfileService.kt
View File

@@ -186,7 +186,7 @@ class ProfileService : BaseService() {
ClashProfileEntity(
requireNotNull(request.name),
requireNotNull(request.type),
requireNotNull(request.url).toString().toLowerCase(Locale.getDefault()),
requireNotNull(request.url).toString(),
request.source?.toString(),
false,
0,