diff --git a/app/build.gradle b/app/build.gradle index 9aecd601..00058f24 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,7 +14,7 @@ android { minSdkVersion 16 targetSdkVersion 29 versionCode 27 - versionName "3.2-beta2" + versionName "3.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true vectorDrawables.useSupportLibrary = true @@ -25,7 +25,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } buildTypes.each { - it.buildConfigField('boolean', 'PRERELEASE', 'true') + it.buildConfigField('boolean', 'PRERELEASE', 'false') it.buildConfigField('boolean', 'CENSOR', 'false') } } diff --git a/app/release/output.json b/app/release/output.json index 16d1dc23..0c2ac805 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":25,"versionName":"3.1","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":27,"versionName":"3.2","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/ui/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt index d88a7eef..85b29f8f 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt @@ -282,7 +282,7 @@ class ReaderActivity : AppCompatActivity() { onErrorHandler = { Snackbar .make(reader_layout, it.message ?: it.javaClass.name, Snackbar.LENGTH_INDEFINITE) - .setAction(R.string.reader_help) { _ -> + .setAction(R.string.reader_help) { startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.error_help)))) } .show() diff --git a/app/src/main/java/xyz/quaver/pupil/util/update.kt b/app/src/main/java/xyz/quaver/pupil/util/update.kt index 6acfaf75..1c48f8e5 100644 --- a/app/src/main/java/xyz/quaver/pupil/util/update.kt +++ b/app/src/main/java/xyz/quaver/pupil/util/update.kt @@ -54,7 +54,7 @@ fun checkUpdate(url: String) : JsonObject? { fun getApkUrl(releases: JsonObject) : Pair? { return releases["assets"]?.jsonArray?.firstOrNull { - Regex("Pupil-v(\\d+\\.)+\\d+\\.apk").matches(it.jsonObject["name"]?.content ?: "") + Regex("Pupil-v.+\\.apk").matches(it.jsonObject["name"]?.content ?: "") }.let { if (it == null) null