mirror of
https://github.com/CherretGit/zaprett-app.git
synced 2025-12-13 15:09:38 +05:00
fix list repo crash
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
package com.cherret.zaprett.data
|
package com.cherret.zaprett.data
|
||||||
|
|
||||||
enum class ItemType {
|
enum class ItemType {
|
||||||
byedpi, nfqws, list, lists_exclude
|
byedpi, nfqws, list, list_exclude
|
||||||
}
|
}
|
||||||
@@ -49,7 +49,7 @@ abstract class BaseRepoViewModel(application: Application) : AndroidViewModel(ap
|
|||||||
val filteredList = safeList.filter { item ->
|
val filteredList = safeList.filter { item ->
|
||||||
when (item.type) {
|
when (item.type) {
|
||||||
ItemType.list -> listType == "whitelist"
|
ItemType.list -> listType == "whitelist"
|
||||||
ItemType.lists_exclude -> listType == "blacklist"
|
ItemType.list_exclude -> listType == "blacklist"
|
||||||
ItemType.nfqws -> useModule
|
ItemType.nfqws -> useModule
|
||||||
ItemType.byedpi -> !useModule
|
ItemType.byedpi -> !useModule
|
||||||
}
|
}
|
||||||
@@ -79,7 +79,7 @@ abstract class BaseRepoViewModel(application: Application) : AndroidViewModel(ap
|
|||||||
ItemType.byedpi -> File(getZaprettPath(), "strategies/byedpi")
|
ItemType.byedpi -> File(getZaprettPath(), "strategies/byedpi")
|
||||||
ItemType.nfqws -> File(getZaprettPath(), "strategies/nfqws")
|
ItemType.nfqws -> File(getZaprettPath(), "strategies/nfqws")
|
||||||
ItemType.list -> File(getZaprettPath(), "lists/include")
|
ItemType.list -> File(getZaprettPath(), "lists/include")
|
||||||
ItemType.lists_exclude -> File(getZaprettPath(), "lists/exclude")
|
ItemType.list_exclude -> File(getZaprettPath(), "lists/exclude")
|
||||||
}
|
}
|
||||||
val targetFile = File(targetDir, uri.lastPathSegment!!)
|
val targetFile = File(targetDir, uri.lastPathSegment!!)
|
||||||
sourceFile.copyTo(targetFile, overwrite = true)
|
sourceFile.copyTo(targetFile, overwrite = true)
|
||||||
@@ -100,7 +100,7 @@ abstract class BaseRepoViewModel(application: Application) : AndroidViewModel(ap
|
|||||||
ItemType.byedpi -> File(getZaprettPath(), "strategies/byedpi")
|
ItemType.byedpi -> File(getZaprettPath(), "strategies/byedpi")
|
||||||
ItemType.nfqws -> File(getZaprettPath(), "strategies/nfqws")
|
ItemType.nfqws -> File(getZaprettPath(), "strategies/nfqws")
|
||||||
ItemType.list -> File(getZaprettPath(), "lists/include")
|
ItemType.list -> File(getZaprettPath(), "lists/include")
|
||||||
ItemType.lists_exclude -> File(getZaprettPath(), "lists/exclude")
|
ItemType.list_exclude -> File(getZaprettPath(), "lists/exclude")
|
||||||
}
|
}
|
||||||
val targetFile = File(targetDir, uri.lastPathSegment!!)
|
val targetFile = File(targetDir, uri.lastPathSegment!!)
|
||||||
sourceFile.copyTo(targetFile, overwrite = true)
|
sourceFile.copyTo(targetFile, overwrite = true)
|
||||||
|
|||||||
Reference in New Issue
Block a user