Revert "Reformat Code"

This reverts commit e0f7dab34f.

app/src/main/java/com/hippo/ehviewer/Settings.java

@@ -97,13 +97,16 @@ public class Settings {
     public static final String KEY_BUILT_IN_HOSTS = "built_in_hosts_2";
     public static final String KEY_DOMAIN_FRONTING = "domain_fronting";
     public static final String KEY_APP_LANGUAGE = "app_language";
-    public static final String KEY_LIST_THUMB_SIZE = "list_tile_size";
     private static final String TAG = Settings.class.getSimpleName();
     private static final String KEY_VERSION_CODE = "version_code";
     private static final int DEFAULT_VERSION_CODE = 0;
     private static final String KEY_DISPLAY_NAME = "display_name";
     private static final String DEFAULT_DISPLAY_NAME = null;
+    public static final String KEY_LIST_THUMB_SIZE = "list_tile_size";
     private static final int DEFAULT_LIST_THUMB_SIZE = 40;
+    private static int LIST_THUMB_SIZE = 40;
+
+    public static boolean LIST_THUMB_SIZE_INITED = false;
     private static final String KEY_AVATAR = "avatar";
     private static final String DEFAULT_AVATAR = null;
     private static final String KEY_SHOW_WARNING = "show_warning";
@@ -276,9 +279,11 @@ public class Settings {
     private static final int DEFAULT_DOWNLOAD_DELAY = 0;
     private static final String KEY_REQUEST_NEWS = "request_news";
     private static final boolean DEFAULT_REQUEST_NEWS = true;
+
+
     private static final String KEY_ARCHIVE_PASSWDS = "archive_passwds";
-    public static boolean LIST_THUMB_SIZE_INITED = false;
-    private static int LIST_THUMB_SIZE = 40;
+
+
     private static Context sContext;
     private static SharedPreferences sSettingsPre;
     private static EhConfig sEhConfig;

app/src/main/java/com/hippo/ehviewer/client/data/FavListUrlBuilder.java

@@ -19,12 +19,13 @@ package com.hippo.ehviewer.client.data;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.hippo.ehviewer.client.EhUrl;
 import com.hippo.network.UrlBuilder;
 
+import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 
 public class FavListUrlBuilder implements Parcelable {
 
@@ -92,13 +93,17 @@ public class FavListUrlBuilder implements Parcelable {
             ub.addQuery("favcat", "all");
         }
         if (!TextUtils.isEmpty(mKeyword)) {
-            ub.addQuery("f_search", URLEncoder.encode(mKeyword, StandardCharsets.UTF_8));
-            // Name
-            ub.addQuery("sn", "on");
-            // Tags
-            ub.addQuery("st", "on");
-            // Note
-            ub.addQuery("sf", "on");
+            try {
+                ub.addQuery("f_search", URLEncoder.encode(mKeyword, "UTF-8"));
+                // Name
+                ub.addQuery("sn", "on");
+                // Tags
+                ub.addQuery("st", "on");
+                // Note
+                ub.addQuery("sf", "on");
+            } catch (UnsupportedEncodingException e) {
+                Log.e(TAG, "Can't URLEncoder.encode " + mKeyword);
+            }
         }
         if (mIndex > 0) {
             ub.addQuery("page", Integer.toString(mIndex));

app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.java

@@ -32,11 +32,11 @@ import com.hippo.network.UrlBuilder;
 import com.hippo.yorozuya.NumberUtils;
 import com.hippo.yorozuya.StringUtils;
 
+import java.io.UnsupportedEncodingException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 
 public class ListUrlBuilder implements Cloneable, Parcelable {
 
@@ -383,8 +383,8 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
                     break;
                 case "f_search":
                     try {
-                        keyword = URLDecoder.decode(value, StandardCharsets.UTF_8);
-                    } catch (IllegalArgumentException e) {
+                        keyword = URLDecoder.decode(value, "utf-8");
+                    } catch (UnsupportedEncodingException | IllegalArgumentException e) {
                         // Ignore
                     }
                     break;
@@ -514,7 +514,11 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
                 if (mKeyword != null) {
                     String keyword = mKeyword.trim();
                     if (!keyword.isEmpty()) {
-                        ub.addQuery("f_search", URLEncoder.encode(mKeyword, StandardCharsets.UTF_8));
+                        try {
+                            ub.addQuery("f_search", URLEncoder.encode(mKeyword, "UTF-8"));
+                        } catch (UnsupportedEncodingException e) {
+                            // Empty
+                        }
                     }
                 }
                 if (mSHash != null) {
@@ -561,7 +565,11 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
             case MODE_UPLOADER: {
                 StringBuilder sb = new StringBuilder(EhUrl.getHost());
                 sb.append("uploader/");
-                sb.append(URLEncoder.encode(mKeyword, StandardCharsets.UTF_8));
+                try {
+                    sb.append(URLEncoder.encode(mKeyword, "UTF-8"));
+                } catch (UnsupportedEncodingException e) {
+                    // Empty
+                }
                 if (mPageIndex != 0) {
                     sb.append('/').append(mPageIndex);
                 }
@@ -570,7 +578,11 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
             case MODE_TAG: {
                 StringBuilder sb = new StringBuilder(EhUrl.getHost());
                 sb.append("tag/");
-                sb.append(URLEncoder.encode(mKeyword, StandardCharsets.UTF_8));
+                try {
+                    sb.append(URLEncoder.encode(mKeyword, "UTF-8"));
+                } catch (UnsupportedEncodingException e) {
+                    // Empty
+                }
                 if (mPageIndex != 0) {
                     sb.append('/').append(mPageIndex);
                 }
@@ -583,7 +595,11 @@ public class ListUrlBuilder implements Cloneable, Parcelable {
             case MODE_TOPLIST:
                 StringBuilder sb = new StringBuilder(EhUrl.HOST_E);
                 sb.append("toplist.php?tl=");
-                sb.append(URLEncoder.encode(mKeyword, StandardCharsets.UTF_8));
+                try {
+                    sb.append(URLEncoder.encode(mKeyword, "UTF-8"));
+                } catch (UnsupportedEncodingException e) {
+                    // Empty
+                }
                 if (mPageIndex != 0) {
                     sb.append("&p=").append(mPageIndex);
                 }

app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListUrlParser.java

@@ -23,10 +23,10 @@ import com.hippo.ehviewer.client.EhUrl;
 import com.hippo.ehviewer.client.data.ListUrlBuilder;
 import com.hippo.yorozuya.Utilities;
 
+import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
 
 public final class GalleryListUrlParser {
 
@@ -91,7 +91,11 @@ public final class GalleryListUrlParser {
             uploader = path.substring(prefixLength, index);
         }
 
-        uploader = URLDecoder.decode(uploader, StandardCharsets.UTF_8);
+        try {
+            uploader = URLDecoder.decode(uploader, "utf-8");
+        } catch (UnsupportedEncodingException e) {
+            return null;
+        }
 
         if (TextUtils.isEmpty(uploader)) {
             return null;
@@ -116,7 +120,11 @@ public final class GalleryListUrlParser {
             tag = path.substring(prefixLength, index);
         }
 
-        tag = URLDecoder.decode(tag, StandardCharsets.UTF_8);
+        try {
+            tag = URLDecoder.decode(tag, "utf-8");
+        } catch (UnsupportedEncodingException e) {
+            return null;
+        }
 
         if (TextUtils.isEmpty(tag)) {
             return null;

app/src/main/java/com/hippo/ehviewer/dao/BasicDao.java

@@ -4,6 +4,5 @@ import java.util.List;
 
 public interface BasicDao<T> {
     List<T> list();
-
     long insert(T t);
 }

app/src/main/java/com/hippo/ehviewer/gallery/ArchiveGalleryProvider.java

@@ -48,13 +48,14 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
     private final UriArchiveAccessor archiveAccessor;
     private final Stack<Integer> requests = new Stack<>();
     private final LinkedHashMap<Integer, Long> streams = new LinkedHashMap<>();
-    private final Thread[] decodeThread = new Thread[]{
+    private Thread archiveThread;
+    private Thread[] decodeThread = new Thread[] {
             new Thread(new DecodeTask()),
             new Thread(new DecodeTask()),
             new Thread(new DecodeTask()),
             new Thread(new DecodeTask())
     };
-    private Thread archiveThread;
+
     private volatile int size = STATE_WAIT;
     private String error;
 
@@ -167,7 +168,7 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
     }
 
     private class ArchiveHostTask implements Runnable {
-        public final Thread[] archiveThreads = new Thread[]{
+        public final Thread[] archiveThreads = new Thread[] {
                 new Thread(new ArchiveTask()),
                 new Thread(new ArchiveTask()),
                 new Thread(new ArchiveTask()),

app/src/main/java/com/hippo/ehviewer/preference/VersionPreference.kt

@@ -56,7 +56,7 @@ class VersionPreference @JvmOverloads constructor(
         }
 
         fun getMessage(): String {
-            return message
+            return message;
         }
 
         fun addLib(msg: String): NativeLibInfo {

app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt

@@ -121,7 +121,7 @@ abstract class EhActivity : AppCompatActivity() {
     }
 
     @RequiresApi(api = Build.VERSION_CODES.TIRAMISU)
-    fun checkAndRequestNotificationPermission() {
+    fun checkAndRequestNotificationPermission(){
         if (ContextCompat.checkSelfPermission(
                 this,
                 Manifest.permission.POST_NOTIFICATIONS

app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java

@@ -290,7 +290,16 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
         }
         outState.putInt(KEY_PAGE, mPage);
         outState.putInt(KEY_CURRENT_INDEX, mCurrentIndex);
-    }
+    }    ActivityResultLauncher<String> requestStoragePermissionLauncher = registerForActivityResult(
+            new ActivityResultContracts.RequestPermission(),
+            result -> {
+                if (result && mSavingPage != -1) {
+                    saveImage(mSavingPage);
+                } else {
+                    Toast.makeText(this, R.string.error_cant_save_image, Toast.LENGTH_SHORT).show();
+                }
+                mSavingPage = -1;
+            });
 
     @Override
     protected void attachBaseContext(@NonNull Context newBase) {
@@ -303,16 +312,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
                 break;
         }
         super.attachBaseContext(newBase);
-    }    ActivityResultLauncher<String> requestStoragePermissionLauncher = registerForActivityResult(
-            new ActivityResultContracts.RequestPermission(),
-            result -> {
-                if (result && mSavingPage != -1) {
-                    saveImage(mSavingPage);
-                } else {
-                    Toast.makeText(this, R.string.error_cant_save_image, Toast.LENGTH_SHORT).show();
-                }
-                mSavingPage = -1;
-            });
+    }
 
     @Override
     @SuppressWarnings({"WrongConstant"})
@@ -410,7 +410,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
                     if (scroll < 0.0f) {
                         if (mLayoutMode == GalleryView.LAYOUT_RIGHT_TO_LEFT) {
                             mGalleryView.pageLeft();
-                        } else if (mLayoutMode == GalleryView.LAYOUT_LEFT_TO_RIGHT) {
+                        } else if (mLayoutMode == GalleryView.LAYOUT_LEFT_TO_RIGHT){
                             mGalleryView.pageRight();
                         } else if (mLayoutMode == GalleryView.LAYOUT_TOP_TO_BOTTOM) {
                             mGalleryView.onScroll(0, -scroll, 0, -scroll, 0, -scroll);
@@ -1375,6 +1375,4 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
     }
 
 
-
-
 }

app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt

@@ -33,8 +33,7 @@ class SettingsActivity : EhActivity() {
         setSupportActionBar(findViewById(R.id.toolbar))
         val bar = supportActionBar
         bar?.setDisplayHomeAsUpEnabled(true)
-        WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars =
-            (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_YES) <= 0
+        WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_YES) <= 0
         if (savedInstanceState == null) {
             supportFragmentManager
                 .beginTransaction()

app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java

@@ -70,8 +70,7 @@ public class BasePreferenceFragment extends PreferenceFragmentCompat
                     .replace(R.id.fragment, classObj)
                     .addToBackStack(null)
                     .commitAllowingStateLoss();
-        } catch (ClassNotFoundException | IllegalAccessException |
-                 java.lang.InstantiationException ignored) {
+        } catch (ClassNotFoundException | IllegalAccessException | java.lang.InstantiationException ignored) {
         }
         return true;
     }

app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java

@@ -21,10 +21,13 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
+import android.graphics.Point;
+import android.graphics.Rect;
 import android.os.Bundle;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.util.SparseBooleanArray;
+import android.view.Display;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -74,6 +77,7 @@ import com.hippo.widget.ContentLayout;
 import com.hippo.widget.FabLayout;
 import com.hippo.widget.SearchBarMover;
 import com.hippo.yorozuya.AssertUtils;
+import com.hippo.yorozuya.LayoutUtils;
 import com.hippo.yorozuya.ObjectUtils;
 import com.hippo.yorozuya.SimpleHandler;
 import com.hippo.yorozuya.ViewUtils;

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java

@@ -134,8 +134,6 @@ public final class GalleryListScene extends BaseScene
     private final static int STATE_SEARCH = 2;
     private final static int STATE_SEARCH_SHOW_LIST = 3;
     private static final long ANIMATE_TIME = 300L;
-    // Double click back exit
-    private final long mPressBackTime = 0;
     /*---------------
      Whole life cycle
      ---------------*/
@@ -216,6 +214,8 @@ public final class GalleryListScene extends BaseScene
             }
         }
     };
+    // Double click back exit
+    private long mPressBackTime = 0;
     private boolean mHasFirstRefresh = false;
     private int mNavCheckedId = 0;
     private DownloadManager mDownloadManager;

app/src/main/java/com/hippo/ehviewer/ui/scene/SolidScene.java

@@ -20,6 +20,7 @@ import android.os.Bundle;
 import android.util.Log;
 
 import com.hippo.ehviewer.Settings;
+import com.hippo.ehviewer.client.EhUtils;
 import com.hippo.scene.Announcer;
 
 /**

app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.kt

@@ -242,7 +242,7 @@ class SearchLayout @JvmOverloads constructor(
     override fun onTabReselected(tab: TabLayout.Tab) {}
 
     @IntDef(SEARCH_MODE_NORMAL, SEARCH_MODE_IMAGE)
-    @Retention(AnnotationRetention.SOURCE)
+    @kotlin.annotation.Retention(AnnotationRetention.SOURCE)
     private annotation class SearchMode
     interface Helper {
         fun onChangeSearchMode()