bug fix :

1.修复了1.9.2.2中搜索栏中清空搜索栏按钮无法使用的bug 2.修复了1.9.2.0 更新与支持无法进入的bug 3.修复了1.9.2.0 下载列表搜索画廊过滤失败的bug
xiaojieonly · Sep 27, 2022 · debd0ba · debd0ba
1 parent df30c11
commit debd0ba
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,7 +26,7 @@ android {
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
         versionCode 109
-        versionName "1.9.2.0"
+        versionName "1.9.2.3"
         vectorDrawables.useSupportLibrary = true
         resConfigs "zh", "zh-rCN", "zh-rHK", "zh-rTW",
                 "es", "ja", "ko", "fr", "de", "th"
@@ -115,6 +115,7 @@ dependencies {
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation "androidx.fragment:fragment:1.3.0-rc01"
     implementation 'com.alibaba:fastjson:1.2.73'
+    implementation "androidx.preference:preference:1.0.0"
     implementation 'androidx.recyclerview:recyclerview:1.2.0'
 
 //     https://mvnrepository.com/artifact/com.fpliu.ndk.pkg.prefab.android.21/libpng

diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.java b/app/src/main/java/com/hippo/ehviewer/Settings.java
@@ -1242,6 +1242,18 @@ public static void setLoginState(boolean value) {
     }
 
 
+    private static final String SHOW_GALLERY_REVIEW = "is_show_gallery_review";
+
+    private static boolean IS_SHOW_GALLERY_REVIEW = false;
+
+    public static boolean isShowGalleryReview() {
+        return getBoolean(SHOW_GALLERY_REVIEW, IS_SHOW_GALLERY_REVIEW);
+    }
+
+    public static void setShowGalleryReview(boolean value) {
+        putBoolean(SHOW_GALLERY_REVIEW, value);
+    }
+
     public static final String USER_BACKGROUND_IMAGE = "background_image_path";
     public static final String USER_AVATAR_IMAGE = "avatar_image_path";
 

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java
@@ -1366,12 +1366,6 @@ public void onBindViewHolder(DownloadHolder holder, int position) {
             }
             bindForState(holder, info);
 
-            if (searchKey != null && !searchKey.isEmpty()) {
-                if (!title.contains(searchKey)) {
-                    holder.itemView.setVisibility(View.GONE);
-                }
-            }
-
             // Update transition name
             ViewCompat.setTransitionName(holder.thumb, TransitionNameFactory.getThumbTransitionName(info.gid));
         }

diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
@@ -245,9 +245,6 @@ public void setSuggestionProvider(SuggestionProvider suggestionProvider) {
     }
 
     public void setText(String text) {
-        if (text == null || text.isEmpty()) {
-            return;
-        }
         mEditText.setText(text);
     }
 

diff --git a/app/src/main/java/com/hippo/util/ExceptionUtils.java b/app/src/main/java/com/hippo/util/ExceptionUtils.java
@@ -56,15 +56,15 @@ public static String getReadableString(@NonNull Throwable e) {
                 sb.append(", ").append(sce.getMessage());
             }
             return sb.toString();
-        } else if (e instanceof ProtocolException && e.getMessage().startsWith("Too many follow-up requests:")) {
+        } else if (e instanceof ProtocolException && e.getMessage() != null && e.getMessage().startsWith("Too many follow-up requests:")) {
             return GetText.getString(R.string.error_redirection);
         } else if (e instanceof ProtocolException || e instanceof SocketException || e instanceof SSLException) {
             return GetText.getString(R.string.error_socket);
         } else if (e instanceof EhException) {
-            return ""+e.getMessage();
+            return "" + e.getMessage();
         } else {
-            if (e.getLocalizedMessage() == null){
-                return ""+e.getMessage();
+            if (e.getLocalizedMessage() == null) {
+                return "" + e.getMessage();
             }
             if (e.getLocalizedMessage().equals(e.getMessage())) {
                 return e.getLocalizedMessage();

diff --git a/app/src/main/res/xml/about_settings.xml b/app/src/main/res/xml/about_settings.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <Preference
@@ -55,4 +55,4 @@
         android:key="donate"
         android:title="@string/settings_about_donate" />
 
-</androidx.preference.PreferenceScreen>
+</PreferenceScreen>