From b69af710ad7c4a52e60d453d896d28dbe9487fbc Mon Sep 17 00:00:00 2001
From: NerdNumber9 <nerd.number9@yandex.com>
Date: Tue, 17 Apr 2018 15:58:49 -0400
Subject: [PATCH] Release v7.2.2 Fix SimpleDateFormat crashing application on
 older Android OSes Rename preference key (typo)

---
 app/build.gradle                                          | 4 ++--
 .../eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt | 6 +++---
 .../java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt  | 8 +++++++-
 app/src/main/java/exh/metadata/MetadataHelper.kt          | 1 -
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 22f136427..005d10225 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,8 +40,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 27
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        versionCode 7200
-        versionName "v7.2.0-EH"
+        versionCode 7202
+        versionName "v7.2.2-EH"
 
         buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
         buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
index d81a0b9c2..9b5e7cace 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
@@ -155,11 +155,11 @@ object PreferenceKeys {
 
     const val eh_showSettingsUploadWarning = "eh_showSettingsUploadWarning1"
 
-    const val eh_hl_earlyRefresh = "eh_lh_early_refresh"
+    const val eh_hl_earlyRefresh = "eh_hl_early_refresh"
 
-    const val eh_hl_refreshFrequency = "eh_lh_refresh_frequency"
+    const val eh_hl_refreshFrequency = "eh_hl_refresh_frequency"
 
-    const val eh_hl_lastRefresh = "eh_lh_last_refresh"
+    const val eh_hl_lastRefresh = "eh_hl_last_refresh"
 
     const val eh_hl_lastRealmIndex = "eh_hl_lastRealmIndex"
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt
index 87306a003..93fad2a70 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt
@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.source.online.all
 
 import android.content.Context
+import android.os.Build
 import android.os.HandlerThread
 import com.github.salomonbrys.kotson.*
 import com.google.gson.JsonObject
@@ -688,7 +689,12 @@ class Hitomi(private val context: Context)
         private val GALLERY_CHUNK_COUNT = 20
         private val IMAGE_RESOLVER_URL_VAR = "%IMAGE_URL%"
         private val NOT_AVAILABLE = "N/A"
-        private val DATE_FORMAT = SimpleDateFormat("yyyy-MM-dd HH:mm:ssX", Locale.US)
+        private val DATE_FORMAT by lazy {
+            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+                SimpleDateFormat("yyyy-MM-dd HH:mm:ssX", Locale.US)
+            else
+            SimpleDateFormat("yyyy-MM-dd HH:mm:ss'-05'", Locale.US)
+        }
         private val IMAGE_RESOLVER = """
             (function() {
 var adapose = false; // Currently not sure what this does, it switches out frontend URL when we right click???
diff --git a/app/src/main/java/exh/metadata/MetadataHelper.kt b/app/src/main/java/exh/metadata/MetadataHelper.kt
index 9f625519f..092a1d54f 100755
--- a/app/src/main/java/exh/metadata/MetadataHelper.kt
+++ b/app/src/main/java/exh/metadata/MetadataHelper.kt
@@ -1,6 +1,5 @@
 package exh.metadata
 
-import eu.kanade.tachiyomi.R.string.name
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.LewdSource