Improved info UI

app/src/main/AndroidManifest.xml

@@ -34,7 +34,7 @@
       </intent-filter>
     </activity>
     <activity
-      android:name=".ui.chat.detailinfo.InfoActivity"
+      android:name=".ui.chat.info.InfoActivity"
       android:exported="false"
       android:label="@string/label_details"
       android:parentActivityName=".ui.chat.ChatActivity"

app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityModule.kt

@@ -6,7 +6,8 @@ import de.kuschku.quasseldroid.service.QuasselService
 import de.kuschku.quasseldroid.ui.chat.ChatActivity
 import de.kuschku.quasseldroid.ui.chat.ChatActivityModule
 import de.kuschku.quasseldroid.ui.chat.ChatFragmentProvider
-import de.kuschku.quasseldroid.ui.chat.detailinfo.InfoActivity
+import de.kuschku.quasseldroid.ui.chat.info.InfoActivity
+import de.kuschku.quasseldroid.ui.chat.info.InfoFragmentProvider
 import de.kuschku.quasseldroid.ui.settings.about.AboutSettingsActivity
 import de.kuschku.quasseldroid.ui.settings.about.AboutSettingsFragmentProvider
 import de.kuschku.quasseldroid.ui.settings.app.AppSettingsActivity
@@ -26,7 +27,7 @@ abstract class ActivityModule {
   @ContributesAndroidInjector(modules = [ChatActivityModule::class, ChatFragmentProvider::class])
   abstract fun bindChatActivity(): ChatActivity
 
-  @ContributesAndroidInjector
+  @ContributesAndroidInjector(modules = [InfoFragmentProvider::class])
   abstract fun bindInfoActivity(): InfoActivity
 
   @ContributesAndroidInjector(modules = [AppSettingsFragmentProvider::class])

app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt

@@ -2,7 +2,6 @@ package de.kuschku.quasseldroid.ui.chat
 
 import android.annotation.TargetApi
 import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -42,7 +41,6 @@ import de.kuschku.quasseldroid.util.helper.retint
 import de.kuschku.quasseldroid.util.helper.toLiveData
 import de.kuschku.quasseldroid.util.service.ServiceBoundActivity
 import de.kuschku.quasseldroid.util.ui.MaterialContentLoadingProgressBar
-import de.kuschku.quasseldroid.viewmodel.QuasselViewModel
 import de.kuschku.quasseldroid.viewmodel.data.AutoCompleteItem
 import javax.inject.Inject
 
@@ -67,8 +65,6 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
 
   private lateinit var drawerToggle: ActionBarDrawerToggle
 
-  private lateinit var viewModel: QuasselViewModel
-
   @Inject
   lateinit var database: QuasselDatabase
 
@@ -101,9 +97,6 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
     setContentView(R.layout.activity_main)
     ButterKnife.bind(this)
 
-    viewModel = ViewModelProviders.of(this)[QuasselViewModel::class.java]
-    viewModel.backendWrapper.onNext(this.backend)
-
     editor = Editor(
       this,
       viewModel.autoCompleteData.toLiveData(),

app/src/main/java/de/kuschku/quasseldroid/ui/chat/ToolbarFragment.kt

 package de.kuschku.quasseldroid.ui.chat
 
 import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
-import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -17,16 +15,15 @@ import de.kuschku.libquassel.util.hasFlag
 import de.kuschku.libquassel.util.helpers.value
 import de.kuschku.quasseldroid.R
 import de.kuschku.quasseldroid.settings.AppearanceSettings
-import de.kuschku.quasseldroid.ui.chat.detailinfo.InfoActivity
-import de.kuschku.quasseldroid.ui.chat.detailinfo.InfoDescriptor
-import de.kuschku.quasseldroid.ui.chat.detailinfo.InfoType
+import de.kuschku.quasseldroid.ui.chat.info.InfoActivity
+import de.kuschku.quasseldroid.ui.chat.info.InfoDescriptor
+import de.kuschku.quasseldroid.ui.chat.info.InfoType
 import de.kuschku.quasseldroid.util.helper.combineLatest
 import de.kuschku.quasseldroid.util.helper.toLiveData
 import de.kuschku.quasseldroid.util.helper.visibleIf
 import de.kuschku.quasseldroid.util.irc.format.IrcFormatDeserializer
 import de.kuschku.quasseldroid.util.service.ServiceBoundFragment
 import de.kuschku.quasseldroid.util.ui.SpanFormatter
-import de.kuschku.quasseldroid.viewmodel.QuasselViewModel
 import javax.inject.Inject
 
 class ToolbarFragment : ServiceBoundFragment() {
@@ -45,8 +42,6 @@ class ToolbarFragment : ServiceBoundFragment() {
   @Inject
   lateinit var appearanceSettings: AppearanceSettings
 
-  private lateinit var viewModel: QuasselViewModel
-
   var title: CharSequence?
     get() = toolbarTitle.text
     set(value) {
@@ -63,11 +58,6 @@ class ToolbarFragment : ServiceBoundFragment() {
       toolbarSubtitle.visibleIf(value?.isNotEmpty() == true)
     }
 
-  override fun onAttach(context: Context?) {
-    super.onAttach(context)
-    viewModel = ViewModelProviders.of(activity!!)[QuasselViewModel::class.java]
-  }
-
   override fun onCreateView(
     inflater: LayoutInflater,
     container: ViewGroup?,

app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt

 package de.kuschku.quasseldroid.ui.chat.buffers
 
 import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
-import android.content.Context
 import android.os.Bundle
 import android.support.v7.widget.*
 import android.view.*
@@ -26,7 +24,6 @@ import de.kuschku.quasseldroid.util.helper.toLiveData
 import de.kuschku.quasseldroid.util.helper.zip
 import de.kuschku.quasseldroid.util.irc.format.IrcFormatDeserializer
 import de.kuschku.quasseldroid.util.service.ServiceBoundFragment
-import de.kuschku.quasseldroid.viewmodel.QuasselViewModel
 import de.kuschku.quasseldroid.viewmodel.data.BufferHiddenState
 import javax.inject.Inject
 
@@ -49,8 +46,6 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
   @Inject
   lateinit var ircFormatDeserializer: IrcFormatDeserializer
 
-  private lateinit var viewModel: QuasselViewModel
-
   private var actionMode: ActionMode? = null
 
   private val actionModeCallback = object : ActionMode.Callback {
@@ -162,11 +157,6 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
 
   private lateinit var listAdapter: BufferListAdapter
 
-  override fun onAttach(context: Context?) {
-    super.onAttach(context)
-    viewModel = ViewModelProviders.of(activity!!)[QuasselViewModel::class.java]
-  }
-
   override fun onCreateView(
     inflater: LayoutInflater, container: ViewGroup?,
     savedInstanceState: Bundle?

app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/InfoActivity.kt

+package de.kuschku.quasseldroid.ui.chat.info
+
+import de.kuschku.quasseldroid.ui.settings.SettingsActivity
+
+class InfoActivity : SettingsActivity(InfoFragment())
\ No newline at end of file

app/src/main/java/de/kuschku/quasseldroid/ui/chat/detailinfo/InfoData.kt → app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/InfoData.kt

-package de.kuschku.quasseldroid.ui.chat.detailinfo
+package de.kuschku.quasseldroid.ui.chat.info
 
 import de.kuschku.libquassel.quassel.syncables.IrcChannel
 import de.kuschku.libquassel.quassel.syncables.IrcUser

app/src/main/java/de/kuschku/quasseldroid/ui/chat/detailinfo/InfoDescriptor.kt → app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/InfoDescriptor.kt

-package de.kuschku.quasseldroid.ui.chat.detailinfo
+package de.kuschku.quasseldroid.ui.chat.info
 
 import java.io.Serializable
 

app/src/main/java/de/kuschku/quasseldroid/ui/chat/detailinfo/InfoActivity.kt → app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/InfoFragment.kt

-package de.kuschku.quasseldroid.ui.chat.detailinfo
+package de.kuschku.quasseldroid.ui.chat.info
 
 import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
 import android.os.Bundle
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.Toolbar
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import butterknife.BindView
 import butterknife.ButterKnife
 import de.kuschku.libquassel.util.Optional
 import de.kuschku.libquassel.util.compatibility.LoggingHandler
-import de.kuschku.libquassel.util.compatibility.LoggingHandler.Companion.log
 import de.kuschku.quasseldroid.R
 import de.kuschku.quasseldroid.util.helper.toLiveData
 import de.kuschku.quasseldroid.util.irc.format.ContentFormatter
-import de.kuschku.quasseldroid.util.service.ServiceBoundActivity
-import de.kuschku.quasseldroid.viewmodel.QuasselViewModel
+import de.kuschku.quasseldroid.util.service.ServiceBoundFragment
 import de.kuschku.quasseldroid.viewmodel.data.InfoGroup
 import de.kuschku.quasseldroid.viewmodel.data.InfoProperty
 import io.reactivex.Observable
 import javax.inject.Inject
 
-class InfoActivity : ServiceBoundActivity() {
-  @BindView(R.id.toolbar)
-  lateinit var toolbar: Toolbar
-
+class InfoFragment : ServiceBoundFragment() {
   @BindView(R.id.groups)
   lateinit var groups: RecyclerView
 
   @Inject
   lateinit var contentFormatter: ContentFormatter
 
-  private lateinit var viewModel: QuasselViewModel
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    setContentView(R.layout.activity_info)
-    ButterKnife.bind(this)
-
-    setSupportActionBar(toolbar)
-    supportActionBar?.setDisplayHomeAsUpEnabled(true)
-
-    viewModel = ViewModelProviders.of(this)[QuasselViewModel::class.java]
-    viewModel.backendWrapper.onNext(this.backend)
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                            savedInstanceState: Bundle?): View? {
+    val view = inflater.inflate(R.layout.fragment_info, container, false)
+    ButterKnife.bind(this, view)
 
     val adapter = InfoGroupAdapter()
-    groups.layoutManager = LinearLayoutManager(this)
+    groups.layoutManager = LinearLayoutManager(requireContext())
     groups.adapter = adapter
 
-    val info = intent.getSerializableExtra("info") as? InfoDescriptor
+    val info = arguments?.getSerializable("info") as? InfoDescriptor
     viewModel.session.switchMap { sessionOptional ->
       val network = sessionOptional.orNull()?.networks?.get(info?.network)
       if (info == null || network == null) {
@@ -80,7 +68,7 @@ class InfoActivity : ServiceBoundActivity() {
                         ),
                         InfoProperty(
                           name = "Real Name",
-                          value = contentFormatter.format(this, user.realName())
+                          value = contentFormatter.format(requireContext(), user.realName())
                         ),
                         InfoProperty(
                           name = "Account",
@@ -101,10 +89,11 @@ class InfoActivity : ServiceBoundActivity() {
                 network = network,
                 properties = listOf(
                   InfoGroup(
+                    name = "Channel",
                     properties = listOf(
                       InfoProperty(
                         name = "Topic",
-                        value = contentFormatter.format(this, channel.topic())
+                        value = contentFormatter.format(requireContext(), channel.topic())
                       )
                     )
                   )
@@ -123,10 +112,10 @@ class InfoActivity : ServiceBoundActivity() {
         }
       }
     }.toLiveData().observe(this, Observer {
-      log(LoggingHandler.LogLevel.ERROR, "DEBUG", "data: $it")
+      LoggingHandler.log(LoggingHandler.LogLevel.ERROR, "DEBUG", "data: $it")
       adapter.submitList(it?.orNull()?.properties.orEmpty())
     })
 
-    viewModel.buffer.onNext(intent.getIntExtra("buffer", -1))
+    return view
   }
 }
\ No newline at end of file

app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/InfoFragmentProvider.kt

+package de.kuschku.quasseldroid.ui.chat.info
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class InfoFragmentProvider {
+  @ContributesAndroidInjector
+  abstract fun bindInfoFragment(): InfoFragment
+}
\ No newline at end of file

app/src/main/java/de/kuschku/quasseldroid/ui/chat/detailinfo/InfoGroupAdapter.kt → app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/InfoGroupAdapter.kt

-package de.kuschku.quasseldroid.ui.chat.detailinfo
+package de.kuschku.quasseldroid.ui.chat.info
 
 import android.support.v7.recyclerview.extensions.ListAdapter
 import android.support.v7.util.DiffUtil
+import android.support.v7.widget.DividerItemDecoration
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
@@ -11,7 +12,6 @@ import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
 import de.kuschku.quasseldroid.R
-import de.kuschku.quasseldroid.util.helper.visibleIf
 import de.kuschku.quasseldroid.viewmodel.data.InfoGroup
 
 class InfoGroupAdapter :
@@ -33,9 +33,6 @@ class InfoGroupAdapter :
     holder.bind(getItem(position))
 
   class InfoGroupViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-    @BindView(R.id.title_container)
-    lateinit var titleContainer: View
-
     @BindView(R.id.title)
     lateinit var title: TextView
 
@@ -51,12 +48,13 @@ class InfoGroupAdapter :
 
       properties.layoutManager = LinearLayoutManager(itemView.context)
       properties.adapter = adapter
+      properties.addItemDecoration(
+        DividerItemDecoration(itemView.context, DividerItemDecoration.VERTICAL)
+      )
     }
 
     fun bind(item: InfoGroup) {
       title.text = item.name
-      titleContainer.visibleIf(item.name != null)
-
       adapter.submitList(item.properties)
     }
   }

app/src/main/java/de/kuschku/quasseldroid/ui/chat/detailinfo/InfoPropertyAdapter.kt → app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/InfoPropertyAdapter.kt

-package de.kuschku.quasseldroid.ui.chat.detailinfo
+package de.kuschku.quasseldroid.ui.chat.info
 
 import android.support.v7.recyclerview.extensions.ListAdapter
 import android.support.v7.util.DiffUtil
-import android.support.v7.widget.AppCompatImageView
 import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
@@ -33,8 +33,11 @@ class InfoPropertyAdapter :
     holder.bind(getItem(position))
 
   class InfoPropertyViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    @BindView(R.id.icon_frame)
+    lateinit var iconFrame: View
+
     @BindView(R.id.icon)
-    lateinit var icon: AppCompatImageView
+    lateinit var icon: ImageView
 
     @BindView(R.id.name)
     lateinit var name: TextView
@@ -52,7 +55,7 @@ class InfoPropertyAdapter :
       name.text = item.name
       value.text = item.value
 
-      icon.visibleIf(item.icon != null)
+      iconFrame.visibleIf(item.icon != null)
     }
   }
 }
\ No newline at end of file

app/src/main/java/de/kuschku/quasseldroid/ui/chat/detailinfo/InfoType.kt → app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/InfoType.kt

-package de.kuschku.quasseldroid.ui.chat.detailinfo
+package de.kuschku.quasseldroid.ui.chat.info
 
 enum class InfoType {
   User,

app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt

 package de.kuschku.quasseldroid.ui.chat.messages
 
 import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
 import android.arch.paging.LivePagedListBuilder
 import android.arch.paging.PagedList
 import android.content.ClipData
@@ -27,7 +26,6 @@ import de.kuschku.quasseldroid.settings.BacklogSettings
 import de.kuschku.quasseldroid.util.helper.*
 import de.kuschku.quasseldroid.util.service.ServiceBoundFragment
 import de.kuschku.quasseldroid.util.ui.SpanFormatter
-import de.kuschku.quasseldroid.viewmodel.QuasselViewModel
 import io.reactivex.BackpressureStrategy
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -54,8 +52,6 @@ class MessageListFragment : ServiceBoundFragment() {
   @Inject
   lateinit var messageRenderer: QuasselMessageRenderer
 
-  private lateinit var viewModel: QuasselViewModel
-
   private lateinit var linearLayoutManager: LinearLayoutManager
   private lateinit var adapter: MessageAdapter
 
@@ -125,11 +121,6 @@ class MessageListFragment : ServiceBoundFragment() {
     }
   }
 
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    viewModel = ViewModelProviders.of(activity!!)[QuasselViewModel::class.java]
-  }
-
   private val boundaryCallback = object :
     PagedList.BoundaryCallback<DisplayMessage>() {
     override fun onItemAtFrontLoaded(itemAtFront: DisplayMessage) = Unit

app/src/main/java/de/kuschku/quasseldroid/ui/chat/nicks/NickListFragment.kt

 package de.kuschku.quasseldroid.ui.chat.nicks
 
 import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
 import android.content.Intent
 import android.os.Bundle
 import android.support.v7.widget.DefaultItemAnimator
@@ -17,18 +16,15 @@ import de.kuschku.libquassel.util.helpers.value
 import de.kuschku.libquassel.util.irc.IrcCaseMappers
 import de.kuschku.quasseldroid.R
 import de.kuschku.quasseldroid.settings.AppearanceSettings
-import de.kuschku.quasseldroid.ui.chat.detailinfo.InfoActivity
-import de.kuschku.quasseldroid.ui.chat.detailinfo.InfoDescriptor
-import de.kuschku.quasseldroid.ui.chat.detailinfo.InfoType
+import de.kuschku.quasseldroid.ui.chat.info.InfoActivity
+import de.kuschku.quasseldroid.ui.chat.info.InfoDescriptor
+import de.kuschku.quasseldroid.ui.chat.info.InfoType
 import de.kuschku.quasseldroid.util.helper.toLiveData
 import de.kuschku.quasseldroid.util.irc.format.IrcFormatDeserializer
 import de.kuschku.quasseldroid.util.service.ServiceBoundFragment
-import de.kuschku.quasseldroid.viewmodel.QuasselViewModel
 import javax.inject.Inject
 
 class NickListFragment : ServiceBoundFragment() {
-  private lateinit var viewModel: QuasselViewModel
-
   @BindView(R.id.nickList)
   lateinit var nickList: RecyclerView
 
@@ -38,12 +34,6 @@ class NickListFragment : ServiceBoundFragment() {
   @Inject
   lateinit var ircFormatDeserializer: IrcFormatDeserializer
 
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-
-    viewModel = ViewModelProviders.of(activity!!)[QuasselViewModel::class.java]
-  }
-
   override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                             savedInstanceState: Bundle?): View? {
     val view = inflater.inflate(R.layout.fragment_nick_list, container, false)

app/src/main/java/de/kuschku/quasseldroid/ui/settings/SettingsActivity.kt

@@ -15,6 +15,7 @@ abstract class SettingsActivity(private val fragment: Fragment? = null) : Servic
   lateinit var toolbar: Toolbar
 
   override fun onCreate(savedInstanceState: Bundle?) {
+    val arguments = intent.extras
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_settings)
     ButterKnife.bind(this)
@@ -26,6 +27,7 @@ abstract class SettingsActivity(private val fragment: Fragment? = null) : Servic
 
     if (fragment != null) {
       val transaction = supportFragmentManager.beginTransaction()
+      fragment.arguments = arguments
       transaction.replace(R.id.fragment_container, fragment)
       transaction.commit()
     }

app/src/main/java/de/kuschku/quasseldroid/ui/settings/license/LicenseSettingsActivity.kt

 package de.kuschku.quasseldroid.ui.settings.license
 
-import android.os.Bundle
 import de.kuschku.quasseldroid.ui.settings.SettingsActivity
 
-class LicenseSettingsActivity : SettingsActivity() {
-  private lateinit var arguments: Bundle
+class LicenseSettingsActivity : SettingsActivity()
\ No newline at end of file
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    arguments = intent.extras
-    super.onCreate(savedInstanceState)
-  }
-
-  override fun fragment(): LicenseSettingsFragment {
-    val fragment = LicenseSettingsFragment()
-    fragment.arguments = arguments
-    return fragment
-  }
-}
\ No newline at end of file

app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountSelectionSlide.kt

@@ -44,9 +44,7 @@ class AccountSelectionSlide : SlideFragment() {
                                savedInstanceState: Bundle?): View {
     val view = inflater.inflate(R.layout.setup_select_account, container, false)
     ButterKnife.bind(this, view)
-    val accountViewModel = ViewModelProviders.of(this).get(
-      AccountViewModel::class.java
-    )
+    val accountViewModel = ViewModelProviders.of(this).get(AccountViewModel::class.java)
     val firstObserver = object : Observer<List<AccountDatabase.Account>?> {
       override fun onChanged(t: List<AccountDatabase.Account>?) {
         if (t?.isEmpty() != false)

app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundActivity.kt

 package de.kuschku.quasseldroid.util.service
 
 import android.app.Activity
+import android.arch.lifecycle.ViewModelProviders
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -25,6 +26,7 @@ import de.kuschku.quasseldroid.settings.Settings
 import de.kuschku.quasseldroid.ui.setup.accounts.selection.AccountSelectionActivity
 import de.kuschku.quasseldroid.util.helper.sharedPreferences
 import de.kuschku.quasseldroid.util.helper.updateRecentsHeaderIfExisting
+import de.kuschku.quasseldroid.viewmodel.QuasselViewModel
 import io.reactivex.subjects.BehaviorSubject
 import javax.inject.Inject
 
@@ -77,6 +79,8 @@ abstract class ServiceBoundActivity : AppCompatActivity(),
   @Inject
   lateinit var connectionSettings: ConnectionSettings
 
+  protected lateinit var viewModel: QuasselViewModel
+
   protected var accountId: Long = -1
 
   private var startedSelection = false
@@ -88,6 +92,9 @@ abstract class ServiceBoundActivity : AppCompatActivity(),
 
     checkConnection()
 
+    viewModel = ViewModelProviders.of(this)[QuasselViewModel::class.java]
+    viewModel.backendWrapper.onNext(this.backend)
+
     setTheme(appearanceSettings.theme.style)
     super.onCreate(savedInstanceState)
     updateRecentsHeader()

app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundFragment.kt

 package de.kuschku.quasseldroid.util.service
 
+import android.arch.lifecycle.ViewModelProviders
 import android.content.Context
 import android.os.Bundle
 import dagger.android.support.DaggerFragment
 import de.kuschku.libquassel.session.Backend
 import de.kuschku.libquassel.util.Optional
 import de.kuschku.quasseldroid.Keys
+import de.kuschku.quasseldroid.viewmodel.QuasselViewModel
 import io.reactivex.subjects.BehaviorSubject
 
 abstract class ServiceBoundFragment : DaggerFragment() {
@@ -13,6 +15,8 @@ abstract class ServiceBoundFragment : DaggerFragment() {
   protected val backend: BehaviorSubject<Optional<Backend>>
     get() = connection.backend
 
+  protected lateinit var viewModel: QuasselViewModel
+
   protected fun runInBackground(f: () -> Unit) {
     connection.backend.value.ifPresent {
       it.sessionManager().handlerService.backend(f)
@@ -27,6 +31,11 @@ abstract class ServiceBoundFragment : DaggerFragment() {
 
   protected var accountId: Long = -1
 
+  override fun onAttach(context: Context?) {
+    super.onAttach(context)
+    viewModel = ViewModelProviders.of(requireActivity())[QuasselViewModel::class.java]
+  }
+
   override fun onCreate(savedInstanceState: Bundle?) {
     accountId = context?.getSharedPreferences(Keys.Status.NAME, Context.MODE_PRIVATE)
       ?.getLong(Keys.Status.selectedAccount, -1) ?: -1