Skip to content
Snippets Groups Projects
Verified Commit bf753adf authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

fix: correct saving/creating networks and identities

parent 45bc6cf8
No related branches found
No related tags found
No related merge requests found
Pipeline #2698 passed
...@@ -25,7 +25,7 @@ class IdentityCreateFragment : IdentityBaseFragment(true) { ...@@ -25,7 +25,7 @@ class IdentityCreateFragment : IdentityBaseFragment(true) {
override fun onSave() = modelHelper.connectedSession.value?.orNull()?.let { session -> override fun onSave() = modelHelper.connectedSession.value?.orNull()?.let { session ->
identity?.let { (_, data) -> identity?.let { (_, data) ->
applyChanges(data) applyChanges(data)
session.rpcHandler.createIdentity(data, mapOf()) session.rpcHandler.createIdentity(data.toVariantMap(), mapOf())
true true
} ?: false } ?: false
} ?: false } ?: false
......
...@@ -27,7 +27,7 @@ class NetworkCreateFragment : NetworkBaseFragment(true) { ...@@ -27,7 +27,7 @@ class NetworkCreateFragment : NetworkBaseFragment(true) {
network?.let { (_, data) -> network?.let { (_, data) ->
applyChanges(data) applyChanges(data)
modelHelper.backend.value?.ifPresent(Backend::requestConnectNewNetwork) modelHelper.backend.value?.ifPresent(Backend::requestConnectNewNetwork)
session.rpcHandler.createNetwork(data.networkInfo(), emptyList()) session.rpcHandler.createNetwork(data.networkInfo().toVariantMap(), emptyList())
true true
} }
} ?: false } ?: false
......
...@@ -74,7 +74,7 @@ class NetworkSetupActivity : ServiceBoundSetupActivity() { ...@@ -74,7 +74,7 @@ class NetworkSetupActivity : ServiceBoundSetupActivity() {
port = network.server.port, port = network.server.port,
useSsl = network.server.secure useSsl = network.server.secure
)) ))
), data.getStringArray("channels")?.toList().orEmpty()) ).toVariantMap(),data.getStringArray("channels")?.toList().orEmpty())
backend.requestConnectNewNetwork() backend.requestConnectNewNetwork()
} }
} }
......
...@@ -56,7 +56,7 @@ class UserSetupActivity : ServiceBoundSetupActivity() { ...@@ -56,7 +56,7 @@ class UserSetupActivity : ServiceBoundSetupActivity() {
setIdentityName(this@UserSetupActivity.getString(R.string.default_identity_identity_name)) setIdentityName(this@UserSetupActivity.getString(R.string.default_identity_identity_name))
setNicks(listOf(data.getString("nick"))) setNicks(listOf(data.getString("nick")))
setRealName(data.getString("realname")) setRealName(data.getString("realname"))
}, emptyMap()) }.toVariantMap(), emptyMap())
modelHelper.identities modelHelper.identities
.map(Map<IdentityId, Identity>::values) .map(Map<IdentityId, Identity>::values)
...@@ -75,7 +75,7 @@ class UserSetupActivity : ServiceBoundSetupActivity() { ...@@ -75,7 +75,7 @@ class UserSetupActivity : ServiceBoundSetupActivity() {
useSsl = it.secure useSsl = it.secure
) )
} }
), data.getStringArray("channels")?.toList().orEmpty()) ).toVariantMap(), data.getStringArray("channels")?.toList().orEmpty())
backend.requestConnectNewNetwork() backend.requestConnectNewNetwork()
} }
......
...@@ -128,7 +128,7 @@ interface IRpcHandler : ISyncableObject { ...@@ -128,7 +128,7 @@ interface IRpcHandler : ISyncableObject {
} }
@SyncedCall(name = "2createIdentity(Identity,QVariantMap)", target = ProtocolSide.CORE) @SyncedCall(name = "2createIdentity(Identity,QVariantMap)", target = ProtocolSide.CORE)
fun createIdentity(identity: IIdentity, additional: QVariantMap) { fun createIdentity(identity: QVariantMap, additional: QVariantMap) {
rpc( rpc(
target = ProtocolSide.CORE, target = ProtocolSide.CORE,
"2createIdentity(Identity,QVariantMap)", "2createIdentity(Identity,QVariantMap)",
...@@ -147,7 +147,7 @@ interface IRpcHandler : ISyncableObject { ...@@ -147,7 +147,7 @@ interface IRpcHandler : ISyncableObject {
} }
@SyncedCall(name = "2createNetwork(NetworkInfo,QStringList)", target = ProtocolSide.CORE) @SyncedCall(name = "2createNetwork(NetworkInfo,QStringList)", target = ProtocolSide.CORE)
fun createNetwork(networkInfo: INetwork.NetworkInfo, channels: List<String>) { fun createNetwork(networkInfo: QVariantMap, channels: List<String>) {
rpc( rpc(
target = ProtocolSide.CORE, target = ProtocolSide.CORE,
"2createNetwork(NetworkInfo,QStringList)", "2createNetwork(NetworkInfo,QStringList)",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment