feat(syspulse): support direct status url normalization and release v1.3.2
Build & Release Android APK / Build & Publish Release APK (push) Successful in 1m47s
Build & Release Android APK / Build & Publish Release APK (push) Successful in 1m47s
This commit is contained in:
@@ -11,8 +11,8 @@ android {
|
|||||||
applicationId = "com.expapp.trigger"
|
applicationId = "com.expapp.trigger"
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 20
|
versionCode = 21
|
||||||
versionName = "1.3.1"
|
versionName = "1.3.2"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables {
|
vectorDrawables {
|
||||||
|
|||||||
@@ -93,7 +93,11 @@ class SysPulseClient(
|
|||||||
|
|
||||||
fun resolveBaseUrl(device: DeviceConfig, nodeStatus: NodeStatus? = null): String {
|
fun resolveBaseUrl(device: DeviceConfig, nodeStatus: NodeStatus? = null): String {
|
||||||
if (device.syspulseUrl.isNotBlank()) {
|
if (device.syspulseUrl.isNotBlank()) {
|
||||||
return device.syspulseUrl.trim().removeSuffix("/")
|
return device.syspulseUrl.trim()
|
||||||
|
.removeSuffix("/")
|
||||||
|
.removeSuffix("/api/status")
|
||||||
|
.removeSuffix("/api")
|
||||||
|
.removeSuffix("/")
|
||||||
}
|
}
|
||||||
val ip = nodeStatus?.ip?.trim()
|
val ip = nodeStatus?.ip?.trim()
|
||||||
if (!ip.isNullOrBlank()) {
|
if (!ip.isNullOrBlank()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user