Access client settings, crashes and about from setup screen

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

@@ -2,9 +2,9 @@ package de.kuschku.quasseldroid.ui.chat.info.channel
 
 import android.content.Context
 import android.content.Intent
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class ChannelInfoActivity : SettingsActivity(ChannelInfoFragment()) {
+class ChannelInfoActivity : ServiceBoundSettingsActivity(ChannelInfoFragment()) {
   companion object {
     fun launch(
       context: Context,

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

@@ -4,9 +4,9 @@ import android.content.Context
 import android.content.Intent
 import de.kuschku.libquassel.protocol.BufferId
 import de.kuschku.libquassel.protocol.NetworkId
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class UserInfoActivity : SettingsActivity(UserInfoFragment()) {
+class UserInfoActivity : ServiceBoundSettingsActivity(UserInfoFragment()) {
   companion object {
     fun launch(
       context: Context,

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

@@ -2,9 +2,9 @@ package de.kuschku.quasseldroid.ui.chat.topic
 
 import android.content.Context
 import android.content.Intent
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class TopicActivity : SettingsActivity(TopicFragment()) {
+class TopicActivity : ServiceBoundSettingsActivity(TopicFragment()) {
   companion object {
     fun launch(
       context: Context,

app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/app/AppSettingsActivity.kt

@@ -2,31 +2,9 @@ package de.kuschku.quasseldroid.ui.clientsettings.app
 
 import android.content.Context
 import android.content.Intent
-import android.view.Menu
-import android.view.MenuItem
-import de.kuschku.quasseldroid.R
-import de.kuschku.quasseldroid.ui.clientsettings.about.AboutSettingsActivity
-import de.kuschku.quasseldroid.ui.clientsettings.crash.CrashSettingsActivity
 import de.kuschku.quasseldroid.util.ui.SettingsActivity
 
 class AppSettingsActivity : SettingsActivity(AppSettingsFragment()) {
-  override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-    menuInflater.inflate(R.menu.activity_settings, menu)
-    return super.onCreateOptionsMenu(menu)
-  }
-
-  override fun onOptionsItemSelected(item: MenuItem?) = when (item?.itemId) {
-    R.id.action_about   -> {
-      AboutSettingsActivity.launch(this)
-      true
-    }
-    R.id.action_crashes -> {
-      CrashSettingsActivity.launch(this)
-      true
-    }
-    else                -> super.onOptionsItemSelected(item)
-  }
-
   companion object {
     fun launch(context: Context) = context.startActivity(intent(context))
     fun intent(context: Context) = Intent(context, AppSettingsActivity::class.java)

app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/app/AppSettingsFragment.kt

@@ -5,9 +5,14 @@ import android.os.Bundle
 import android.support.v7.preference.ListPreference
 import android.support.v7.preference.Preference
 import android.support.v7.preference.PreferenceGroup
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import de.kuschku.quasseldroid.R
 import de.kuschku.quasseldroid.settings.AppearanceSettings
 import de.kuschku.quasseldroid.settings.Settings
+import de.kuschku.quasseldroid.ui.clientsettings.about.AboutSettingsActivity
+import de.kuschku.quasseldroid.ui.clientsettings.crash.CrashSettingsActivity
 import de.kuschku.quasseldroid.util.backport.DaggerPreferenceFragmentCompat
 import javax.inject.Inject
 
@@ -16,6 +21,11 @@ class AppSettingsFragment : DaggerPreferenceFragmentCompat(),
   @Inject
   lateinit var appearanceSettings: AppearanceSettings
 
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setHasOptionsMenu(true)
+  }
+
   override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
     setPreferencesFromResource(R.xml.preferences, rootKey)
   }
@@ -51,4 +61,21 @@ class AppSettingsFragment : DaggerPreferenceFragmentCompat(),
       updateSummary(preference)
     }
   }
+
+  override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+    inflater?.inflate(R.menu.activity_settings, menu)
+    super.onCreateOptionsMenu(menu, inflater)
+  }
+
+  override fun onOptionsItemSelected(item: MenuItem?) = when (item?.itemId) {
+    R.id.action_about   -> {
+      AboutSettingsActivity.launch(requireContext())
+      true
+    }
+    R.id.action_crashes -> {
+      CrashSettingsActivity.launch(requireContext())
+      true
+    }
+    else                -> super.onOptionsItemSelected(item)
+  }
 }

app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashSettingsFragment.kt

@@ -13,13 +13,13 @@ import butterknife.BindView
 import butterknife.ButterKnife
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
+import dagger.android.support.DaggerFragment
 import de.kuschku.malheur.data.Report
 import de.kuschku.quasseldroid.R
 import de.kuschku.quasseldroid.util.helper.fromJson
-import de.kuschku.quasseldroid.util.service.ServiceBoundFragment
 import java.io.File
 
-class CrashSettingsFragment : ServiceBoundFragment() {
+class CrashSettingsFragment : DaggerFragment() {
   @BindView(R.id.list)
   lateinit var list: RecyclerView
 
@@ -85,7 +85,7 @@ class CrashSettingsFragment : ServiceBoundFragment() {
 
   override fun onOptionsItemSelected(item: MenuItem?) = when (item?.itemId) {
     R.id.action_delete_all -> {
-      runInBackground {
+      handler.post {
         crashDir?.mkdirs()
         crashDir?.listFiles()?.forEach {
           it.delete()

app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsActivity.kt

@@ -2,9 +2,9 @@ package de.kuschku.quasseldroid.ui.coresettings
 
 import android.content.Context
 import android.content.Intent
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class CoreSettingsActivity : SettingsActivity(CoreSettingsFragment()) {
+class CoreSettingsActivity : ServiceBoundSettingsActivity(CoreSettingsFragment()) {
   companion object {
     fun launch(context: Context) = context.startActivity(intent(context))
     fun intent(context: Context) = Intent(context, CoreSettingsActivity::class.java)

app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemActivity.kt

@@ -3,9 +3,9 @@ package de.kuschku.quasseldroid.ui.coresettings.aliasitem
 import android.content.Context
 import android.content.Intent
 import de.kuschku.libquassel.quassel.syncables.interfaces.IAliasManager
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class AliasItemActivity : SettingsActivity(AliasItemFragment()) {
+class AliasItemActivity : ServiceBoundSettingsActivity(AliasItemFragment()) {
   companion object {
     fun launch(
       context: Context,

app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListActivity.kt

@@ -2,9 +2,9 @@ package de.kuschku.quasseldroid.ui.coresettings.aliaslist
 
 import android.content.Context
 import android.content.Intent
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class AliasListActivity : SettingsActivity(AliasListFragment()) {
+class AliasListActivity : ServiceBoundSettingsActivity(AliasListFragment()) {
   companion object {
     fun launch(context: Context) = context.startActivity(intent(context))
     fun intent(context: Context) = Intent(context, AliasListActivity::class.java)

app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistCreateActivity.kt

@@ -2,9 +2,9 @@ package de.kuschku.quasseldroid.ui.coresettings.chatlist
 
 import android.content.Context
 import android.content.Intent
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class ChatlistCreateActivity : SettingsActivity(ChatListCreateFragment()) {
+class ChatlistCreateActivity : ServiceBoundSettingsActivity(ChatListCreateFragment()) {
   companion object {
     fun launch(context: Context) = context.startActivity(intent(context))
     fun intent(context: Context) = Intent(context, ChatlistCreateActivity::class.java)

app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistEditActivity.kt

@@ -2,9 +2,9 @@ package de.kuschku.quasseldroid.ui.coresettings.chatlist
 
 import android.content.Context
 import android.content.Intent
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class ChatlistEditActivity : SettingsActivity(ChatListEditFragment()) {
+class ChatlistEditActivity : ServiceBoundSettingsActivity(ChatListEditFragment()) {
   companion object {
     fun launch(
       context: Context,

app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListActivity.kt

@@ -2,9 +2,9 @@ package de.kuschku.quasseldroid.ui.coresettings.highlightlist
 
 import android.content.Context
 import android.content.Intent
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class HighlightListActivity : SettingsActivity(HighlightListFragment()) {
+class HighlightListActivity : ServiceBoundSettingsActivity(HighlightListFragment()) {
   companion object {
     fun launch(context: Context) = context.startActivity(intent(context))
     fun intent(context: Context) = Intent(context, HighlightListActivity::class.java)

app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightrule/HighlightRuleActivity.kt

@@ -3,9 +3,9 @@ package de.kuschku.quasseldroid.ui.coresettings.highlightrule
 import android.content.Context
 import android.content.Intent
 import de.kuschku.libquassel.quassel.syncables.HighlightRuleManager
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class HighlightRuleActivity : SettingsActivity(HighlightRuleFragment()) {
+class HighlightRuleActivity : ServiceBoundSettingsActivity(HighlightRuleFragment()) {
   companion object {
     fun launch(
       context: Context,

app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityCreateActivity.kt

@@ -2,9 +2,9 @@ package de.kuschku.quasseldroid.ui.coresettings.identity
 
 import android.content.Context
 import android.content.Intent
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class IdentityCreateActivity : SettingsActivity(IdentityCreateFragment()) {
+class IdentityCreateActivity : ServiceBoundSettingsActivity(IdentityCreateFragment()) {
   companion object {
     fun launch(context: Context) = context.startActivity(intent(context))
     fun intent(context: Context) = Intent(context, IdentityCreateActivity::class.java)

app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityEditActivity.kt

@@ -3,9 +3,9 @@ package de.kuschku.quasseldroid.ui.coresettings.identity
 import android.content.Context
 import android.content.Intent
 import de.kuschku.libquassel.protocol.IdentityId
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class IdentityEditActivity : SettingsActivity(IdentityEditFragment()) {
+class IdentityEditActivity : ServiceBoundSettingsActivity(IdentityEditFragment()) {
   companion object {
     fun launch(
       context: Context,

app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreItemActivity.kt

@@ -3,9 +3,9 @@ package de.kuschku.quasseldroid.ui.coresettings.ignoreitem
 import android.content.Context
 import android.content.Intent
 import de.kuschku.libquassel.quassel.syncables.IgnoreListManager
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class IgnoreItemActivity : SettingsActivity(IgnoreItemFragment()) {
+class IgnoreItemActivity : ServiceBoundSettingsActivity(IgnoreItemFragment()) {
   companion object {
     fun launch(
       context: Context,

app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListActivity.kt

@@ -2,9 +2,9 @@ package de.kuschku.quasseldroid.ui.coresettings.ignorelist
 
 import android.content.Context
 import android.content.Intent
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class IgnoreListActivity : SettingsActivity(IgnoreListFragment()) {
+class IgnoreListActivity : ServiceBoundSettingsActivity(IgnoreListFragment()) {
   companion object {
     fun launch(context: Context) = context.startActivity(intent(context))
     fun intent(context: Context) = Intent(context, IgnoreListActivity::class.java)

app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkCreateActivity.kt

@@ -2,9 +2,9 @@ package de.kuschku.quasseldroid.ui.coresettings.network
 
 import android.content.Context
 import android.content.Intent
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class NetworkCreateActivity : SettingsActivity(NetworkCreateFragment()) {
+class NetworkCreateActivity : ServiceBoundSettingsActivity(NetworkCreateFragment()) {
   companion object {
     fun launch(context: Context) = context.startActivity(intent(context))
     fun intent(context: Context) = Intent(context, NetworkCreateActivity::class.java)

app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkEditActivity.kt

@@ -3,9 +3,9 @@ package de.kuschku.quasseldroid.ui.coresettings.network
 import android.content.Context
 import android.content.Intent
 import de.kuschku.libquassel.protocol.NetworkId
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class NetworkEditActivity : SettingsActivity(NetworkEditFragment()) {
+class NetworkEditActivity : ServiceBoundSettingsActivity(NetworkEditFragment()) {
   companion object {
     fun launch(
       context: Context,

app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkconfig/NetworkConfigActivity.kt

@@ -2,9 +2,9 @@ package de.kuschku.quasseldroid.ui.coresettings.networkconfig
 
 import android.content.Context
 import android.content.Intent
-import de.kuschku.quasseldroid.util.ui.SettingsActivity
+import de.kuschku.quasseldroid.util.ui.ServiceBoundSettingsActivity
 
-class NetworkConfigActivity : SettingsActivity(NetworkConfigFragment()) {
+class NetworkConfigActivity : ServiceBoundSettingsActivity(NetworkConfigFragment()) {
   companion object {
     fun launch(context: Context) = context.startActivity(intent(context))
     fun intent(context: Context) = Intent(context, NetworkConfigActivity::class.java)