From a119f9e7941da1957641c020d1550ec986104796 Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Wed, 15 Jan 2020 22:36:08 -0800
Subject: [PATCH] Fixed bug with missing manga order in categoriess

---
 .../tachiyomi/data/database/mappers/CategoryTypeMapping.kt | 2 +-
 .../eu/kanade/tachiyomi/data/database/models/Category.kt   | 6 ++----
 .../eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt     | 7 ++-----
 .../tachiyomi/ui/setting/SettingsLibraryController.kt      | 2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt
index 63ec522cec..718a42f4b0 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt
@@ -60,7 +60,7 @@ class CategoryGetResolver : DefaultGetResolver<Category>() {
         flags = cursor.getInt(cursor.getColumnIndex(COL_FLAGS))
 
         val orderString = cursor.getString(cursor.getColumnIndex(COL_MANGA_ORDER))
-        if (orderString.firstOrNull()?.isLetter() == true) {
+        if (orderString?.firstOrNull()?.isLetter() == true) {
             mangaSort = orderString.first()
             mangaOrder = emptyList()
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt
index 1991e74bb6..7a7e0a243a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt
@@ -27,10 +27,8 @@ interface Category : Serializable {
             this.name = name
         }
 
-        fun createDefault(context: Context): Category = create(context.getString(R.string.default_columns))
-            .apply {
-            id =
-            0 }
+        fun createDefault(): Category = create("Default").apply {
+            id = 0 }
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
index caf2188211..05ed2171ec 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.ui.library
 
 import android.os.Bundle
 import com.jakewharton.rxrelay.BehaviorRelay
-import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.cache.CoverCache
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Category
@@ -12,7 +11,6 @@ import eu.kanade.tachiyomi.data.database.models.MangaImpl
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
-import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
@@ -202,7 +200,7 @@ class LibraryPresenter(
             db.getTotalChapterManga().executeAsBlocking().associate { it.id!! to counter++ }
         }
         val catListing by lazy {
-            val default = Category.createDefault(context)
+            val default = Category.createDefault()
             val defOrder = preferences.defaultMangaOrder().getOrDefault()
             if (defOrder.firstOrNull()?.isLetter() == true) default.mangaSort = defOrder.first()
             else default.mangaOrder = defOrder.split("/").mapNotNull { it.toLongOrNull() }
@@ -286,8 +284,7 @@ class LibraryPresenter(
      */
     private fun getLibraryObservable(): Observable<Library> {
         return Observable.combineLatest(getCategoriesObservable(), getLibraryMangasObservable()) { dbCategories, libraryManga ->
-            val categories = if (libraryManga.containsKey(0)) arrayListOf(Category.createDefault
-                (context.applicationContext)) + dbCategories
+            val categories = if (libraryManga.containsKey(0)) arrayListOf(Category.createDefault()) + dbCategories
             else dbCategories
 
             this.categories = categories
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
index d9f7a16b17..33ef97cd22 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
@@ -132,7 +132,7 @@ class SettingsLibraryController : SettingsController() {
             key = Keys.defaultCategory
             titleRes = R.string.default_category
 
-            val categories = listOf(Category.createDefault(context)) + dbCategories
+            val categories = listOf(Category.createDefault()) + dbCategories
             entries = listOf(context.getString(R.string.default_category_summary)) +
                 categories.map { it.name }.toTypedArray()
             entryValues = listOf(-1) + categories.mapNotNull { it.id }.toList()