user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes bug when trying to open hiyobi-only galleries

Browse Source
This commit is contained in:
Pupil
2020-01-30 00:01:53 +09:00
parent e81b5a4e3a
commit 2c9c8e223c
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
View File

@@ -47,7 +47,6 @@ import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
import com.arlib.floatingsearchview.util.view.SearchInputView import com.arlib.floatingsearchview.util.view.SearchInputView
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.google.android.material.appbar.AppBarLayout import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.activity_main_content.* import kotlinx.android.synthetic.main.activity_main_content.*
import kotlinx.coroutines.* import kotlinx.coroutines.*
@@ -366,21 +365,14 @@ class MainActivity : AppCompatActivity() {
setTitle(R.string.main_open_gallery_by_id) setTitle(R.string.main_open_gallery_by_id)
setPositiveButton(android.R.string.ok) { _, _ -> setPositiveButton(android.R.string.ok) { _, _ ->
CoroutineScope(Dispatchers.Default).launch { val galleryID = editText.text.toString().toInt()
try { val intent = Intent(this@MainActivity, ReaderActivity::class.java).apply {
val intent = Intent(this@MainActivity, ReaderActivity::class.java) putExtra("galleryID", galleryID)
val gallery = }
getGalleryBlock(editText.text.toString().toInt()) ?: throw Exception()
intent.putExtra("galleryID", gallery.id)
startActivity(intent) startActivity(intent)
histories.add(gallery.id) histories.add(galleryID)
} catch (e: Exception) {
Snackbar.make(main_layout,
R.string.main_open_gallery_by_id_error, Snackbar.LENGTH_LONG).show()
}
}
} }
}.show() }.show()
} }

4
libpupil/src/test/java/xyz/quaver/hitomi/UnitTest.kt
View File

@@ -82,7 +82,9 @@ class UnitTest {
@Test @Test
fun test_hiyobi() { fun test_hiyobi() {
xyz.quaver.hiyobi.getReader(1510567) val reader = xyz.quaver.hiyobi.getReader(10000062)
print(reader)
} }
@Test @Test