From 1a811d09179ba1beefeaebc1fa2a70466e8f2c14 Mon Sep 17 00:00:00 2001
From: NerdNumber9 <nerd.number9@yandex.com>
Date: Fri, 8 Dec 2017 18:21:26 -0500
Subject: [PATCH] Code cleanup Release v6.6.0 Cleanup changelog

---
 CHANGELOG.md                                    |  1 +
 app/build.gradle                                |  4 ++--
 .../ui/setting/SettingsAboutController.kt       | 17 -----------------
 .../java/exh/ui/batchadd/BatchAddController.kt  |  4 ++--
 app/src/main/java/exh/ui/lock/LockController.kt |  4 ++--
 .../main/java/exh/ui/login/LoginController.kt   |  5 ++---
 6 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2eaedb2e..3ae4cea7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+### 6.6.0
 - Many performance improvements
 - Stability improvements and bug fixes
 - Upstream merge
diff --git a/app/build.gradle b/app/build.gradle
index 6910704d0..cb669983d 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,8 +40,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 26
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        versionCode 6104
-        versionName "v6.1.4-EH"
+        versionCode 6600
+        versionName "v6.6.0-EH"
 
         buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
         buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAboutController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAboutController.kt
index 1c79f9a58..e8d231c23 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAboutController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAboutController.kt
@@ -1,8 +1,6 @@
 package eu.kanade.tachiyomi.ui.setting
 
 import android.app.Dialog
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.support.v7.preference.PreferenceScreen
 import android.view.View
@@ -43,12 +41,6 @@ class SettingsAboutController : SettingsController() {
     override fun setupPreferenceScreen(screen: PreferenceScreen) = with(screen) {
         titleRes = R.string.pref_category_about
 
-        switchPreference {
-            key = "acra.enable"
-            titleRes = R.string.pref_enable_acra
-            summaryRes = R.string.pref_acra_summary
-            defaultValue = true
-        }
         switchPreference {
             key = Keys.automaticUpdates
             titleRes = R.string.pref_enable_automatic_updates
@@ -69,15 +61,6 @@ class SettingsAboutController : SettingsController() {
                 isVisible = false
             }
         }
-        preference {
-            title = "Discord"
-            val url = "https://discord.gg/2dDQBv2"
-            summary = url
-            onClick {
-                val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-                startActivity(intent)
-            }
-        }
         preference {
             titleRes = R.string.version
             summary = if (BuildConfig.DEBUG)
diff --git a/app/src/main/java/exh/ui/batchadd/BatchAddController.kt b/app/src/main/java/exh/ui/batchadd/BatchAddController.kt
index bad59e8e2..76a9864b5 100755
--- a/app/src/main/java/exh/ui/batchadd/BatchAddController.kt
+++ b/app/src/main/java/exh/ui/batchadd/BatchAddController.kt
@@ -26,8 +26,8 @@ class BatchAddController : NucleusController<BatchAddPresenter>() {
 
     override fun createPresenter() = BatchAddPresenter()
 
-    override fun onViewCreated(view: View, savedViewState: Bundle?) {
-        super.onViewCreated(view, savedViewState)
+    override fun onViewCreated(view: View) {
+        super.onViewCreated(view)
 
         with(view) {
             btn_add_galleries.clicks().subscribeUntilDestroy {
diff --git a/app/src/main/java/exh/ui/lock/LockController.kt b/app/src/main/java/exh/ui/lock/LockController.kt
index 4ab9621dd..545387ffa 100755
--- a/app/src/main/java/exh/ui/lock/LockController.kt
+++ b/app/src/main/java/exh/ui/lock/LockController.kt
@@ -37,8 +37,8 @@ class LockController : NucleusController<LockPresenter>() {
 
     override fun getTitle() = "Application locked"
 
-    override fun onViewCreated(view: View, savedViewState: Bundle?) {
-        super.onViewCreated(view, savedViewState)
+    override fun onViewCreated(view: View) {
+        super.onViewCreated(view)
 
         if(!lockEnabled(prefs)) {
             closeLock()
diff --git a/app/src/main/java/exh/ui/login/LoginController.kt b/app/src/main/java/exh/ui/login/LoginController.kt
index 7b495fb63..a6b273433 100755
--- a/app/src/main/java/exh/ui/login/LoginController.kt
+++ b/app/src/main/java/exh/ui/login/LoginController.kt
@@ -2,7 +2,6 @@ package exh.ui.login
 
 import android.net.Uri
 import android.os.Build
-import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -40,8 +39,8 @@ class LoginController : NucleusController<LoginPresenter>() {
     override fun inflateView(inflater: LayoutInflater, container: ViewGroup) =
             inflater.inflate(R.layout.eh_activity_login, container, false)!!
 
-    override fun onViewCreated(view: View, savedViewState: Bundle?) {
-        super.onViewCreated(view, savedViewState)
+    override fun onViewCreated(view: View) {
+        super.onViewCreated(view)
 
         with(view) {
             btn_cancel.setOnClickListener { router.popCurrentController() }