From 3dd10df45ee6049070585e81ad1bbbda5842915f Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Mon, 12 Oct 2020 23:03:38 -0400
Subject: [PATCH] Likely fixed the full backup crashing for some users

---
 .../kanade/tachiyomi/data/backup/full/FullBackupManager.kt  | 6 +++---
 .../tachiyomi/data/backup/full/models/BackupSavedSearch.kt  | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
index ee05a59e4..eb11be660 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
@@ -168,7 +168,7 @@ class FullBackupManager(val context: Context) : AbstractBackupManager() {
             BackupSavedSearch(
                 content.name,
                 content.query,
-                content.filters,
+                content.filters.toString(),
                 sourceId
             )
         }
@@ -494,7 +494,7 @@ class FullBackupManager(val context: Context) : AbstractBackupManager() {
             BackupSavedSearch(
                 content.name,
                 content.query,
-                content.filters,
+                content.filters.toString(),
                 sourceId
             )
         }
@@ -508,7 +508,7 @@ class FullBackupManager(val context: Context) : AbstractBackupManager() {
                                 JsonSavedSearch(
                                     it.name,
                                     it.query,
-                                    it.filterList
+                                    Json.decodeFromString(it.filterList)
                                 )
                             )
                         } + preferences.eh_savedSearches().get()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupSavedSearch.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupSavedSearch.kt
index 81121c8e4..e9f366020 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupSavedSearch.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupSavedSearch.kt
@@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.data.backup.full.models
 
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.buildJsonArray
 import kotlinx.serialization.protobuf.ProtoNumber
 
 /*
@@ -14,6 +12,6 @@ import kotlinx.serialization.protobuf.ProtoNumber
 data class BackupSavedSearch(
     @ProtoNumber(1) val name: String,
     @ProtoNumber(2) val query: String = "",
-    @ProtoNumber(3) val filterList: JsonArray = buildJsonArray {},
+    @ProtoNumber(3) val filterList: String = "",
     @ProtoNumber(4) val source: Long = 0
 )