diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1ddf..56883e31 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index d9f5c3f1..4b25e81b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,9 +5,12 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlinx-serialization'
if (file("google-services.json").exists()) {
+ logger.lifecycle("Firebase Enabled")
apply plugin: 'com.google.gms.google-services'
apply plugin: 'io.fabric'
apply plugin: 'com.google.firebase.firebase-perf'
+} else {
+ logger.lifecycle("Firebase Disabled")
}
android {
@@ -16,8 +19,8 @@ android {
applicationId "xyz.quaver.pupil"
minSdkVersion 16
targetSdkVersion 29
- versionCode 31
- versionName "4.2"
+ versionCode 32
+ versionName "4.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
index 5aabc92d..6b657d69 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -18,7 +18,6 @@
package xyz.quaver.pupil.ui
-import android.Manifest
import android.content.Intent
import android.graphics.drawable.Animatable
import android.graphics.drawable.Drawable
@@ -50,7 +49,6 @@ import xyz.quaver.pupil.adapters.ReaderAdapter
import xyz.quaver.pupil.util.GalleryDownloader
import xyz.quaver.pupil.util.Histories
import xyz.quaver.pupil.util.ItemClickSupport
-import xyz.quaver.pupil.util.hasPermission
class ReaderActivity : AppCompatActivity() {
@@ -373,17 +371,6 @@ class ReaderActivity : AppCompatActivity() {
with(reader_fab_download) {
setImageResource(R.drawable.ic_download)
setOnClickListener {
-
- if (!this@ReaderActivity.hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
- AlertDialog.Builder(this@ReaderActivity).apply {
- setTitle(R.string.warning)
- setMessage(R.string.update_no_permission)
- setPositiveButton(android.R.string.ok) { _, _ -> }
- }.show()
-
- return@setOnClickListener
- }
-
downloader.download = !downloader.download
if (!downloader.download)
diff --git a/app/src/main/java/xyz/quaver/pupil/util/misc.kt b/app/src/main/java/xyz/quaver/pupil/util/misc.kt
index 87b38bb6..81dbb368 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/misc.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/misc.kt
@@ -18,24 +18,16 @@
package xyz.quaver.pupil.util
-import android.content.Context
-import android.content.pm.PackageManager
-import android.os.Build
-import androidx.core.content.ContextCompat
import java.util.*
import kotlin.collections.ArrayList
import kotlin.math.round
-//Android Q+ uses scoped storage thus not requiring permission
-fun Context.hasPermission(permission: String) =
- Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q || ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED
-
@UseExperimental(ExperimentalStdlibApi::class)
fun String.wordCapitalize() : String {
val result = ArrayList()
for (word in this.split(" "))
- result.add(word.capitalize(Locale.getDefault()))
+ result.add(word.capitalize(Locale.US))
return result.joinToString(" ")
}