Merge branch 'dev'

Author: RobbWatershed

app/build.gradle

@@ -43,7 +43,7 @@ android {
         minSdkVersion 26
         targetSdkVersion 36
         versionCode 130 // is updated automatically by BitRise; only used when building locally
-        versionName '1.21.3'
+        versionName '1.21.4'
 
         def includeObjectBoxBrowser = System.getenv("INCLUDE_OBJECTBOX_BROWSER") ?: "false"
         def includeLeakCanary = System.getenv("INCLUDE_LEAK_CANARY") ?: "false"
@@ -192,7 +192,7 @@ dependencies {
     /**
      * UI
      */
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0'
 
     // https://github.com/mikepenz/FastAdapter
     def fastadapter_version = '5.7.0'
@@ -259,7 +259,7 @@ dependencies {
     implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version"
 
     // Download speed limit
-    implementation 'com.bucket4j:bucket4j_jdk17-core:8.15.0'
+    implementation 'com.bucket4j:bucket4j_jdk17-core:8.16.0'
 
     // TLS v1.3 support for Android <= 9
     implementation 'org.conscrypt:conscrypt-android:2.5.3'
@@ -303,7 +303,7 @@ dependencies {
     implementation 'info.debatty:java-string-similarity:2.0.0'
 
     // Biometrics
-    implementation 'dev.skomlach:biometric:2.2.51'
+    implementation 'dev.skomlach:biometric:2.3.4'
 
     // Searchable prefs
     implementation 'com.github.ByteHamster:SearchPreference:2.7.3'
@@ -318,7 +318,7 @@ dependencies {
      * ANALYTICS
      */
     // Import the BoM for the Firebase platform
-    implementation platform('com.google.firebase:firebase-bom:34.4.0')
+    implementation platform('com.google.firebase:firebase-bom:34.6.0')
 
     // Crashlytics
     implementation 'com.google.firebase:firebase-crashlytics'

app/customssiv/src/main/java/me/devsaki/hentoid/customssiv/util/HttpHelper.kt

@@ -35,15 +35,15 @@ internal class UriParts(uri: String, lowercase: Boolean = false) {
         val fragmentIndex = uriNoParams.lastIndexOf('#')
         if (fragmentIndex > -1) {
             fragment = uriNoParams.substring(fragmentIndex + 1)
-            uriNoParams = uriNoParams.substring(0, fragmentIndex)
+            uriNoParams = uriNoParams.take(fragmentIndex)
         } else fragment = ""
         val paramsIndex = uriNoParams.lastIndexOf('?')
         if (paramsIndex > -1) {
             query = uriNoParams.substring(paramsIndex + 1)
-            uriNoParams = uriNoParams.substring(0, paramsIndex)
+            uriNoParams = uriNoParams.take(paramsIndex)
         } else query = ""
         val pathIndex = uriNoParams.lastIndexOf('/')
-        path = if (pathIndex > -1) uriNoParams.substring(0, pathIndex) else uriNoParams
+        path = if (pathIndex > -1) uriNoParams.take(pathIndex) else uriNoParams
         val protocolEndIndex = path.indexOf("://")
         val hostEndIndex = path.indexOf("/", protocolEndIndex + 3)
         host = if (hostEndIndex > -1) path.substring(0, hostEndIndex) else path

app/gles-renderer/src/main/java/me/devsaki/hentoid/gles_renderer/GPUImageRenderer.kt

@@ -95,7 +95,7 @@ class GPUImageRenderer(private var filter: GPUImageFilter) : GLSurfaceView.Rende
     private fun runAll(queue: Queue<Runnable>) {
         synchronized(queue) {
             while (!queue.isEmpty()) {
-                queue.poll()!!.run()
+                queue.poll()?.run()
             }
         }
     }

app/src/main/java/me/devsaki/hentoid/activities/LibraryActivity.kt

@@ -51,7 +51,7 @@ import me.devsaki.hentoid.enums.Grouping
 import me.devsaki.hentoid.events.AppUpdatedEvent
 import me.devsaki.hentoid.events.CommunicationEvent
 import me.devsaki.hentoid.events.ProcessEvent
-import me.devsaki.hentoid.fragments.library.LibraryArchiveDialogFragment
+import me.devsaki.hentoid.fragments.library.LibraryExportDialogFragment
 import me.devsaki.hentoid.fragments.library.LibraryBottomSortFilterFragment
 import me.devsaki.hentoid.fragments.library.LibraryContentFragment
 import me.devsaki.hentoid.fragments.library.LibraryFoldersFragment
@@ -95,7 +95,7 @@ private const val BEHOLDER_DELAY_MS = 2 * 60 * 1000 // 2 min
 var hasChangedGridDisplay = false
 var hasClosedTopAlert = false
 
-class LibraryActivity : BaseActivity(), LibraryArchiveDialogFragment.Parent {
+class LibraryActivity : BaseActivity(), LibraryExportDialogFragment.Parent {
 
     // ======== COMMUNICATION
     // Viewmodel
@@ -141,12 +141,11 @@ class LibraryActivity : BaseActivity(), LibraryArchiveDialogFragment.Parent {
     private var resetReadStatsMenu: MenuItem? = null
     private var rateMenu: MenuItem? = null
     private var shareMenu: MenuItem? = null
-    private var archiveMenu: MenuItem? = null
+    private var exportMenu: MenuItem? = null
     private var changeGroupMenu: MenuItem? = null
     private var folderMenu: MenuItem? = null
     private var redownloadMenu: MenuItem? = null
-    private var downloadStreamedMenu: MenuItem? = null
-    private var streamMenu: MenuItem? = null
+    private var storageMethodMenu: MenuItem? = null
     private var groupCoverMenu: MenuItem? = null
     private var mergeMenu: MenuItem? = null
     private var splitMenu: MenuItem? = null
@@ -297,6 +296,7 @@ class LibraryActivity : BaseActivity(), LibraryArchiveDialogFragment.Parent {
         if (!EventBus.getDefault().isRegistered(this)) EventBus.getDefault().register(this)
     }
 
+    @Suppress("unused")
     @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
     fun onAppUpdated(event: AppUpdatedEvent) {
         EventBus.getDefault().removeStickyEvent(event)
@@ -850,12 +850,11 @@ class LibraryActivity : BaseActivity(), LibraryArchiveDialogFragment.Parent {
                 resetReadStatsMenu = findItem(R.id.action_reset_read)
                 rateMenu = findItem(R.id.action_rate)
                 shareMenu = findItem(R.id.action_share)
-                archiveMenu = findItem(R.id.action_archive)
+                exportMenu = findItem(R.id.action_export)
                 changeGroupMenu = findItem(R.id.action_change_group)
                 folderMenu = findItem(R.id.action_open_folder)
                 redownloadMenu = findItem(R.id.action_redownload)
-                downloadStreamedMenu = findItem(R.id.action_download)
-                streamMenu = findItem(R.id.action_stream)
+                storageMethodMenu = findItem(R.id.action_storage_method)
                 groupCoverMenu = findItem(R.id.action_set_group_cover)
                 mergeMenu = findItem(R.id.action_merge)
                 splitMenu = findItem(R.id.action_split)
@@ -1108,12 +1107,11 @@ class LibraryActivity : BaseActivity(), LibraryArchiveDialogFragment.Parent {
             completedMenu?.isVisible = false
             resetReadStatsMenu?.isVisible = false
             rateMenu?.isVisible = isMultipleSelection
-            archiveMenu?.isVisible = !hasProcessed
+            exportMenu?.isVisible = !hasProcessed
             changeGroupMenu?.isVisible = false
             folderMenu?.isVisible = false
             redownloadMenu?.isVisible = false
-            downloadStreamedMenu?.isVisible = false
-            streamMenu?.isVisible = false
+            storageMethodMenu?.isVisible = false
             groupCoverMenu?.isVisible = false
             mergeMenu?.isVisible = false
             splitMenu?.isVisible = false
@@ -1130,12 +1128,11 @@ class LibraryActivity : BaseActivity(), LibraryArchiveDialogFragment.Parent {
             completedMenu?.isVisible = false
             resetReadStatsMenu?.isVisible = false
             rateMenu?.isVisible = false
-            archiveMenu?.isVisible = false
+            exportMenu?.isVisible = false
             changeGroupMenu?.isVisible = false
             folderMenu?.isVisible = 1 == selectedTotalCount
             redownloadMenu?.isVisible = false
-            downloadStreamedMenu?.isVisible = false
-            streamMenu?.isVisible = false
+            storageMethodMenu?.isVisible = false
             groupCoverMenu?.isVisible = false
             mergeMenu?.isVisible = false
             splitMenu?.isVisible = false
@@ -1151,12 +1148,11 @@ class LibraryActivity : BaseActivity(), LibraryArchiveDialogFragment.Parent {
             resetReadStatsMenu?.isVisible = true
             rateMenu?.isVisible = isMultipleSelection
             shareMenu?.isVisible = true
-            archiveMenu?.isVisible = !hasProcessed
+            exportMenu?.isVisible = !hasProcessed
             changeGroupMenu?.isVisible = !hasProcessed
             folderMenu?.isVisible = !isMultipleSelection
             redownloadMenu?.isVisible = !hasProcessed && selectedDownloadedCount > 0
-            downloadStreamedMenu?.isVisible = !hasProcessed && selectedStreamedCount > 0
-            streamMenu?.isVisible = !hasProcessed && selectedDownloadedCount > 0
+            storageMethodMenu?.isVisible = !hasProcessed
             groupCoverMenu?.isVisible =
                 !isMultipleSelection && Settings.getGroupingDisplayG() != Grouping.FLAT
             // Can only merge downloaded, streamed or non-archive external content together
@@ -1204,15 +1200,17 @@ class LibraryActivity : BaseActivity(), LibraryArchiveDialogFragment.Parent {
         }
     }
 
+    @Suppress("unused")
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onProcessEvent(event: ProcessEvent) {
         if (R.id.delete_service_delete == event.processId
             && ProcessEvent.Type.COMPLETE == event.eventType
         ) processDeleteEvent(event)
     }
 
+    @Suppress("unused")
     @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
-    fun onProcesStickyEvent(event: ProcessEvent) {
+    fun onProcessStickyEvent(event: ProcessEvent) {
         var canRemove = false
         if (R.id.delete_service_delete == event.processId
             && ProcessEvent.Type.COMPLETE == event.eventType
@@ -1247,21 +1245,21 @@ class LibraryActivity : BaseActivity(), LibraryArchiveDialogFragment.Parent {
     }
 
     /**
-     * Display the yes/no dialog to make sure the user really wants to archive selected items
+     * Display the yes/no dialog to make sure the user really wants to export selected items
      *
-     * @param items Items to be archived if the answer is yes
+     * @param items Items to be exported if the answer is yes
      */
-    fun askArchiveItems(items: List<Content>, selectExtension: SelectExtension<*>) {
+    fun askExportItems(items: List<Content>, selectExtension: SelectExtension<*>) {
         if (items.size > 1000) {
-            snack(R.string.archive_limit)
+            snack(R.string.process_limit)
             return
         }
         if (items.isEmpty()) {
             snack(R.string.invalid_selection_generic)
             return
         }
         selectExtension.deselect(selectExtension.selections.toMutableSet())
-        LibraryArchiveDialogFragment.invoke(this, items)
+        LibraryExportDialogFragment.invoke(this, items)
     }
 
     override fun leaveSelectionMode() {

app/src/main/java/me/devsaki/hentoid/activities/settings/SettingsActivity.kt

@@ -99,9 +99,11 @@ class SettingsActivity : BaseActivity(), SearchPreferenceResultListener {
     }
 
     override fun onSearchResultClicked(result: SearchPreferenceResult) {
-        if (result.screen != null)
+        if (result.screen != null) {
             fragment = fragment.navigateToScreen(supportFragmentManager, result.screen)
-        fragment.view?.fitsSystemWindows = true
+            fragment.view?.fitsSystemWindows = true
+        }
+        result.closeSearchPage(this)
         result.highlight(fragment)
     }
 }