Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
62dce26c73 | ||
|
|
ac0cff62d4 | ||
|
|
655c060814 | ||
|
|
36d27895e7 | ||
|
|
803481f74c | ||
|
|
b3ca1686e3 | ||
|
|
8f220eb0cb | ||
|
|
51d5f42e8b | ||
|
|
8d8c5ace61 | ||
|
|
4bb6b8ccc9 |
17
.idea/deploymentTargetDropDown.xml
generated
Normal file
17
.idea/deploymentTargetDropDown.xml
generated
Normal file
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="deploymentTargetDropDown">
|
||||
<runningDeviceTargetSelectedWithDropDown>
|
||||
<Target>
|
||||
<type value="RUNNING_DEVICE_TARGET" />
|
||||
<deviceKey>
|
||||
<Key>
|
||||
<type value="VIRTUAL_DEVICE_PATH" />
|
||||
<value value="$USER_HOME$/.android/avd/Pixel_2_API_31.avd" />
|
||||
</Key>
|
||||
</deviceKey>
|
||||
</Target>
|
||||
</runningDeviceTargetSelectedWithDropDown>
|
||||
<timeTargetWasSelectedWithDropDown value="2022-01-24T19:20:51.436372Z" />
|
||||
</component>
|
||||
</project>
|
||||
1
.idea/misc.xml
generated
1
.idea/misc.xml
generated
@@ -3,6 +3,7 @@
|
||||
<component name="DesignSurface">
|
||||
<option name="filePathToZoomLevelMap">
|
||||
<map>
|
||||
<entry key="../../../../layout/custom_preview.xml" value="0.2564814814814815" />
|
||||
<entry key="app/src/main/res/layout/reader_activity.xml" value="0.14351851851851852" />
|
||||
</map>
|
||||
</option>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
*Pupil, Hitomi.la viewer for Android*
|
||||
|
||||

|
||||
[](https://github.com/tom5079/Pupil/releases/download/5.2.16/Pupil-v5.2.16.apk)
|
||||
[](https://github.com/tom5079/Pupil/releases/download/5.2.19/Pupil-v5.2.19.apk)
|
||||
[](https://discord.gg/Stj4b5v)
|
||||
|
||||
# Features
|
||||
|
||||
@@ -38,7 +38,7 @@ android {
|
||||
minSdkVersion 16
|
||||
targetSdkVersion 31
|
||||
versionCode 69
|
||||
versionName "5.2.17"
|
||||
versionName "5.2.20"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables.useSupportLibrary = true
|
||||
}
|
||||
@@ -91,6 +91,7 @@ dependencies {
|
||||
implementation "androidx.gridlayout:gridlayout:1.0.0"
|
||||
implementation "androidx.biometric:biometric:1.1.0"
|
||||
implementation "androidx.work:work-runtime-ktx:2.7.1"
|
||||
implementation 'androidx.webkit:webkit:1.4.0'
|
||||
|
||||
implementation "com.daimajia.swipelayout:library:1.2.0@aar"
|
||||
|
||||
@@ -128,8 +129,6 @@ dependencies {
|
||||
|
||||
implementation "org.jsoup:jsoup:1.14.3"
|
||||
|
||||
implementation "com.google.guava:guava:31.0.1-android"
|
||||
|
||||
implementation "xyz.quaver:documentfilex:0.7.2"
|
||||
implementation "xyz.quaver:floatingsearchview:1.1.7"
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
"filters": [],
|
||||
"attributes": [],
|
||||
"versionCode": 69,
|
||||
"versionName": "5.2.17",
|
||||
"versionName": "5.2.20",
|
||||
"outputFile": "app-release.apk"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -112,7 +112,7 @@ class ExampleInstrumentedTest {
|
||||
@Test
|
||||
fun test_getGalleryBlock() {
|
||||
runBlocking {
|
||||
val block = getGalleryBlock(2013877)
|
||||
val block = getGalleryBlock(2119310)
|
||||
|
||||
Log.d("PUPILD", block.toString())
|
||||
}
|
||||
|
||||
@@ -27,11 +27,12 @@ import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import android.util.Log
|
||||
import android.webkit.*
|
||||
import android.widget.Toast
|
||||
import androidx.appcompat.app.AppCompatDelegate
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.preference.PreferenceManager
|
||||
import androidx.webkit.WebViewCompat
|
||||
import com.facebook.imagepipeline.backends.okhttp3.OkHttpImagePipelineConfigFactory
|
||||
import com.github.piasy.biv.BigImageViewer
|
||||
import com.github.piasy.biv.loader.fresco.FrescoImageLoader
|
||||
@@ -42,9 +43,12 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics
|
||||
import kotlinx.coroutines.*
|
||||
import kotlinx.coroutines.flow.MutableSharedFlow
|
||||
import kotlinx.coroutines.flow.asSharedFlow
|
||||
import kotlinx.serialization.decodeFromString
|
||||
import kotlinx.serialization.json.Json
|
||||
import okhttp3.*
|
||||
import xyz.quaver.io.FileX
|
||||
import xyz.quaver.pupil.hitomi.evaluationContext
|
||||
import xyz.quaver.pupil.types.JavascriptException
|
||||
import xyz.quaver.pupil.types.Tag
|
||||
import xyz.quaver.pupil.util.*
|
||||
import java.io.File
|
||||
@@ -81,6 +85,7 @@ val _webViewFlow = MutableSharedFlow<Pair<String, String?>>()
|
||||
val webViewFlow = _webViewFlow.asSharedFlow()
|
||||
var webViewReady = false
|
||||
var webViewFailed = false
|
||||
var oldWebView = false
|
||||
private var reloadJob: Job? = null
|
||||
|
||||
fun reloadWebView() {
|
||||
@@ -89,15 +94,16 @@ fun reloadWebView() {
|
||||
reloadJob = CoroutineScope(Dispatchers.IO).launch {
|
||||
webViewReady = false
|
||||
webViewFailed = false
|
||||
oldWebView = false
|
||||
|
||||
evaluationContext.cancelChildren(CancellationException("reload"))
|
||||
|
||||
runCatching {
|
||||
URL(
|
||||
if (BuildConfig.DEBUG)
|
||||
"https://tom5079.github.io/Pupil/hitomi-dev.html"
|
||||
"https://tom5079.github.io/PupilSources/hitomi-dev.html"
|
||||
else
|
||||
"https://tom5079.github.io/Pupil/hitomi.html"
|
||||
"https://tom5079.github.io/PupilSources/hitomi.html"
|
||||
).readText()
|
||||
}.onFailure {
|
||||
webViewFailed = true
|
||||
@@ -123,9 +129,9 @@ fun reloadWhenFailedOrUpdate() = CoroutineScope(Dispatchers.Default).launch {
|
||||
runCatching {
|
||||
URL(
|
||||
if (BuildConfig.DEBUG)
|
||||
"https://tom5079.github.io/Pupil/hitomi-dev.html.ver"
|
||||
"https://tom5079.github.io/PupilSources/hitomi-dev.html.ver"
|
||||
else
|
||||
"https://tom5079.github.io/Pupil/hitomi.html.ver"
|
||||
"https://tom5079.github.io/PupilSources/hitomi.html.ver"
|
||||
).readText()
|
||||
}.getOrNull().let { version ->
|
||||
(!version.isNullOrEmpty() && version != htmlVersion).also {
|
||||
@@ -154,7 +160,21 @@ fun initWebView(context: Context) {
|
||||
|
||||
webViewClient = object: WebViewClient() {
|
||||
override fun onPageFinished(view: WebView?, url: String?) {
|
||||
webViewReady = true
|
||||
webView.evaluateJavascript(
|
||||
"""
|
||||
try {
|
||||
new Function('(x => x?.y ?? z)');
|
||||
true;
|
||||
} catch (err) {
|
||||
false;
|
||||
}
|
||||
""".trimIndent()
|
||||
) {
|
||||
val es2020: Boolean = Json.decodeFromString(it)
|
||||
|
||||
webViewReady = es2020
|
||||
oldWebView = !es2020
|
||||
}
|
||||
}
|
||||
|
||||
override fun onReceivedError(
|
||||
@@ -188,13 +208,13 @@ fun initWebView(context: Context) {
|
||||
}
|
||||
}
|
||||
@JavascriptInterface
|
||||
fun onError(uid: String, message: String) {
|
||||
fun onError(uid: String, script: String, message: String, stack: String) {
|
||||
CoroutineScope(Dispatchers.Unconfined).launch {
|
||||
_webViewFlow.emit(uid to null)
|
||||
_webViewFlow.emit(uid to "")
|
||||
}
|
||||
Toast.makeText(context, message, Toast.LENGTH_LONG).show()
|
||||
FirebaseCrashlytics.getInstance().log(
|
||||
"onError: $message"
|
||||
|
||||
FirebaseCrashlytics.getInstance().recordException(
|
||||
JavascriptException("onError script: $script\nmessage: $message\nstack: $stack")
|
||||
)
|
||||
}
|
||||
}, "Callback")
|
||||
|
||||
@@ -186,7 +186,7 @@ class GalleryBlockAdapter(private val galleries: List<Int>) : RecyclerSwipeAdapt
|
||||
text =
|
||||
resources.getString(R.string.galleryblock_language, languages[galleryBlock.language])
|
||||
visibility = when {
|
||||
galleryBlock.language.isNotEmpty() -> View.VISIBLE
|
||||
!galleryBlock.language.isNullOrEmpty() -> View.VISIBLE
|
||||
else -> View.GONE
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
/*
|
||||
* Copyright 2019 tom5079
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package xyz.quaver
|
||||
|
||||
import kotlinx.serialization.json.Json
|
||||
import okhttp3.Request
|
||||
import xyz.quaver.pupil.client
|
||||
import java.io.IOException
|
||||
import java.net.URL
|
||||
|
||||
/**
|
||||
* kotlinx.serialization.json.Json object for global use
|
||||
* properties should not be changed
|
||||
*
|
||||
* @see [https://kotlin.github.io/kotlinx.serialization/kotlinx-serialization-core/kotlinx-serialization-core/kotlinx.serialization.json/-json/index.html]
|
||||
*/
|
||||
val json = Json {
|
||||
isLenient = true
|
||||
ignoreUnknownKeys = true
|
||||
allowSpecialFloatingPointValues = true
|
||||
useArrayPolymorphism = true
|
||||
}
|
||||
|
||||
typealias HeaderSetter = (Request.Builder) -> Request.Builder
|
||||
fun URL.readText(settings: HeaderSetter? = null): String {
|
||||
val request = Request.Builder()
|
||||
.url(this).let {
|
||||
settings?.invoke(it) ?: it
|
||||
}.build()
|
||||
|
||||
return client.newCall(request).execute().also{ if (it.code() != 200) throw IOException() }.body()?.use { it.string() } ?: throw IOException()
|
||||
}
|
||||
@@ -18,9 +18,6 @@ package xyz.quaver.pupil.hitomi
|
||||
|
||||
import android.util.Log
|
||||
import android.webkit.WebView
|
||||
import android.widget.Toast
|
||||
import com.google.common.collect.ConcurrentHashMultiset
|
||||
import com.google.firebase.crashlytics.FirebaseCrashlytics
|
||||
import kotlinx.coroutines.*
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.flow.first
|
||||
@@ -29,10 +26,8 @@ import kotlinx.serialization.ExperimentalSerializationApi
|
||||
import kotlinx.serialization.decodeFromString
|
||||
import kotlinx.serialization.encodeToString
|
||||
import kotlinx.serialization.json.Json
|
||||
import xyz.quaver.json
|
||||
import xyz.quaver.pupil.*
|
||||
import java.util.*
|
||||
import java.util.concurrent.ConcurrentHashMap
|
||||
import kotlin.coroutines.resume
|
||||
import kotlin.coroutines.suspendCoroutine
|
||||
|
||||
@@ -40,14 +35,29 @@ const val protocol = "https:"
|
||||
|
||||
val evaluationContext = Dispatchers.Main + Job()
|
||||
|
||||
suspend fun WebView.evaluate(script: String): String = coroutineScope {
|
||||
/**
|
||||
* kotlinx.serialization.json.Json object for global use
|
||||
* properties should not be changed
|
||||
*
|
||||
* @see [https://kotlin.github.io/kotlinx.serialization/kotlinx-serialization-core/kotlinx-serialization-core/kotlinx.serialization.json/-json/index.html]
|
||||
*/
|
||||
val json = Json {
|
||||
isLenient = true
|
||||
ignoreUnknownKeys = true
|
||||
allowSpecialFloatingPointValues = true
|
||||
useArrayPolymorphism = true
|
||||
}
|
||||
|
||||
suspend inline fun <reified T> WebView.evaluate(script: String): T = coroutineScope {
|
||||
var result: String? = null
|
||||
|
||||
while (result == null) {
|
||||
try {
|
||||
result = withContext(evaluationContext) {
|
||||
while (webViewFailed || !webViewReady) yield()
|
||||
while (!oldWebView && !(webViewReady && !webViewFailed)) yield()
|
||||
|
||||
result = if (oldWebView)
|
||||
"null"
|
||||
else withContext(evaluationContext) {
|
||||
suspendCoroutine { continuation ->
|
||||
evaluateJavascript(script) {
|
||||
continuation.resume(it)
|
||||
@@ -60,21 +70,23 @@ suspend fun WebView.evaluate(script: String): String = coroutineScope {
|
||||
}
|
||||
}
|
||||
|
||||
result
|
||||
json.decodeFromString(result)
|
||||
}
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
suspend fun WebView.evaluatePromise(
|
||||
suspend inline fun <reified T> WebView.evaluatePromise(
|
||||
script: String,
|
||||
then: String = ".then(result => Callback.onResult(%uid, JSON.stringify(result))).catch(err => Callback.onError(%uid, JSON.stringify(err)))"
|
||||
): String = coroutineScope {
|
||||
then: String = ".then(result => Callback.onResult(%uid, JSON.stringify(result))).catch(err => Callback.onError(%uid, String.raw`$script`, err.message, err.stack))"
|
||||
): T = coroutineScope {
|
||||
var result: String? = null
|
||||
|
||||
while (result == null) {
|
||||
try {
|
||||
result = withContext(evaluationContext) {
|
||||
while (webViewFailed || !webViewReady) yield()
|
||||
while (!oldWebView && !(webViewReady && !webViewFailed)) yield()
|
||||
|
||||
result = if (oldWebView)
|
||||
"null"
|
||||
else withContext(evaluationContext) {
|
||||
val uid = UUID.randomUUID().toString()
|
||||
|
||||
val flow: Flow<Pair<String, String?>> = webViewFlow.transformWhile { (currentUid, result) ->
|
||||
@@ -95,27 +107,22 @@ suspend fun WebView.evaluatePromise(
|
||||
}
|
||||
}
|
||||
|
||||
result
|
||||
json.decodeFromString(result)
|
||||
}
|
||||
|
||||
@Suppress("EXPERIMENTAL_API_USAGE")
|
||||
suspend fun getGalleryInfo(galleryID: Int): GalleryInfo {
|
||||
val result = webView.evaluatePromise("get_gallery_info($galleryID)")
|
||||
|
||||
return json.decodeFromString(result)
|
||||
}
|
||||
suspend fun getGalleryInfo(galleryID: Int): GalleryInfo =
|
||||
webView.evaluatePromise("get_gallery_info($galleryID)")
|
||||
|
||||
//common.js
|
||||
const val domain = "ltn.hitomi.la"
|
||||
const val galleryblockdir = "galleryblock"
|
||||
const val nozomiextension = ".nozomi"
|
||||
|
||||
val String?.js: String
|
||||
get() = if (this == null) "null" else "'$this'"
|
||||
|
||||
@OptIn(ExperimentalSerializationApi::class)
|
||||
suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null, base: String? = null): String {
|
||||
val result = webView.evaluate(
|
||||
suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String? = null, ext: String? = null, base: String? = null): String =
|
||||
webView.evaluate(
|
||||
"""
|
||||
url_from_url_from_hash(
|
||||
${galleryID.toString().js},
|
||||
@@ -125,9 +132,6 @@ suspend fun urlFromUrlFromHash(galleryID: Int, image: GalleryFiles, dir: String?
|
||||
""".trimIndent()
|
||||
)
|
||||
|
||||
return Json.decodeFromString(result)
|
||||
}
|
||||
|
||||
suspend fun imageUrlFromImage(galleryID: Int, image: GalleryFiles, noWebp: Boolean) : String {
|
||||
return when {
|
||||
noWebp ->
|
||||
|
||||
@@ -19,17 +19,12 @@ package xyz.quaver.pupil.hitomi
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.decodeFromString
|
||||
import kotlinx.serialization.json.Json
|
||||
import org.jsoup.Jsoup
|
||||
import xyz.quaver.pupil.webView
|
||||
import xyz.quaver.readText
|
||||
import java.net.URL
|
||||
import java.net.URLDecoder
|
||||
|
||||
@Serializable
|
||||
data class Gallery(
|
||||
val related: List<Int>,
|
||||
val langList: Map<String, String>
|
||||
,
|
||||
val langList: Map<String, String>,
|
||||
val cover: String,
|
||||
val title: String,
|
||||
val artists: List<String>,
|
||||
@@ -41,7 +36,5 @@ data class Gallery(
|
||||
val tags: List<String>,
|
||||
val thumbnails: List<String>
|
||||
)
|
||||
suspend fun getGallery(galleryID: Int) : Gallery {
|
||||
val result = webView.evaluatePromise("get_gallery($galleryID)")
|
||||
return Json.decodeFromString(result)
|
||||
}
|
||||
suspend fun getGallery(galleryID: Int) : Gallery =
|
||||
webView.evaluatePromise("get_gallery($galleryID)")
|
||||
@@ -17,17 +17,7 @@
|
||||
package xyz.quaver.pupil.hitomi
|
||||
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.decodeFromString
|
||||
import kotlinx.serialization.json.Json
|
||||
import org.jsoup.Jsoup
|
||||
import xyz.quaver.pupil.webView
|
||||
import xyz.quaver.readText
|
||||
import java.net.URL
|
||||
import java.net.URLDecoder
|
||||
import java.nio.ByteBuffer
|
||||
import java.nio.ByteOrder
|
||||
import java.util.*
|
||||
import javax.net.ssl.HttpsURLConnection
|
||||
|
||||
@Serializable
|
||||
data class GalleryBlock(
|
||||
@@ -38,11 +28,9 @@ data class GalleryBlock(
|
||||
val artists: List<String>,
|
||||
val series: List<String>,
|
||||
val type: String,
|
||||
val language: String,
|
||||
val language: String?,
|
||||
val relatedTags: List<String>
|
||||
)
|
||||
|
||||
suspend fun getGalleryBlock(galleryID: Int) : GalleryBlock {
|
||||
val result = webView.evaluatePromise("get_gallery_block($galleryID)")
|
||||
return Json.decodeFromString(result)
|
||||
}
|
||||
suspend fun getGalleryBlock(galleryID: Int) : GalleryBlock =
|
||||
webView.evaluatePromise("get_gallery_block($galleryID)")
|
||||
@@ -27,18 +27,15 @@ import xyz.quaver.pupil.webView
|
||||
const val extension = ".html"
|
||||
|
||||
@OptIn(ExperimentalSerializationApi::class)
|
||||
suspend fun getGalleryIDsForQuery(query: String) : Set<Int> {
|
||||
val result = webView.evaluatePromise("get_galleryids_for_query('$query')")
|
||||
|
||||
return Json.decodeFromString(result)
|
||||
}
|
||||
suspend fun getGalleryIDsForQuery(query: String) : Set<Int> =
|
||||
webView.evaluatePromise("get_galleryids_for_query('$query')")
|
||||
|
||||
@Serializable
|
||||
data class Suggestion(val s: String, val t: Int, val u: String, val n: String)
|
||||
|
||||
@OptIn(ExperimentalSerializationApi::class)
|
||||
suspend fun getSuggestionsForQuery(query: String) : List<Suggestion> {
|
||||
val result = webView.evaluatePromise(
|
||||
suspend fun getSuggestionsForQuery(query: String) : List<Suggestion> =
|
||||
webView.evaluatePromise(
|
||||
"get_suggestions_for_query('$query', ++search_serial)",
|
||||
then = """
|
||||
.then(r => {
|
||||
@@ -52,14 +49,9 @@ suspend fun getSuggestionsForQuery(query: String) : List<Suggestion> {
|
||||
""".trimIndent()
|
||||
)
|
||||
|
||||
return Json.decodeFromString(result) ?: return emptyList()
|
||||
}
|
||||
|
||||
@OptIn(ExperimentalSerializationApi::class)
|
||||
suspend fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : Set<Int> {
|
||||
val jsArea = if (area == null) "null" else "'$area'"
|
||||
|
||||
val json = webView.evaluatePromise("""get_galleryids_from_nozomi($jsArea, '$tag', '$language')""")
|
||||
|
||||
return Json.decodeFromString(json)
|
||||
return webView.evaluatePromise("""get_galleryids_from_nozomi($jsArea, '$tag', '$language')""")
|
||||
}
|
||||
@@ -29,7 +29,6 @@ import androidx.core.app.NotificationCompat
|
||||
import androidx.core.app.NotificationManagerCompat
|
||||
import androidx.core.app.TaskStackBuilder
|
||||
import androidx.core.content.ContextCompat
|
||||
import com.google.common.util.concurrent.RateLimiter
|
||||
import com.google.firebase.crashlytics.FirebaseCrashlytics
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
@@ -166,9 +165,6 @@ class DownloadService : Service() {
|
||||
}
|
||||
}
|
||||
|
||||
private val rateLimiter = RateLimiter.create(2.0)
|
||||
private val rateLimitHost = Regex("..?\\.hitomi.la")
|
||||
|
||||
private val interceptor: PupilInterceptor = { chain ->
|
||||
val request = chain.request()
|
||||
|
||||
|
||||
@@ -19,3 +19,4 @@
|
||||
package xyz.quaver.pupil.types
|
||||
|
||||
class SendLogException : Exception()
|
||||
class JavascriptException(message: String?) : Exception(message)
|
||||
@@ -19,6 +19,7 @@
|
||||
package xyz.quaver.pupil.ui
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.ActivityNotFoundException
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
@@ -37,6 +38,7 @@ import androidx.core.content.ContextCompat
|
||||
import androidx.core.view.GravityCompat
|
||||
import androidx.core.view.ViewCompat
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import androidx.webkit.WebViewCompat
|
||||
import com.google.android.material.navigation.NavigationView
|
||||
import com.google.android.material.snackbar.Snackbar
|
||||
import com.google.firebase.crashlytics.FirebaseCrashlytics
|
||||
@@ -105,6 +107,8 @@ class MainActivity :
|
||||
|
||||
private lateinit var binding: MainActivityBinding
|
||||
|
||||
private var oldWebViewJob: Job? = null
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
binding = MainActivityBinding.inflate(layoutInflater)
|
||||
@@ -125,9 +129,40 @@ class MainActivity :
|
||||
if (Preferences["download_folder", ""].isEmpty())
|
||||
DownloadLocationDialogFragment().show(supportFragmentManager, "Download Location Dialog")
|
||||
|
||||
oldWebViewJob = CoroutineScope(Dispatchers.Unconfined).launch {
|
||||
do {
|
||||
delay(1000)
|
||||
if (oldWebView) {
|
||||
AlertDialog.Builder(this@MainActivity)
|
||||
.setTitle(android.R.string.dialog_alert_title)
|
||||
.setMessage(R.string.old_webview)
|
||||
.setCancelable(false)
|
||||
.setPositiveButton(android.R.string.ok) { _, _ ->
|
||||
WebViewCompat.getCurrentWebViewPackage(this@MainActivity)?.packageName?.let { packageName ->
|
||||
try {
|
||||
startActivity(
|
||||
Intent(
|
||||
Intent.ACTION_VIEW,
|
||||
Uri.parse("market://details?id=$packageName")
|
||||
)
|
||||
)
|
||||
} catch (e: ActivityNotFoundException) {
|
||||
startActivity(
|
||||
Intent(
|
||||
Intent.ACTION_VIEW,
|
||||
Uri.parse("https://play.google.com/store/apps/details?id=$packageName")
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
.show()
|
||||
break
|
||||
}
|
||||
} while (isActive)
|
||||
}
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
|
||||
!Preferences["download_folder_ignore_warning", false] &&
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !Preferences["download_folder_ignore_warning", false] &&
|
||||
ContextCompat.getExternalFilesDirs(this, null).filterNotNull().map { Uri.fromFile(it).toString() }
|
||||
.contains(Preferences["download_folder", ""])
|
||||
) {
|
||||
@@ -169,6 +204,8 @@ class MainActivity :
|
||||
override fun onDestroy() {
|
||||
super.onDestroy()
|
||||
|
||||
oldWebViewJob?.cancel()
|
||||
|
||||
(binding.contents.recyclerview.adapter as? GalleryBlockAdapter)?.updateAll = false
|
||||
}
|
||||
|
||||
|
||||
@@ -157,4 +157,5 @@
|
||||
<string name="settings_max_concurrent_download">並列ダウンロード</string>
|
||||
<string name="unaccessible_download_folder">アンドロイド11以上では外部からのアプリ内部空間接近が不可能です。ダウンロードフォルダを変更しますか?</string>
|
||||
<string name="settings_networking">ネットワーク</string>
|
||||
<string name="old_webview">WebViewのアップデートが必要です</string>
|
||||
</resources>
|
||||
@@ -157,4 +157,5 @@
|
||||
<string name="settings_max_concurrent_download">병렬 다운로드</string>
|
||||
<string name="unaccessible_download_folder">안드로이드 11 이상에서는 외부에서 현재 다운로드 폴더에 접근할 수 없습니다. 변경하시겠습니까?</string>
|
||||
<string name="settings_networking">네트워크</string>
|
||||
<string name="old_webview">WebView 업데이트가 필요합니다</string>
|
||||
</resources>
|
||||
@@ -51,6 +51,8 @@
|
||||
|
||||
<string name="unaccessible_download_folder">From Android 11 and above, current Download folder cannot be accessed by outside apps. Would you like to change the download folder?</string>
|
||||
|
||||
<string name="old_webview">You are using an old version of WebView. Please update it on PlayStore</string>
|
||||
|
||||
<string name="main_drawer_home">Home</string>
|
||||
<string name="main_drawer_history">History</string>
|
||||
<string name="main_drawer_downloads">Downloads</string>
|
||||
|
||||
Reference in New Issue
Block a user