Fixes #156 and #160

lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt

@@ -351,14 +351,14 @@ class BufferViewConfig constructor(
   }
 
   fun isEqual(other: BufferViewConfig): Boolean =
-    this.bufferViewName() == other.bufferViewName() ||
-    this.showSearch() == other.showSearch() ||
-    this.sortAlphabetically() == other.sortAlphabetically() ||
-    this.addNewBuffersAutomatically() == other.addNewBuffersAutomatically() ||
-    this.hideInactiveBuffers() == other.hideInactiveBuffers() ||
-    this.hideInactiveNetworks() == other.hideInactiveNetworks() ||
-    this.allowedBufferTypes() == other.allowedBufferTypes() ||
-    this.networkId() == other.networkId() ||
+    this.bufferViewName() == other.bufferViewName() &&
+    this.showSearch() == other.showSearch() &&
+    this.sortAlphabetically() == other.sortAlphabetically() &&
+    this.addNewBuffersAutomatically() == other.addNewBuffersAutomatically() &&
+    this.hideInactiveBuffers() == other.hideInactiveBuffers() &&
+    this.hideInactiveNetworks() == other.hideInactiveNetworks() &&
+    this.allowedBufferTypes() == other.allowedBufferTypes() &&
+    this.networkId() == other.networkId() &&
     this.minimumActivity() == other.minimumActivity()
 
   override fun toString(): String {

lib/src/main/java/de/kuschku/libquassel/quassel/syncables/HighlightRuleManager.kt

@@ -162,8 +162,8 @@ class HighlightRuleManager(
   private var _nicksCaseSensitive = false
 
   fun isEqual(other: HighlightRuleManager): Boolean =
-    this.highlightNick() == other.highlightNick() ||
-    this.nicksCaseSensitive() == other.nicksCaseSensitive() ||
+    this.highlightNick() == other.highlightNick() &&
+    this.nicksCaseSensitive() == other.nicksCaseSensitive() &&
     this.highlightRuleList() == other.highlightRuleList()
 
   override fun toString(): String {

lib/src/main/java/de/kuschku/libquassel/quassel/syncables/Identity.kt

@@ -307,15 +307,15 @@ class Identity constructor(
     }
 
   fun isEqual(other: Identity): Boolean =
-    this.identityName() == other.identityName() ||
-    this.realName() == other.realName() ||
-    this.ident() == other.ident() ||
-    this.kickReason() == other.kickReason() ||
-    this.partReason() == other.partReason() ||
-    this.quitReason() == other.quitReason() ||
-    this.awayReason() == other.awayReason() ||
-    this.detachAwayEnabled() == other.detachAwayEnabled() ||
-    this.detachAwayReason() == other.detachAwayReason() ||
+    this.identityName() == other.identityName() &&
+    this.realName() == other.realName() &&
+    this.ident() == other.ident() &&
+    this.kickReason() == other.kickReason() &&
+    this.partReason() == other.partReason() &&
+    this.quitReason() == other.quitReason() &&
+    this.awayReason() == other.awayReason() &&
+    this.detachAwayEnabled() == other.detachAwayEnabled() &&
+    this.detachAwayReason() == other.detachAwayReason() &&
     this.nicks() == other.nicks()
 
   override fun toString(): String {

lib/src/main/java/de/kuschku/libquassel/quassel/syncables/Network.kt

@@ -344,7 +344,7 @@ class Network constructor(
     // See: http://ircv3.net/specs/extensions/sasl-3.1.html
     // And: http://ircv3.net/specs/extensions/sasl-3.2.html
     return (capValue.isNullOrBlank() ||
-            capValue?.contains(saslMechanism, ignoreCase = true) ?: false)
+            capValue.contains(saslMechanism, ignoreCase = true))
   }
 
   fun newIrcUser(hostMask: String, initData: QVariantMap = emptyMap(),
@@ -1010,24 +1010,24 @@ class Network constructor(
   private val live_networkInfo = BehaviorSubject.createDefault(Unit)
 
   fun isEqual(other: Network): Boolean =
-    this.networkName() == other.networkName() ||
-    this.identity() == other.identity() ||
-    this.serverList() == other.serverList() ||
-    this.useSasl() == other.useSasl() ||
-    this.saslAccount() == other.saslAccount() ||
-    this.saslPassword() == other.saslPassword() ||
-    this.useAutoIdentify() == other.useAutoIdentify() ||
-    this.autoIdentifyService() == other.autoIdentifyService() ||
-    this.autoIdentifyPassword() == other.autoIdentifyPassword() ||
-    this.useAutoReconnect() == other.useAutoReconnect() ||
-    this.autoReconnectInterval() == other.autoReconnectInterval() ||
-    this.autoReconnectRetries() == other.autoReconnectRetries() ||
-    this.unlimitedReconnectRetries() == other.unlimitedReconnectRetries() ||
-    this.rejoinChannels() == other.rejoinChannels() ||
-    this.perform() == other.perform() ||
-    this.useCustomMessageRate() == other.useCustomMessageRate() ||
-    this.messageRateBurstSize() == other.messageRateBurstSize() ||
-    this.unlimitedMessageRate() == other.unlimitedMessageRate() ||
+    this.networkName() == other.networkName() &&
+    this.identity() == other.identity() &&
+    this.serverList() == other.serverList() &&
+    this.useSasl() == other.useSasl() &&
+    this.saslAccount() == other.saslAccount() &&
+    this.saslPassword() == other.saslPassword() &&
+    this.useAutoIdentify() == other.useAutoIdentify() &&
+    this.autoIdentifyService() == other.autoIdentifyService() &&
+    this.autoIdentifyPassword() == other.autoIdentifyPassword() &&
+    this.useAutoReconnect() == other.useAutoReconnect() &&
+    this.autoReconnectInterval() == other.autoReconnectInterval() &&
+    this.autoReconnectRetries() == other.autoReconnectRetries() &&
+    this.unlimitedReconnectRetries() == other.unlimitedReconnectRetries() &&
+    this.rejoinChannels() == other.rejoinChannels() &&
+    this.perform() == other.perform() &&
+    this.useCustomMessageRate() == other.useCustomMessageRate() &&
+    this.messageRateBurstSize() == other.messageRateBurstSize() &&
+    this.unlimitedMessageRate() == other.unlimitedMessageRate() &&
     this.messageRateDelay() == other.messageRateDelay()
 
   override fun toString(): String {