SagerNet/sing-box-for-android
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box-for-android.git synced 2025-04-04 20:37:40 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix profile path

Browse source
This commit is contained in:
世界 2023-11-07 22:16:15 +08:00
parent 273ddc7266
commit fb705ed8a4
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/io/nekohasekai/sfa/database/Profile.kt
View file

@ -49,9 +49,12 @@ class Profile(
@Query("DELETE FROM profiles") @Query("DELETE FROM profiles")
fun clear() fun clear()
@Query("SELECT MAX(userOrder) + 1 FROM profiles") @Query("SELECT MAX(userOrder) + 1 FROM profiles")
fun nextOrder(): Long? fun nextOrder(): Long?
@Query("SELECT MAX(id) + 1 FROM profiles")
fun nextFileID(): Long?
} }
} }

5
app/src/main/java/io/nekohasekai/sfa/database/ProfileManager.kt
View file

@ -37,6 +37,11 @@ object ProfileManager {
return instance.profileDao().nextOrder() ?: 0 return instance.profileDao().nextOrder() ?: 0
} }
suspend fun nextFileID(): Long {
return instance.profileDao().nextFileID() ?: 1
}
suspend fun get(id: Long): Profile? { suspend fun get(id: Long): Profile? {
return instance.profileDao().get(id) return instance.profileDao().get(id)
} }

12
app/src/main/java/io/nekohasekai/sfa/ui/profile/NewProfileActivity.kt
View file

@ -142,12 +142,15 @@ class NewProfileActivity : AbstractActivity() {
val typedProfile = TypedProfile() val typedProfile = TypedProfile()
val profile = Profile(name = binding.name.text, typed = typedProfile) val profile = Profile(name = binding.name.text, typed = typedProfile)
profile.userOrder = ProfileManager.nextOrder() profile.userOrder = ProfileManager.nextOrder()
val fileID = ProfileManager.nextFileID()
val configDirectory = File(filesDir, "configs").also { it.mkdirs() }
val configFile = File(configDirectory, "$fileID.json")
typedProfile.path = configFile.path
when (binding.type.text) { when (binding.type.text) {
TypedProfile.Type.Local.name -> { TypedProfile.Type.Local.name -> {
typedProfile.type = TypedProfile.Type.Local typedProfile.type = TypedProfile.Type.Local
val configDirectory = File(filesDir, "configs").also { it.mkdirs() }
val configFile = File(configDirectory, "${profile.userOrder}.json")
when (binding.fileSourceMenu.text) { when (binding.fileSourceMenu.text) {
FileSource.CreateNew.formatted -> { FileSource.CreateNew.formatted -> {
configFile.writeText("{}") configFile.writeText("{}")
@ -166,23 +169,18 @@ class NewProfileActivity : AbstractActivity() {
} else { } else {
error("unsupported source: $sourceURL") error("unsupported source: $sourceURL")
} }
Libbox.checkConfig(content) Libbox.checkConfig(content)
configFile.writeText(content) configFile.writeText(content)
} }
} }
typedProfile.path = configFile.path
} }
TypedProfile.Type.Remote.name -> { TypedProfile.Type.Remote.name -> {
typedProfile.type = TypedProfile.Type.Remote typedProfile.type = TypedProfile.Type.Remote
val configDirectory = File(filesDir, "configs").also { it.mkdirs() }
val configFile = File(configDirectory, "${profile.userOrder}.json")
val remoteURL = binding.remoteURL.text val remoteURL = binding.remoteURL.text
val content = HTTPClient().use { it.getString(remoteURL) } val content = HTTPClient().use { it.getString(remoteURL) }
Libbox.checkConfig(content) Libbox.checkConfig(content)
configFile.writeText(content) configFile.writeText(content)
typedProfile.path = configFile.path
typedProfile.remoteURL = remoteURL typedProfile.remoteURL = remoteURL
typedProfile.lastUpdated = Date() typedProfile.lastUpdated = Date()
typedProfile.autoUpdate = EnabledType.valueOf(binding.autoUpdate.text).boolValue typedProfile.autoUpdate = EnabledType.valueOf(binding.autoUpdate.text).boolValue