This commit is contained in:
tom5079
2020-08-08 16:29:04 +09:00
parent 9415ab4ef9
commit 9da1b30984
4 changed files with 12 additions and 10 deletions

View File

@@ -20,7 +20,7 @@ android {
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 29 targetSdkVersion 29
versionCode 57 versionCode 57
versionName "4.21" versionName "4.21-hotfix1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true

View File

@@ -12,7 +12,7 @@
"filters": [], "filters": [],
"properties": [], "properties": [],
"versionCode": 57, "versionCode": 57,
"versionName": "4.21", "versionName": "4.21-hotfix1",
"enabled": true, "enabled": true,
"outputFile": "app-release.apk" "outputFile": "app-release.apk"
} }

View File

@@ -58,15 +58,17 @@ fun subdomainFromURL(url: String, base: String? = null) : String {
val r = Regex("""/[0-9a-f]/([0-9a-f]{2})/""") val r = Regex("""/[0-9a-f]/([0-9a-f]{2})/""")
val m = r.find(url) ?: return retval val m = r.find(url) ?: return retval
var g = m.groupValues[1].toIntOrNull(b) ?: return retval var g = m.groupValues[1].toIntOrNull(b)
when { if (g != null) {
g < 0x30 -> numberOfFrontends = 2 if (g < 0x30)
g < 0x09 -> g = 1 numberOfFrontends = 2
if (g < 0x09)
g = 1
retval = subdomainFromGalleryID(g, numberOfFrontends) + retval
} }
retval = subdomainFromGalleryID(g, numberOfFrontends) + retval
return retval return retval
} }

View File

@@ -82,9 +82,9 @@ class UnitTest {
@Test @Test
fun test_getImages() { fun test_getImages() {
val reader = getReader(1702206) val reader = getReader(1702001)
print(urlFromUrlFromHash(1702206, reader.galleryInfo.files.first(), "webp")) print(urlFromUrlFromHash(1702001, reader.galleryInfo.files[15], "webp"))
} }
@Test @Test