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

Fixed infinite loading when there's no result

Browse Source
This commit is contained in:
Pupil
2020-02-16 22:18:31 +09:00
parent bb6fadc182
commit 98d1f88579
4 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -937,26 +937,26 @@ class MainActivity : AppCompatActivity() {
when(sortMode) {
SortMode.POPULAR -> getGalleryIDsFromNozomi(null, "popular", "all")
else -> getGalleryIDsFromNozomi(null, "index", "all")
}.apply {
totalItems = size
}.also {
totalItems = it.size
}
}
else -> doSearch("$defaultQuery $query", sortMode == SortMode.POPULAR).apply {
totalItems = size
else -> doSearch("$defaultQuery $query", sortMode == SortMode.POPULAR).also {
totalItems = it.size
}
}
}
Mode.HISTORY -> {
when {
query.isEmpty() -> {
histories.toList().apply {
totalItems = size
histories.toList().also {
totalItems = it.size
}
}
else -> {
val result = doSearch(query).sorted()
histories.filter { result.binarySearch(it) >= 0 }.apply {
totalItems = size
histories.filter { result.binarySearch(it) >= 0 }.also {
totalItems = it.size
}
}
}
@@ -969,26 +969,26 @@ class MainActivity : AppCompatActivity() {
} ?: emptyList()
when {
query.isEmpty() -> downloads.apply {
totalItems = size
query.isEmpty() -> downloads.also {
totalItems = it.size
}
else -> {
val result = doSearch(query).sorted()
downloads.filter { result.binarySearch(it) >= 0 }.apply {
totalItems = size
downloads.filter { result.binarySearch(it) >= 0 }.also {
totalItems = it.size
}
}
}
}
Mode.FAVORITE -> {
when {
query.isEmpty() -> favorites.toList().apply {
totalItems = size
query.isEmpty() -> favorites.toList().also {
totalItems = it.size
}
else -> {
val result = doSearch(query).sorted()
favorites.filter { result.binarySearch(it) >= 0 }.apply {
totalItems = size
favorites.filter { result.binarySearch(it) >= 0 }.also {
totalItems = it.size
}
}
}
@@ -1003,10 +1003,13 @@ class MainActivity : AppCompatActivity() {
loadingJob = CoroutineScope(Dispatchers.IO).launch {
val galleryIDs = try {
galleryIDs!!.await()
galleryIDs!!.await().also {
if (it.isEmpty())
throw Exception("No result")
}
} catch (e: Exception) {
if (Fabric.isInitialized())
if (Fabric.isInitialized() && e.message != "No result")
Crashlytics.logException(e)
withContext(Dispatchers.Main) {