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

Minor cleanup

parent 92765120
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,6 @@ import android.content.SharedPreferences ...@@ -9,7 +9,6 @@ import android.content.SharedPreferences
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.PersistableBundle import android.os.PersistableBundle
import android.support.design.widget.Snackbar
import android.support.v4.graphics.drawable.DrawableCompat import android.support.v4.graphics.drawable.DrawableCompat
import android.support.v4.widget.DrawerLayout import android.support.v4.widget.DrawerLayout
import android.support.v7.app.ActionBarDrawerToggle import android.support.v7.app.ActionBarDrawerToggle
...@@ -84,8 +83,6 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc ...@@ -84,8 +83,6 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
private lateinit var viewModel: QuasselViewModel private lateinit var viewModel: QuasselViewModel
private var snackbar: Snackbar? = null
private lateinit var database: QuasselDatabase private lateinit var database: QuasselDatabase
private lateinit var backlogSettings: BacklogSettings private lateinit var backlogSettings: BacklogSettings
......
...@@ -244,17 +244,16 @@ class IrcChannel( ...@@ -244,17 +244,16 @@ class IrcChannel(
if (!isKnownUser(ircuser)) if (!isKnownUser(ircuser))
return return
_userModes.remove(ircuser) _userModes.remove(ircuser)
live_userModes.onNext(_userModes)
ircuser.partChannel(this) ircuser.partChannel(this)
if (network().isMe(ircuser) || _userModes.isEmpty()) { if (network().isMe(ircuser) || _userModes.isEmpty()) {
for (user in _userModes.keys) { for (user in _userModes.keys) {
user.partChannel(this) user.partChannel(this)
} }
_userModes.clear() _userModes.clear()
live_userModes.onNext(_userModes)
network().removeIrcChannel(this) network().removeIrcChannel(this)
proxy.stopSynchronize(this) proxy.stopSynchronize(this)
} }
live_userModes.onNext(_userModes)
super.part(ircuser) super.part(ircuser)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment