From f4801576d9961e21207905c3cfcb53e2492b1347 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Thu, 8 Mar 2018 22:46:13 +0100
Subject: [PATCH] Minor cleanup
---
.../java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt | 3 ---
.../java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt | 3 +--
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
index 732cc3f13..4c21f6583 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
@@ -9,7 +9,6 @@ import android.content.SharedPreferences
import android.os.Build
import android.os.Bundle
import android.os.PersistableBundle
-import android.support.design.widget.Snackbar
import android.support.v4.graphics.drawable.DrawableCompat
import android.support.v4.widget.DrawerLayout
import android.support.v7.app.ActionBarDrawerToggle
@@ -84,8 +83,6 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
private lateinit var viewModel: QuasselViewModel
- private var snackbar: Snackbar? = null
-
private lateinit var database: QuasselDatabase
private lateinit var backlogSettings: BacklogSettings
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt
index 32daf7db4..83d1dd800 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt
@@ -244,17 +244,16 @@ class IrcChannel(
if (!isKnownUser(ircuser))
return
_userModes.remove(ircuser)
- live_userModes.onNext(_userModes)
ircuser.partChannel(this)
if (network().isMe(ircuser) || _userModes.isEmpty()) {
for (user in _userModes.keys) {
user.partChannel(this)
}
_userModes.clear()
- live_userModes.onNext(_userModes)
network().removeIrcChannel(this)
proxy.stopSynchronize(this)
}
+ live_userModes.onNext(_userModes)
super.part(ircuser)
}
--
GitLab