diff --git a/app/build.gradle b/app/build.gradle index f0778fdf..4921c586 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,9 +57,6 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.preference:preference:1.1.0' implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation "androidx.biometric:biometric:1.0.1" implementation 'com.android.support:multidex:1.0.3' implementation "com.daimajia.swipelayout:library:1.2.0@aar" @@ -73,6 +70,8 @@ dependencies { implementation ("com.github.bumptech.glide:recyclerview-integration:4.10.0") { transitive = false } + implementation 'net.rdrei.android.dirchooser:library:3.2@aar' + implementation 'com.gu:option:1.3' implementation 'com.github.chrisbanes:PhotoView:2.3.0' implementation 'com.andrognito.patternlockview:patternlockview:1.0.0' implementation "ru.noties.markwon:core:${markwonVersion}" diff --git a/app/src/main/java/xyz/quaver/pupil/Pupil.kt b/app/src/main/java/xyz/quaver/pupil/Pupil.kt index 126b68d9..a5512f9c 100644 --- a/app/src/main/java/xyz/quaver/pupil/Pupil.kt +++ b/app/src/main/java/xyz/quaver/pupil/Pupil.kt @@ -30,6 +30,7 @@ import androidx.preference.PreferenceManager import com.google.android.gms.common.GooglePlayServicesNotAvailableException import com.google.android.gms.common.GooglePlayServicesRepairableException import com.google.android.gms.security.ProviderInstaller +import com.google.firebase.analytics.FirebaseAnalytics import xyz.quaver.pupil.util.Histories import java.io.File @@ -54,6 +55,9 @@ class Pupil : MultiDexApplication() { histories = Histories(File(ContextCompat.getDataDir(this), "histories.json")) favorites = Histories(File(ContextCompat.getDataDir(this), "favorites.json")) + if (BuildConfig.DEBUG) + FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false) + val file = preference.getString("dl_location", null) if (file?.startsWith("content") == true) diff --git a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt index d5f33096..0d62572b 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt @@ -45,7 +45,9 @@ import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat import com.arlib.floatingsearchview.FloatingSearchView import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion import com.arlib.floatingsearchview.util.view.SearchInputView +import com.crashlytics.android.Crashlytics import com.google.android.material.appbar.AppBarLayout +import io.fabric.sdk.android.Fabric import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.activity_main_content.* import kotlinx.coroutines.* @@ -1004,9 +1006,13 @@ class MainActivity : AppCompatActivity() { val perPage = preference.getString("per_page", "25")?.toInt() ?: 25 loadingJob = CoroutineScope(Dispatchers.IO).launch { - val galleryIDs = galleryIDs?.await() + val galleryIDs = try { + galleryIDs!!.await() + } catch (e: Exception) { + + if (Fabric.isInitialized()) + Crashlytics.logException(e) - if (galleryIDs.isNullOrEmpty()) { //No result withContext(Dispatchers.Main) { main_noresult.visibility = View.VISIBLE main_progressbar.hide() diff --git a/libpupil/src/main/java/xyz/quaver/hitomi/galleryblock.kt b/libpupil/src/main/java/xyz/quaver/hitomi/galleryblock.kt index f2b76f7e..e115f473 100644 --- a/libpupil/src/main/java/xyz/quaver/hitomi/galleryblock.kt +++ b/libpupil/src/main/java/xyz/quaver/hitomi/galleryblock.kt @@ -34,35 +34,31 @@ fun fetchNozomi(area: String? = null, tag: String = "index", language: String = else -> "$protocol//$domain/$area/$tag-$language$nozomiextension" } - try { - with(URL(url).openConnection() as HttpsURLConnection) { - requestMethod = "GET" + with(URL(url).openConnection() as HttpsURLConnection) { + requestMethod = "GET" - if (start != -1 && count != -1) { - val startByte = start*4 - val endByte = (start+count)*4-1 + if (start != -1 && count != -1) { + val startByte = start*4 + val endByte = (start+count)*4-1 - setRequestProperty("Range", "bytes=$startByte-$endByte") - } - - connect() - - val totalItems = getHeaderField("Content-Range") - .replace(Regex("^[Bb]ytes \\d+-\\d+/"), "").toInt() / 4 - - val nozomi = ArrayList() - - val arrayBuffer = ByteBuffer - .wrap(inputStream.readBytes()) - .order(ByteOrder.BIG_ENDIAN) - - while (arrayBuffer.hasRemaining()) - nozomi.add(arrayBuffer.int) - - return Pair(nozomi, totalItems) + setRequestProperty("Range", "bytes=$startByte-$endByte") } - } catch (e: Exception) { - return Pair(emptyList(), 0) + + connect() + + val totalItems = getHeaderField("Content-Range") + .replace(Regex("^[Bb]ytes \\d+-\\d+/"), "").toInt() / 4 + + val nozomi = ArrayList() + + val arrayBuffer = ByteBuffer + .wrap(inputStream.readBytes()) + .order(ByteOrder.BIG_ENDIAN) + + while (arrayBuffer.hasRemaining()) + nozomi.add(arrayBuffer.int) + + return Pair(nozomi, totalItems) } } @@ -82,30 +78,26 @@ data class GalleryBlock( fun getGalleryBlock(galleryID: Int) : GalleryBlock? { val url = "$protocol//$domain/$galleryblockdir/$galleryID$extension" - try { - val doc = Jsoup.connect(url).get() + val doc = Jsoup.connect(url).get() - val galleryUrl = doc.selectFirst(".lillie").attr("href") + val galleryUrl = doc.selectFirst(".lillie").attr("href") - val thumbnails = doc.select("img").map { protocol + it.attr("data-src") } + val thumbnails = doc.select("img").map { protocol + it.attr("data-src") } - val title = doc.selectFirst("h1.lillie > a").text() - val artists = doc.select("div.artist-list a").map{ it.text() } - val series = doc.select("a[href~=^/series/]").map { it.text() } - val type = doc.selectFirst("a[href~=^/type/]").text() + val title = doc.selectFirst("h1.lillie > a").text() + val artists = doc.select("div.artist-list a").map{ it.text() } + val series = doc.select("a[href~=^/series/]").map { it.text() } + val type = doc.selectFirst("a[href~=^/type/]").text() - val language = { - val href = doc.select("a[href~=^/index-.+-1.html]").attr("href") - href.slice(7 until href.indexOf("-1")) - }.invoke() + val language = { + val href = doc.select("a[href~=^/index-.+-1.html]").attr("href") + href.slice(7 until href.indexOf("-1")) + }.invoke() - val relatedTags = doc.select(".relatedtags a").map { - val href = URLDecoder.decode(it.attr("href"), "UTF-8") - href.slice(5 until href.indexOf("-all")) - } - - return GalleryBlock(Code.HITOMI, galleryID, galleryUrl, thumbnails, title, artists, series, type, language, relatedTags) - } catch (e: Exception) { - return null + val relatedTags = doc.select(".relatedtags a").map { + val href = URLDecoder.decode(it.attr("href"), "UTF-8") + href.slice(5 until href.indexOf("-all")) } + + return GalleryBlock(Code.HITOMI, galleryID, galleryUrl, thumbnails, title, artists, series, type, language, relatedTags) } \ No newline at end of file diff --git a/libpupil/src/main/java/xyz/quaver/hitomi/search.kt b/libpupil/src/main/java/xyz/quaver/hitomi/search.kt index fbcd4a66..8261fa0b 100644 --- a/libpupil/src/main/java/xyz/quaver/hitomi/search.kt +++ b/libpupil/src/main/java/xyz/quaver/hitomi/search.kt @@ -173,22 +173,18 @@ fun getGalleryIDsFromNozomi(area: String?, tag: String, language: String) : List else -> "$protocol//$domain/$compressed_nozomi_prefix/$area/$tag-$language$nozomiextension" } - try { - val bytes = URL(nozomiAddress).readBytes() + val bytes = URL(nozomiAddress).readBytes() - val nozomi = ArrayList() + val nozomi = ArrayList() - val arrayBuffer = ByteBuffer - .wrap(bytes) - .order(ByteOrder.BIG_ENDIAN) + val arrayBuffer = ByteBuffer + .wrap(bytes) + .order(ByteOrder.BIG_ENDIAN) - while (arrayBuffer.hasRemaining()) - nozomi.add(arrayBuffer.int) + while (arrayBuffer.hasRemaining()) + nozomi.add(arrayBuffer.int) - return nozomi - } catch (e: Exception) { - return emptyList() - } + return nozomi } fun getGalleryIDsFromData(data: Pair) : List {