diff --git a/ORLib/src/main/java/io/openremote/orlib/service/ESPProvisionProvider.kt b/ORLib/src/main/java/io/openremote/orlib/service/ESPProvisionProvider.kt index 8165309..62b8098 100644 --- a/ORLib/src/main/java/io/openremote/orlib/service/ESPProvisionProvider.kt +++ b/ORLib/src/main/java/io/openremote/orlib/service/ESPProvisionProvider.kt @@ -269,10 +269,10 @@ class ESPProvisionProvider(val context: Context) { // OR Configuration - fun provisionDevice(apiURL: URL = URL("http://localhost:8080/api/master"), userToken: String) { + fun provisionDevice(apiURL: URL = URL("http://localhost:8080/api/master"), userToken: String, realm: String = "master") { val deviceProvision = DeviceProvision(deviceConnection, deviceRegistry.callbackChannel) CoroutineScope(Dispatchers.IO).launch { - deviceProvision.provision(apiURL, userToken) + deviceProvision.provision(apiURL, userToken, realm) } } @@ -324,4 +324,4 @@ enum class ESPProviderErrorCode(val code: Int) { TIMEOUT_ERROR(600), GENERIC_ERROR(10000); -} \ No newline at end of file +} diff --git a/ORLib/src/main/java/io/openremote/orlib/service/espprovision/DeviceConnection.kt b/ORLib/src/main/java/io/openremote/orlib/service/espprovision/DeviceConnection.kt index 48a1bc3..db7d608 100644 --- a/ORLib/src/main/java/io/openremote/orlib/service/espprovision/DeviceConnection.kt +++ b/ORLib/src/main/java/io/openremote/orlib/service/espprovision/DeviceConnection.kt @@ -101,6 +101,7 @@ class DeviceConnection(val deviceRegistry: DeviceRegistry, var callbackChannel: mqttBrokerUrl: String, mqttUser: String, mqttPassword: String, + realm: String, assetId: String, properties: Map = emptyMap() ) { @@ -115,6 +116,7 @@ class DeviceConnection(val deviceRegistry: DeviceRegistry, var callbackChannel: mqttBrokerUrl = mqttBrokerUrl, mqttUser = mqttUser, mqttPassword = mqttPassword, + realm = realm, assetId = assetId, properties = properties ) @@ -250,4 +252,4 @@ class DeviceConnection(val deviceRegistry: DeviceRegistry, var callbackChannel: CONNECTED, DISCONNECTED } -} \ No newline at end of file +} diff --git a/ORLib/src/main/java/io/openremote/orlib/service/espprovision/DeviceProvision.kt b/ORLib/src/main/java/io/openremote/orlib/service/espprovision/DeviceProvision.kt index 66f4e42..d1e842c 100644 --- a/ORLib/src/main/java/io/openremote/orlib/service/espprovision/DeviceProvision.kt +++ b/ORLib/src/main/java/io/openremote/orlib/service/espprovision/DeviceProvision.kt @@ -23,7 +23,7 @@ class DeviceProvision(var deviceConnection: DeviceConnection?, var callbackChann deviceProvisionAPI = DeviceProvisionAPIREST() } - suspend fun provision(apiURL: URL, userToken: String) { + suspend fun provision(apiURL: URL, userToken: String, realm: String = "master") { if (deviceConnection == null || !deviceConnection!!.isConnected) { sendProvisionDeviceStatus(false, ESPProviderErrorCode.NOT_CONNECTED, "No connection established to device") } @@ -41,6 +41,7 @@ class DeviceProvision(var deviceConnection: DeviceConnection?, var callbackChann mqttBrokerUrl = "mqtts://${apiURL.host ?: "localhost"}:8883", mqttUser = userName, mqttPassword = password, + realm = realm, assetId = result.assetId, properties = result.properties ) @@ -116,4 +117,4 @@ class DeviceProvision(var deviceConnection: DeviceConnection?, var callbackChann .build() .generate() } -} \ No newline at end of file +} diff --git a/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt b/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt index 888eed3..2df56e0 100644 --- a/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt +++ b/ORLib/src/main/java/io/openremote/orlib/ui/OrMainActivity.kt @@ -1047,7 +1047,7 @@ open class OrMainActivity : Activity() { if (!userToken.isNullOrEmpty()) { if (baseUrl != null) { val realm = getESPProvisionRealm() - espProvisionProvider?.provisionDevice(getESPProvisionApiURL(baseUrl!!, realm), userToken) + espProvisionProvider?.provisionDevice(getESPProvisionApiURL(baseUrl!!, realm), userToken, realm) } else { espProvisionProvider?.provisionDevice(userToken = userToken) }