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

Implement creation and deletion of identities

parent 08a444b4
Branches
Tags
No related merge requests found
...@@ -8,7 +8,7 @@ class IdentityCreateFragment : IdentityBaseFragment() { ...@@ -8,7 +8,7 @@ class IdentityCreateFragment : IdentityBaseFragment() {
override fun onSave() = viewModel.session.value?.orNull()?.let { session -> override fun onSave() = viewModel.session.value?.orNull()?.let { session ->
Identity(session.proxy).let { data -> Identity(session.proxy).let { data ->
applyChanges(data) applyChanges(data)
session.rpcHandler?.requestCreateIdentity(data.toVariantMap(), mapOf()) session.rpcHandler?.createIdentity(data.toVariantMap(), mapOf())
true true
} }
} ?: false } ?: false
......
...@@ -13,7 +13,7 @@ class IdentityEditFragment : IdentityBaseFragment(), SettingsFragment.Deletable ...@@ -13,7 +13,7 @@ class IdentityEditFragment : IdentityBaseFragment(), SettingsFragment.Deletable
override fun onDelete() { override fun onDelete() {
identity?.let { (it, _) -> identity?.let { (it, _) ->
it?.let { it?.let {
viewModel.session.value?.orNull()?.rpcHandler?.requestRemoveIdentity(it.id()) viewModel.session.value?.orNull()?.rpcHandler?.removeIdentity(it.id())
} }
} }
} }
......
...@@ -41,38 +41,44 @@ class RpcHandler( ...@@ -41,38 +41,44 @@ class RpcHandler(
backlogStorage.storeMessages(session, message) backlogStorage.storeMessages(session, message)
} }
override fun requestCreateIdentity(identity: QVariantMap, additional: QVariantMap) = override fun createIdentity(identity: QVariantMap, additional: QVariantMap) =
RPC( RPC(
"2requestCreateIdentity(Identity,QVariantMap)", "2createIdentity(Identity,QVariantMap)",
ARG(identity, QType.Identity), ARG(identity, QType.Identity),
ARG(additional, Type.QVariantMap) ARG(additional, Type.QVariantMap)
) )
override fun requestRemoveIdentity(identityId: IdentityId) = override fun removeIdentity(identityId: IdentityId) =
RPC( RPC(
"2requestRemoveIdentity(IdentityId)", "2removeIdentity(IdentityId)",
ARG(identityId, QType.IdentityId) ARG(identityId, QType.IdentityId)
) )
override fun requestCreateNetwork(networkInfo: INetwork.NetworkInfo, channels: List<String>) = override fun createNetwork(networkInfo: INetwork.NetworkInfo, channels: List<String>) =
RPC( RPC(
"2requestCreateNetwork(NetworkInfo,QStringList)", "2createNetwork(NetworkInfo,QStringList)",
ARG(networkInfo, QType.NetworkInfo), ARG(networkInfo, QType.NetworkInfo),
ARG(channels, Type.QStringList) ARG(channels, Type.QStringList)
) )
override fun requestRemoveNetwork(networkId: NetworkId) = override fun removeNetwork(networkId: NetworkId) =
RPC( RPC(
"2requestRemoveNetwork(NetworkId)", "2removeNetwork(NetworkId)",
ARG(networkId, QType.NetworkId) ARG(networkId, QType.NetworkId)
) )
override fun requestPasswordChange(peerPtr: Long, user: String, old: String, new: String) { override fun changePassword(peerPtr: Long, user: String, old: String, new: String) =
} RPC(
"2changePassword(PeerPtr,QString,QString,QString)",
ARG(peerPtr, QType.PeerPtr),
ARG(user, Type.QString),
ARG(old, Type.QString),
ARG(new, Type.QString)
)
override fun requestKickClient(id: Int) = override fun requestKickClient(id: Int) =
RPC( RPC(
"2requestKickClient(Int)", "2kickClient(Int)",
ARG(id, Type.Int) ARG(id, Type.Int)
) )
......
...@@ -44,11 +44,11 @@ interface IRpcHandler { ...@@ -44,11 +44,11 @@ interface IRpcHandler {
@Slot("2disconnectFromCore()") @Slot("2disconnectFromCore()")
fun disconnectFromCore() fun disconnectFromCore()
fun requestCreateIdentity(identity: QVariantMap, additional: QVariantMap) fun createIdentity(identity: QVariantMap, additional: QVariantMap)
fun requestRemoveIdentity(identityId: IdentityId) fun removeIdentity(identityId: IdentityId)
fun requestCreateNetwork(networkInfo: INetwork.NetworkInfo, channels: List<String>) fun createNetwork(networkInfo: INetwork.NetworkInfo, channels: List<String>)
fun requestRemoveNetwork(networkId: NetworkId) fun removeNetwork(networkId: NetworkId)
fun requestPasswordChange(peerPtr: Long, user: String, old: String, new: String) fun changePassword(peerPtr: Long, user: String, old: String, new: String)
fun requestKickClient(id: Int) fun requestKickClient(id: Int)
fun sendInput(bufferInfo: BufferInfo, message: String) fun sendInput(bufferInfo: BufferInfo, message: String)
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment