From 7274498462f66bcc028af489a483808734e850a7 Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Thu, 9 Jan 2020 21:03:13 -0800
Subject: [PATCH] Fixed downloads not being deleted after reading

Fixed dark theme maybe
---
 .../tachiyomi/data/download/DownloadPendingDeleter.kt       | 6 ++++--
 .../eu/kanade/tachiyomi/network/CloudflareInterceptor.kt    | 2 +-
 app/src/main/res/drawable/splash_background.xml             | 5 ++---
 app/src/main/res/values-night/colors.xml                    | 1 +
 app/src/main/res/values/colors.xml                          | 3 +--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt
index a7ce329a8a..1a0b29311a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadPendingDeleter.kt
@@ -146,7 +146,8 @@ class DownloadPendingDeleter(context: Context) {
     private data class ChapterEntry(
             val id: Long,
             val url: String,
-            val name: String
+            val name: String,
+            val scanlator: String?
     )
 
     /**
@@ -170,7 +171,7 @@ class DownloadPendingDeleter(context: Context) {
      * Returns a chapter entry from a chapter model.
      */
     private fun Chapter.toEntry(): ChapterEntry {
-        return ChapterEntry(id!!, url, name)
+        return ChapterEntry(id!!, url, name, scanlator)
     }
 
     /**
@@ -188,6 +189,7 @@ class DownloadPendingDeleter(context: Context) {
     private fun ChapterEntry.toModel(): Chapter {
         return Chapter.create().also {
             it.id = id
+            it.scanlator = scanlator
             it.url = url
             it.name = name
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt b/app/src/main/java/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt
index ec66d2df40..b6ac0475c2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt
@@ -71,7 +71,7 @@ class CloudflareInterceptor(private val context: Context) : Interceptor {
         val headers = request.headers.toMultimap().mapValues { it.value.getOrNull(0) ?: "" }
 
         handler.post {
-            val view = WebView(context)
+            val view = WebView(context.applicationContext)
             webView = view
             view.settings.javaScriptEnabled = true
             view.settings.userAgentString = request.header("User-Agent")
diff --git a/app/src/main/res/drawable/splash_background.xml b/app/src/main/res/drawable/splash_background.xml
index ff5ff95ead..7186c59ae3 100644
--- a/app/src/main/res/drawable/splash_background.xml
+++ b/app/src/main/res/drawable/splash_background.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@color/cardBackground" />
+    <item android:drawable="@color/splashBackground" />
 
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@drawable/splash_icon"
-            android:tint="@color/snackbarBackground"/>
+            android:src="@drawable/splash_icon"/>
     </item>
 
 </layer-list>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index e8658d3fc4..94ab3f0559 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -8,4 +8,5 @@
     <color name="rippleColor">@color/md_white_1000_20</color>
     <color name="dialogBackground">@color/md_grey_800</color>
     <color name="colorAccent">#3399FF</color>
+    <color name="splashBackground">@color/colorDarkPrimary</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c6d3a2a970..760f7a559f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,6 +6,7 @@
     <color name="drawerHighlight">@color/md_black_1000_12</color>
     <color name="drawerPrimary">@color/colorPrimary</color>
     <color name="cardBackground">#FFFFFF</color>
+    <color name="splashBackground">#455A64</color>
     <color name="snackbarBackground">#323232</color>
     <color name="trueSnackbarBackground">#323232</color>
     <color name="dialogBackground">@color/md_white_1000</color>
@@ -16,8 +17,6 @@
     <color name="colorDarkPrimaryDark">#212121</color>
     <color name="colorAmoledPrimary">@color/md_black_1000</color>
 
-    <color name="colorSplash">#455A64</color>
-
     <!-- Light Theme -->
     <color name="colorAccentLight">@color/md_blue_A400</color>
     <color name="textColorPrimaryLight">@color/md_black_1000_87</color>