centralcloud/oncall-mobile-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash

Browse source
This commit is contained in:
Philipp Heckel 2026-01-04 08:20:52 -05:00
parent 19ff047cdb
commit c8e9b8de0b
1 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/src/main/java/io/heckel/ntfy/ui/UserFragment.kt
View file

@ -17,6 +17,10 @@ import io.heckel.ntfy.db.Repository
import io.heckel.ntfy.db.User
import io.heckel.ntfy.util.AfterChangedTextWatcher
import io.heckel.ntfy.util.validUrl
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
class UserFragment : DialogFragment() {
private var user: User? = null
@ -185,27 +189,33 @@ class UserFragment : DialogFragment() {
baseUrlViewLayout.error = null
if (user == null) {
// Check if Authorization header already exists in custom headers
val hasAuthorizationHeader = if (this::repository.isInitialized && validUrl(baseUrl)) {
repository.getCustomHeadersSync(baseUrl)
.any { it.name.equals("Authorization", ignoreCase = true) }
} else {
false
CoroutineScope(Dispatchers.Main).launch {
val hasAuthorizationHeader = hasAuthorizationHeader(baseUrl)
if (hasAuthorizationHeader) {
baseUrlViewLayout.error = getString(R.string.user_dialog_base_url_error_authorization_header_exists)
}
saveMenuItem.isEnabled = validUrl(baseUrl)
&& !baseUrlsInUse.contains(baseUrl)
&& !hasAuthorizationHeader
&& username.isNotEmpty() && password.isNotEmpty()
}
if (hasAuthorizationHeader) {
baseUrlViewLayout.error = getString(R.string.user_dialog_base_url_error_authorization_header_exists)
}
saveMenuItem.isEnabled = validUrl(baseUrl)
&& !baseUrlsInUse.contains(baseUrl)
&& !hasAuthorizationHeader
&& username.isNotEmpty() && password.isNotEmpty()
} else {
saveMenuItem.isEnabled = username.isNotEmpty() // Unchanged if left blank
}
}
private suspend fun hasAuthorizationHeader(baseUrl: String): Boolean {
if (!this::repository.isInitialized || !validUrl(baseUrl)) {
return false
}
return withContext(Dispatchers.IO) {
repository.getCustomHeaders(baseUrl)
.any { it.name.equals("Authorization", ignoreCase = true) }
}
}
companion object {
const val TAG = "NtfyUserFragment"
private const val BUNDLE_BASE_URL = "baseUrl"