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

Fixes #88

parent 65f27c15
No related branches found
No related tags found
No related merge requests found
...@@ -25,7 +25,7 @@ import de.kuschku.quasseldroid.ui.coresettings.SettingsFragment ...@@ -25,7 +25,7 @@ import de.kuschku.quasseldroid.ui.coresettings.SettingsFragment
class NetworkEditFragment : NetworkBaseFragment(false), SettingsFragment.Deletable { class NetworkEditFragment : NetworkBaseFragment(false), SettingsFragment.Deletable {
override fun onSave() = network?.let { (it, data) -> override fun onSave() = network?.let { (it, data) ->
applyChanges(data) applyChanges(data)
it?.requestUpdate(data.toVariantMap()) it?.requestSetNetworkInfo(data.networkInfo())
true true
} ?: false } ?: false
......
...@@ -53,18 +53,15 @@ class IrcChannel( ...@@ -53,18 +53,15 @@ class IrcChannel(
} }
override fun initChanModes(): QVariantMap = mapOf( override fun initChanModes(): QVariantMap = mapOf(
"A" to QVariant.of(_A_channelModes.entries.map { (key, value) -> "A" to QVariant.of(_A_channelModes.mapValues { (_, value) ->
key to QVariant.of(value.toList(), Type.QStringList) QVariant.of(value.toList(), Type.QStringList)
}, Type.QVariantMap }, Type.QVariantMap),
), "B" to QVariant.of(_B_channelModes.mapValues { (_, value) ->
"B" to QVariant.of(_B_channelModes.entries.map { (key, value) -> QVariant.of(value, Type.QString)
key to QVariant.of(value, Type.QString) }, Type.QVariantMap),
}, Type.QVariantMap "C" to QVariant.of(_C_channelModes.mapValues { (_, value) ->
), QVariant.of(value, Type.QString)
"C" to QVariant.of(_C_channelModes.entries.map { (key, value) -> }, Type.QVariantMap),
key to QVariant.of(value, Type.QString)
}, Type.QVariantMap
),
"D" to QVariant.of(_D_channelModes.joinToString(), Type.QString) "D" to QVariant.of(_D_channelModes.joinToString(), Type.QString)
) )
......
...@@ -58,8 +58,8 @@ class IrcUser( ...@@ -58,8 +58,8 @@ class IrcUser(
"loginTime" to QVariant.of(loginTime(), Type.QDateTime), "loginTime" to QVariant.of(loginTime(), Type.QDateTime),
"server" to QVariant.of(server(), Type.QString), "server" to QVariant.of(server(), Type.QString),
"ircOperator" to QVariant.of(ircOperator(), Type.QString), "ircOperator" to QVariant.of(ircOperator(), Type.QString),
"lastAwayMessage" to QVariant.of(lastAwayMessage(), Type.Long), "lastAwayMessage" to QVariant.of(lastAwayMessage(), Type.Int),
"lastAwayMessageTime" to QVariant.of(lastAwayMessageTime(), Type.Long), "lastAwayMessageTime" to QVariant.of(lastAwayMessageTime(), Type.QDateTime),
"whoisServiceReply" to QVariant.of(whoisServiceReply(), Type.QString), "whoisServiceReply" to QVariant.of(whoisServiceReply(), Type.QString),
"suserHost" to QVariant.of(suserHost(), Type.QString), "suserHost" to QVariant.of(suserHost(), Type.QString),
"encrypted" to QVariant.of(encrypted(), Type.Bool), "encrypted" to QVariant.of(encrypted(), Type.Bool),
......
...@@ -185,7 +185,7 @@ class Network constructor( ...@@ -185,7 +185,7 @@ class Network constructor(
fun liveNetworkInfo() = live_networkInfo.map { networkInfo() } fun liveNetworkInfo() = live_networkInfo.map { networkInfo() }
fun setNetworkInfo(info: NetworkInfo) { override fun setNetworkInfo(info: NetworkInfo) {
// we don't set our ID! // we don't set our ID!
if (!info.networkName.isEmpty() && info.networkName != networkName()) if (!info.networkName.isEmpty() && info.networkName != networkName())
setNetworkName(info.networkName) setNetworkName(info.networkName)
...@@ -523,13 +523,13 @@ class Network constructor( ...@@ -523,13 +523,13 @@ class Network constructor(
_useSasl = sasl _useSasl = sasl
} }
override fun setSaslAccount(account: String) { override fun setSaslAccount(account: String?) {
if (_saslAccount == account) if (_saslAccount == account)
return return
_saslAccount = account _saslAccount = account
} }
override fun setSaslPassword(password: String) { override fun setSaslPassword(password: String?) {
if (_saslPassword == password) if (_saslPassword == password)
return return
_saslPassword = password _saslPassword = password
...@@ -962,12 +962,12 @@ class Network constructor( ...@@ -962,12 +962,12 @@ class Network constructor(
field = value field = value
live_networkInfo.onNext(Unit) live_networkInfo.onNext(Unit)
} }
private var _saslAccount: String = "" private var _saslAccount: String? = null
set(value) { set(value) {
field = value field = value
live_networkInfo.onNext(Unit) live_networkInfo.onNext(Unit)
} }
private var _saslPassword: String = "" private var _saslPassword: String? = null
set(value) { set(value) {
field = value field = value
live_networkInfo.onNext(Unit) live_networkInfo.onNext(Unit)
......
...@@ -87,7 +87,7 @@ interface INetwork : ISyncableObject { ...@@ -87,7 +87,7 @@ interface INetwork : ISyncableObject {
@Slot @Slot
fun requestSetNetworkInfo(info: NetworkInfo) { fun requestSetNetworkInfo(info: NetworkInfo) {
REQUEST("requestSetNetworkInfo", ARG(info, QType.NetworkInfo)) REQUEST("requestSetNetworkInfo", ARG(info.toVariantMap(), QType.NetworkInfo))
} }
@Slot @Slot
...@@ -138,6 +138,9 @@ interface INetwork : ISyncableObject { ...@@ -138,6 +138,9 @@ interface INetwork : ISyncableObject {
@Slot @Slot
fun setNetworkName(networkName: String) fun setNetworkName(networkName: String)
@Slot
fun setNetworkInfo(info: NetworkInfo)
@Slot @Slot
fun setPerform(perform: QStringList) fun setPerform(perform: QStringList)
...@@ -145,10 +148,10 @@ interface INetwork : ISyncableObject { ...@@ -145,10 +148,10 @@ interface INetwork : ISyncableObject {
fun setRejoinChannels(rejoinChannels: Boolean) fun setRejoinChannels(rejoinChannels: Boolean)
@Slot @Slot
fun setSaslAccount(account: String) fun setSaslAccount(account: String?)
@Slot @Slot
fun setSaslPassword(password: String) fun setSaslPassword(password: String?)
@Slot @Slot
fun setServerList(serverList: QVariantList) fun setServerList(serverList: QVariantList)
...@@ -306,8 +309,8 @@ interface INetwork : ISyncableObject { ...@@ -306,8 +309,8 @@ interface INetwork : ISyncableObject {
var autoIdentifyService: String = "", var autoIdentifyService: String = "",
var autoIdentifyPassword: String = "", var autoIdentifyPassword: String = "",
var useSasl: Boolean = false, var useSasl: Boolean = false,
var saslAccount: String = "", var saslAccount: String? = null,
var saslPassword: String = "", var saslPassword: String? = null,
var useAutoReconnect: Boolean = true, var useAutoReconnect: Boolean = true,
var autoReconnectInterval: Int = 0, var autoReconnectInterval: Int = 0,
var autoReconnectRetries: Short = 0, var autoReconnectRetries: Short = 0,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment