mirror of
https://github.com/antebudimir/tempus.git
synced 2026-01-02 02:13:33 +00:00
fix: strengthened controls on the presence of server address strings (local and remote)
This commit is contained in:
parent
6f51fd92bb
commit
c5a78bf945
2 changed files with 6 additions and 4 deletions
|
|
@ -168,7 +168,9 @@ object Preferences {
|
|||
|
||||
@JvmStatic
|
||||
fun getInUseServerAddress(): String? {
|
||||
return App.getInstance().preferences.getString(IN_USE_SERVER_ADDRESS, getServer())
|
||||
return App.getInstance().preferences.getString(IN_USE_SERVER_ADDRESS, null)
|
||||
?.takeIf { it.isNotBlank() }
|
||||
?: getServer()
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
|
|
@ -186,7 +188,7 @@ object Preferences {
|
|||
fun isServerSwitchable(): Boolean {
|
||||
return App.getInstance().preferences.getLong(
|
||||
NEXT_SERVER_SWITCH, 0
|
||||
) + 15000 < System.currentTimeMillis()
|
||||
) + 15000 < System.currentTimeMillis() && !getServer().isNullOrEmpty() && !getLocalAddress().isNullOrEmpty()
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue