nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Moves Regex compilation to outside the state class.

Browse Source
This commit is contained in:
Vitor Pamplona
2023-08-12 21:31:10 -04:00
parent 3be34d0d40
commit a293800897
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt
+3 -2
View File
@@ -24,6 +24,8 @@ import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import java.util.regex.Pattern import java.util.regex.Pattern
val EMAIL_PATTERN = Pattern.compile(".+@.+\\.[a-z]+")
@Stable @Stable
class AccountStateViewModel(val context: Context) : ViewModel() { class AccountStateViewModel(val context: Context) : ViewModel() {
private val _accountContent = MutableStateFlow<AccountState>(AccountState.LoggedOff) private val _accountContent = MutableStateFlow<AccountState>(AccountState.LoggedOff)
@@ -46,7 +48,6 @@ class AccountStateViewModel(val context: Context) : ViewModel() {
} }
fun startUI(key: String, useProxy: Boolean, proxyPort: Int) { fun startUI(key: String, useProxy: Boolean, proxyPort: Int) {
val pattern = Pattern.compile(".+@.+\\.[a-z]+")
val parsed = Nip19.uriToRoute(key) val parsed = Nip19.uriToRoute(key)
val pubKeyParsed = parsed?.hex?.hexToByteArray() val pubKeyParsed = parsed?.hex?.hexToByteArray()
val proxy = HttpClient.initProxy(useProxy, "127.0.0.1", proxyPort) val proxy = HttpClient.initProxy(useProxy, "127.0.0.1", proxyPort)
@@ -56,7 +57,7 @@ class AccountStateViewModel(val context: Context) : ViewModel() {
Account(KeyPair(privKey = key.bechToBytes()), proxy = proxy, proxyPort = proxyPort) Account(KeyPair(privKey = key.bechToBytes()), proxy = proxy, proxyPort = proxyPort)
} else if (pubKeyParsed != null) { } else if (pubKeyParsed != null) {
Account(KeyPair(pubKey = pubKeyParsed), proxy = proxy, proxyPort = proxyPort) Account(KeyPair(pubKey = pubKeyParsed), proxy = proxy, proxyPort = proxyPort)
} else if (pattern.matcher(key).matches()) { } else if (EMAIL_PATTERN.matcher(key).matches()) {
// Evaluate NIP-5 // Evaluate NIP-5
Account(KeyPair(), proxy = proxy, proxyPort = proxyPort) Account(KeyPair(), proxy = proxy, proxyPort = proxyPort)
} else { } else {