favorite scroll to top

README.md

@@ -2,7 +2,7 @@
 *Pupil, Hitomi.la viewer for Android*  
 
 ![](https://img.shields.io/github/downloads/tom5079/Pupil/total)  
-[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.3.11/Pupil-v5.3.11.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.3.11/Pupil-v5.3.11.apk)  
+[![](https://img.shields.io/github/downloads/tom5079/Pupil/5.3.13/Pupil-v5.3.13.apk?color=%234fc3f7&label=DOWNLOAD%20APP&style=for-the-badge)](https://github.com/tom5079/Pupil/releases/download/5.3.13/Pupil-v5.3.13.apk)  
 [![](https://discordapp.com/api/guilds/610452916612104194/embed.png?style=banner2)](https://discord.gg/Stj4b5v)
 
 # Features

app/build.gradle

@@ -38,7 +38,7 @@ android {
         compileSdk 34
         targetSdkVersion 34
         versionCode 69
-        versionName "5.3.11"
+        versionName "5.3.13"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 69,
-      "versionName": "5.3.11",
+      "versionName": "5.3.12",
       "outputFile": "app-release.apk"
     }
   ],

app/src/main/java/xyz/quaver/pupil/Pupil.kt

@@ -58,6 +58,7 @@ import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManagerFactory
+import javax.net.ssl.X509TrustManager
 import kotlin.reflect.KClass
 
 typealias PupilInterceptor = (Interceptor.Chain) -> Response
@@ -93,6 +94,15 @@ fun getSSLContext(context: Context): SSLContext {
 
     keyStore.setCertificateEntry("isrgrootx1", certificate)
 
+    val defaultTrustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
+    defaultTrustManagerFactory.init(null as KeyStore?)
+
+    defaultTrustManagerFactory.trustManagers.filterIsInstance(X509TrustManager::class.java).forEach { trustManager ->
+        trustManager.acceptedIssuers.forEach { acceptedIssuer ->
+            keyStore.setCertificateEntry(acceptedIssuer.subjectDN.name, acceptedIssuer)
+        }
+    }
+
     val trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
     trustManagerFactory.init(keyStore)
 

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

@@ -18,10 +18,8 @@
 
 package xyz.quaver.pupil.ui
 
-import android.Manifest
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -39,6 +37,7 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.GravityCompat
 import androidx.core.view.ViewCompat
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
@@ -62,10 +61,10 @@ import xyz.quaver.pupil.ui.view.MainView
 import xyz.quaver.pupil.ui.view.ProgressCard
 import xyz.quaver.pupil.util.ItemClickSupport
 import xyz.quaver.pupil.util.Preferences
-import xyz.quaver.pupil.util.requestNotificationPermission
 import xyz.quaver.pupil.util.checkUpdate
 import xyz.quaver.pupil.util.downloader.Cache
 import xyz.quaver.pupil.util.downloader.DownloadManager
+import xyz.quaver.pupil.util.requestNotificationPermission
 import xyz.quaver.pupil.util.restore
 import xyz.quaver.pupil.util.showNotificationPermissionExplanationDialog
 import java.util.regex.Pattern
@@ -496,6 +495,20 @@ class MainActivity :
     private var suggestionJob : Job? = null
     private fun setupSearchBar() {
         with(binding.contents.searchview) {
+            val scrollSuggestionToTop = {
+                with(binding.suggestionSection.suggestionsList) {
+                    MainScope().launch {
+                        withTimeout(1000) {
+                            val layoutManager = layoutManager as LinearLayoutManager
+                            while (layoutManager.findLastVisibleItemPosition() != adapter?.itemCount?.minus(1)) {
+                                layoutManager.scrollToPosition(adapter?.itemCount?.minus(1) ?: 0)
+                                delay(100)
+                            }
+                        }
+                    }
+                }
+            }
+
             onMenuStatusChangeListener = object: FloatingSearchView.OnMenuStatusChangeListener {
                 override fun onMenuOpened() {
                     (this@MainActivity.binding.contents.recyclerview.adapter as GalleryBlockAdapter).closeAllItems()
@@ -521,6 +534,7 @@ class MainActivity :
             onFavoriteHistorySwitchClickListener = {
                 isFavorite = !isFavorite
                 swapSuggestions(defaultSuggestions)
+                scrollSuggestionToTop()
             }
 
             onMenuItemClickListener = {
@@ -534,6 +548,7 @@ class MainActivity :
 
                 if (query.isEmpty() or query.endsWith(' ')) {
                     swapSuggestions(defaultSuggestions)
+                    scrollSuggestionToTop()
 
                     return@lambda
                 }
@@ -565,8 +580,10 @@ class MainActivity :
 
             onFocusChangeListener = object: FloatingSearchView.OnFocusChangeListener {
                 override fun onFocus() {
-                    if (query.isEmpty() or query.endsWith(' '))
+                    if (query.isEmpty() or query.endsWith(' ')) {
                         swapSuggestions(defaultSuggestions)
+                        scrollSuggestionToTop()
+                    }
                 }
 
                 override fun onFocusCleared() {