From b5432cd0b41cdb525f8947afdbc946d6581d2016 Mon Sep 17 00:00:00 2001
From: Pupil <tom5079@naver.com>
Date: Tue, 11 Feb 2020 09:29:58 +0900
Subject: [PATCH] ugh

---
 app/build.gradle                            | 20 +++++++++-----------
 app/release/output.json                     |  2 +-
 app/src/main/java/xyz/quaver/pupil/Pupil.kt |  6 ++++++
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 89f7dced..f0778fdf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,13 +14,13 @@ if (file("google-services.json").exists()) {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
-        targetSdkVersion 28
-        versionCode 37
-        versionName "5.3-hotfix1"
+        targetSdkVersion 29
+        versionCode 41
+        versionName "4.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -41,9 +41,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
     buildToolsVersion = '29.0.2'
 }
 
@@ -60,6 +57,9 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.preference:preference:1.1.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation "androidx.biometric:biometric:1.0.1"
     implementation 'com.android.support:multidex:1.0.3'
     implementation "com.daimajia.swipelayout:library:1.2.0@aar"
@@ -70,15 +70,13 @@ dependencies {
     implementation 'com.github.arimorty:floatingsearchview:2.1.1'
     implementation 'com.github.clans:fab:1.6.4'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
-    kapt 'com.github.bumptech.glide:compiler:4.11.0'
-    implementation('com.github.bumptech.glide:recyclerview-integration:4.11.0') {
+    implementation ("com.github.bumptech.glide:recyclerview-integration:4.10.0") {
         transitive = false
     }
-    implementation 'net.rdrei.android.dirchooser:library:3.2@aar'
-    implementation 'com.gu:option:1.3'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
     implementation "ru.noties.markwon:core:${markwonVersion}"
+    kapt 'com.github.bumptech.glide:compiler:4.11.0'
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test:rules:1.2.0'
diff --git a/app/release/output.json b/app/release/output.json
index cc3bb359..dd112837 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":37,"versionName":"5.3-hotfix1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":41,"versionName":"4.5","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/xyz/quaver/pupil/Pupil.kt b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
index 380ebf26..126b68d9 100644
--- a/app/src/main/java/xyz/quaver/pupil/Pupil.kt
+++ b/app/src/main/java/xyz/quaver/pupil/Pupil.kt
@@ -45,6 +45,12 @@ class Pupil : MultiDexApplication() {
     override fun onCreate() {
         val preference = PreferenceManager.getDefaultSharedPreferences(this)
 
+        try {
+            PreferenceManager.getDefaultSharedPreferences(this).getInt("dl_location", 0)
+        } catch (e: Exception) {
+            preference.edit().remove("dl_location").apply()
+        }
+
         histories = Histories(File(ContextCompat.getDataDir(this), "histories.json"))
         favorites = Histories(File(ContextCompat.getDataDir(this), "favorites.json"))