From c437a33f2aba022358b979c2571987e924cd7b52 Mon Sep 17 00:00:00 2001
From: inorichi <len@kanade.eu>
Date: Sat, 11 Nov 2017 15:31:32 +0100
Subject: [PATCH] A few fixes and dependency updates

---
 app/build.gradle                              |  6 +--
 .../data/backup/BackupRestoreService.kt       | 38 ++++++++++---------
 .../catalogue/main/CatalogueMainController.kt |  2 +-
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3e0b6b543d..9385300e13 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -156,7 +156,7 @@ dependencies {
 
     // Job scheduling
     implementation 'com.evernote:android-job:1.2.0'
-    implementation 'com.google.android.gms:play-services-gcm:11.4.2'
+    implementation 'com.google.android.gms:play-services-gcm:11.6.0'
 
     // Changelog
     implementation 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
@@ -173,7 +173,7 @@ dependencies {
     implementation "uy.kohesive.injekt:injekt-core:1.16.1"
 
     // Image library
-    final glide_version = '4.2.0'
+    final glide_version = '4.3.1'
     implementation "com.github.bumptech.glide:glide:$glide_version"
     implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version"
     kapt "com.github.bumptech.glide:compiler:$glide_version"
@@ -182,7 +182,7 @@ dependencies {
     implementation 'jp.wasabeef:glide-transformations:3.0.1'
 
     // Logging
-    implementation 'com.jakewharton.timber:timber:4.5.1'
+    implementation 'com.jakewharton.timber:timber:4.6.0'
 
     // Crash reports
     implementation 'ch.acra:acra:4.9.2'
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
index f3db5c9d48..9b3bf89066 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt
@@ -182,29 +182,33 @@ class BackupRestoreService : Service() {
     private fun getRestoreObservable(uri: Uri): Observable<List<Manga>> {
         val startTime = System.currentTimeMillis()
 
-        val reader = JsonReader(contentResolver.openInputStream(uri).bufferedReader())
-        val json = JsonParser().parse(reader).asJsonObject
+        return Observable.just(Unit)
+                .map {
+                    val reader = JsonReader(contentResolver.openInputStream(uri).bufferedReader())
+                    val json = JsonParser().parse(reader).asJsonObject
 
-        // Get parser version
-        val version = json.get(VERSION)?.asInt ?: 1
+                    // Get parser version
+                    val version = json.get(VERSION)?.asInt ?: 1
 
-        // Initialize manager
-        backupManager = BackupManager(this, version)
+                    // Initialize manager
+                    backupManager = BackupManager(this, version)
 
-        val mangasJson = json.get(MANGAS).asJsonArray
+                    val mangasJson = json.get(MANGAS).asJsonArray
 
-        restoreAmount = mangasJson.size() + 1 // +1 for categories
-        restoreProgress = 0
-        errors.clear()
+                    restoreAmount = mangasJson.size() + 1 // +1 for categories
+                    restoreProgress = 0
+                    errors.clear()
 
-        // Restore categories
-        json.get(CATEGORIES)?.let {
-            backupManager.restoreCategories(it.asJsonArray)
-            restoreProgress += 1
-            showRestoreProgress(restoreProgress, restoreAmount, "Categories added", errors.size)
-        }
+                    // Restore categories
+                    json.get(CATEGORIES)?.let {
+                        backupManager.restoreCategories(it.asJsonArray)
+                        restoreProgress += 1
+                        showRestoreProgress(restoreProgress, restoreAmount, "Categories added", errors.size)
+                    }
 
-        return Observable.from(mangasJson)
+                    mangasJson
+                }
+                .flatMap { Observable.from(it) }
                 .concatMap {
                     val obj = it.asJsonObject
                     val manga = backupManager.parser.fromJson<MangaImpl>(obj.get(MANGA))
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/main/CatalogueMainController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/main/CatalogueMainController.kt
index 32fb5d7383..76ea5e513b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/main/CatalogueMainController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/main/CatalogueMainController.kt
@@ -234,5 +234,5 @@ class CatalogueMainController : NucleusController<CatalogueMainPresenter>(),
         }
     }
 
-    private class SettingsSourcesFadeChangeHandler : FadeChangeHandler()
+    class SettingsSourcesFadeChangeHandler : FadeChangeHandler()
 }
\ No newline at end of file