From e33cca9fd96f58362c7560e88dec1341d11445f2 Mon Sep 17 00:00:00 2001 From: tarsin Date: Tue, 13 Dec 2022 20:54:45 +0800 Subject: [PATCH] Reformat code --- .../com/hippo/beerbelly/DiskLruCache.java | 32 +++++++------- .../java/com/hippo/ehviewer/Settings.java | 2 +- .../java/com/hippo/ehviewer/UrlOpener.java | 3 +- .../com/hippo/ehviewer/dao/HistoryInfo.java | 5 +-- .../hippo/ehviewer/gallery/EhPageLoader.java | 3 +- .../hippo/ehviewer/gallery/PageLoader2.java | 3 +- .../hippo/ehviewer/spider/SpiderQueen.java | 2 +- .../ehviewer/ui/scene/CookieSignInScene.java | 42 +++++++++---------- .../ehviewer/ui/scene/DownloadsScene.java | 2 +- .../ehviewer/ui/scene/GalleryDetailScene.java | 2 +- .../ehviewer/ui/scene/GalleryListScene.java | 2 +- .../ui/scene/GalleryPreviewsScene.java | 3 +- .../hippo/ehviewer/ui/scene/HistoryScene.kt | 2 +- .../hippo/ehviewer/ui/scene/SearchBarScene.kt | 3 +- 14 files changed, 55 insertions(+), 51 deletions(-) diff --git a/app/src/main/java/com/hippo/beerbelly/DiskLruCache.java b/app/src/main/java/com/hippo/beerbelly/DiskLruCache.java index 68c355f48..c3a92b434 100644 --- a/app/src/main/java/com/hippo/beerbelly/DiskLruCache.java +++ b/app/src/main/java/com/hippo/beerbelly/DiskLruCache.java @@ -290,21 +290,7 @@ public final class DiskLruCache implements Closeable { } finally { Util.closeQuietly(reader); } - } private final Callable cleanupCallable = new Callable<>() { - public Void call() throws Exception { - synchronized (DiskLruCache.this) { - if (journalWriter == null) { - return null; // Closed. - } - trimToSize(); - if (journalRebuildRequired()) { - rebuildJournal(); - redundantOpCount = 0; - } - } - return null; - } - }; + } private void readJournalLine(String line) throws IOException { int firstSpace = line.indexOf(' '); @@ -343,7 +329,21 @@ public final class DiskLruCache implements Closeable { } else { throw new IOException("unexpected journal line: " + line); } - } + } private final Callable cleanupCallable = new Callable<>() { + public Void call() throws Exception { + synchronized (DiskLruCache.this) { + if (journalWriter == null) { + return null; // Closed. + } + trimToSize(); + if (journalRebuildRequired()) { + rebuildJournal(); + redundantOpCount = 0; + } + } + return null; + } + }; /** * Computes the initial size and collects garbage as a part of opening the diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.java b/app/src/main/java/com/hippo/ehviewer/Settings.java index 17011c2b7..9cc13ba48 100755 --- a/app/src/main/java/com/hippo/ehviewer/Settings.java +++ b/app/src/main/java/com/hippo/ehviewer/Settings.java @@ -230,9 +230,9 @@ public class Settings { 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; + public static SharedPreferences sSettingsPre; private static int LIST_THUMB_SIZE = 40; private static Context sContext; - public static SharedPreferences sSettingsPre; private static EhConfig sEhConfig; public static void initialize(Context context) { diff --git a/app/src/main/java/com/hippo/ehviewer/UrlOpener.java b/app/src/main/java/com/hippo/ehviewer/UrlOpener.java index 92c35a54e..38333737a 100644 --- a/app/src/main/java/com/hippo/ehviewer/UrlOpener.java +++ b/app/src/main/java/com/hippo/ehviewer/UrlOpener.java @@ -29,11 +29,12 @@ import androidx.browser.customtabs.CustomTabsIntent; import com.hippo.ehviewer.client.EhUrlOpener; import com.hippo.ehviewer.client.data.GalleryDetail; import com.hippo.ehviewer.client.parser.GalleryPageUrlParser; -import eu.kanade.tachiyomi.ui.reader.ReaderActivity; import com.hippo.ehviewer.ui.MainActivity; import com.hippo.scene.Announcer; import com.hippo.scene.StageActivity; +import eu.kanade.tachiyomi.ui.reader.ReaderActivity; + public final class UrlOpener { private UrlOpener() { diff --git a/app/src/main/java/com/hippo/ehviewer/dao/HistoryInfo.java b/app/src/main/java/com/hippo/ehviewer/dao/HistoryInfo.java index da8437cd1..834e16650 100644 --- a/app/src/main/java/com/hippo/ehviewer/dao/HistoryInfo.java +++ b/app/src/main/java/com/hippo/ehviewer/dao/HistoryInfo.java @@ -20,12 +20,11 @@ public class HistoryInfo extends GalleryInfo { return new HistoryInfo[size]; } }; - + @ColumnInfo(name = "TIME") + public long time; // Use MODE for favoriteSlot @ColumnInfo(name = "MODE") private int mode; - @ColumnInfo(name = "TIME") - public long time; protected HistoryInfo(Parcel in) { super(in); diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.java b/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.java index 9c57fefd2..2aaf55bad 100644 --- a/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.java +++ b/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.java @@ -23,13 +23,14 @@ import androidx.annotation.Nullable; import com.hippo.ehviewer.client.data.GalleryInfo; import com.hippo.ehviewer.spider.SpiderQueen; -import eu.kanade.tachiyomi.ui.reader.loader.PageLoader; import com.hippo.image.Image; import com.hippo.unifile.UniFile; import com.hippo.yorozuya.SimpleHandler; import java.util.Locale; +import eu.kanade.tachiyomi.ui.reader.loader.PageLoader; + public class EhPageLoader extends PageLoader2 implements SpiderQueen.OnSpiderListener { private final Context mContext; diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/PageLoader2.java b/app/src/main/java/com/hippo/ehviewer/gallery/PageLoader2.java index 1436f7d42..d66173882 100644 --- a/app/src/main/java/com/hippo/ehviewer/gallery/PageLoader2.java +++ b/app/src/main/java/com/hippo/ehviewer/gallery/PageLoader2.java @@ -19,9 +19,10 @@ package com.hippo.ehviewer.gallery; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import eu.kanade.tachiyomi.ui.reader.loader.PageLoader; import com.hippo.unifile.UniFile; +import eu.kanade.tachiyomi.ui.reader.loader.PageLoader; + public abstract class PageLoader2 extends PageLoader { // With dot diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java index 529350d68..cbb5f0964 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java @@ -49,7 +49,6 @@ import com.hippo.ehviewer.client.parser.GalleryPageApiParser; import com.hippo.ehviewer.client.parser.GalleryPageParser; import com.hippo.ehviewer.client.parser.GalleryPageUrlParser; import com.hippo.ehviewer.gallery.PageLoader2; -import eu.kanade.tachiyomi.ui.reader.loader.PageLoader; import com.hippo.image.Image; import com.hippo.streampipe.InputStreamPipe; import com.hippo.streampipe.OutputStreamPipe; @@ -84,6 +83,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import eu.kanade.tachiyomi.ui.reader.loader.PageLoader; import okhttp3.Call; import okhttp3.MediaType; import okhttp3.OkHttpClient; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java index 1830c37a9..de8cc353d 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java @@ -201,27 +201,6 @@ public class CookieSignInScene extends SolidScene implements EditText.OnEditorAc EhApplication.getEhClient().execute(request); } - private class CookieSignInListener implements EhClient.Callback { - @Override - public void onSuccess(Object result) { - setResult(RESULT_OK, null); - finish(); - } - - @Override - public void onFailure(Exception e) { - EhApplication.getEhCookieStore().signOut(); - new BaseDialogBuilder(requireContext()).setTitle(R.string.sign_in_failed) - .setMessage(ExceptionUtils.getReadableString(e) + "\n\n" + getString(R.string.wrong_cookie_warning)) - .setPositiveButton(R.string.get_it, null).show(); - } - - @Override - public void onCancel() { - EhApplication.getEhCookieStore().signOut(); - } - } - private void storeCookie(String id, String hash, String igneous) { Context context = getContext(); if (null == context) { @@ -302,4 +281,25 @@ public class CookieSignInScene extends SolidScene implements EditText.OnEditorAc showTip(R.string.from_clipboard_error, LENGTH_SHORT); } } + + private class CookieSignInListener implements EhClient.Callback { + @Override + public void onSuccess(Object result) { + setResult(RESULT_OK, null); + finish(); + } + + @Override + public void onFailure(Exception e) { + EhApplication.getEhCookieStore().signOut(); + new BaseDialogBuilder(requireContext()).setTitle(R.string.sign_in_failed) + .setMessage(ExceptionUtils.getReadableString(e) + "\n\n" + getString(R.string.wrong_cookie_warning)) + .setPositiveButton(R.string.get_it, null).show(); + } + + @Override + public void onCancel() { + EhApplication.getEhCookieStore().signOut(); + } + } } 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 index 09a5dc090..7368e002b 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java @@ -70,7 +70,6 @@ import com.hippo.ehviewer.dao.DownloadLabel; import com.hippo.ehviewer.download.DownloadManager; import com.hippo.ehviewer.download.DownloadService; import com.hippo.ehviewer.spider.SpiderDen; -import eu.kanade.tachiyomi.ui.reader.ReaderActivity; import com.hippo.ehviewer.widget.SimpleRatingView; import com.hippo.scene.Announcer; import com.hippo.unifile.UniFile; @@ -89,6 +88,7 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; +import eu.kanade.tachiyomi.ui.reader.ReaderActivity; import rikka.core.res.ResourcesKt; @SuppressLint("RtlHardcoded") diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java index d963908c9..ade0f8747 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java @@ -93,7 +93,6 @@ import com.hippo.ehviewer.gallery.EhPageLoader; import com.hippo.ehviewer.gallery.PageLoader2; import com.hippo.ehviewer.spider.SpiderDen; import com.hippo.ehviewer.ui.CommonOperations; -import eu.kanade.tachiyomi.ui.reader.ReaderActivity; import com.hippo.ehviewer.ui.GalleryInfoBottomSheet; import com.hippo.ehviewer.ui.MainActivity; import com.hippo.ehviewer.ui.annotation.WholeLifeCircle; @@ -124,6 +123,7 @@ import java.util.ArrayList; import java.util.List; import coil.Coil; +import eu.kanade.tachiyomi.ui.reader.ReaderActivity; import okhttp3.HttpUrl; import rikka.core.res.ResourcesKt; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java index 151aefe31..7f0b9a26b 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java @@ -87,7 +87,6 @@ import com.hippo.ehviewer.dao.DownloadLabel; import com.hippo.ehviewer.dao.QuickSearch; import com.hippo.ehviewer.download.DownloadManager; import com.hippo.ehviewer.ui.CommonOperations; -import eu.kanade.tachiyomi.ui.reader.ReaderActivity; import com.hippo.ehviewer.ui.MainActivity; import com.hippo.ehviewer.ui.dialog.SelectItemWithIconAdapter; import com.hippo.ehviewer.widget.GalleryInfoContentHelper; @@ -117,6 +116,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import eu.kanade.tachiyomi.ui.reader.ReaderActivity; import rikka.core.res.ResourcesKt; @SuppressLint("RtlHardcoded") diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java index 1db3f3bf7..e3528d52e 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java @@ -49,7 +49,6 @@ import com.hippo.ehviewer.client.data.GalleryInfo; import com.hippo.ehviewer.client.data.GalleryPreview; import com.hippo.ehviewer.client.data.PreviewSet; import com.hippo.ehviewer.client.exception.EhException; -import eu.kanade.tachiyomi.ui.reader.ReaderActivity; import com.hippo.ehviewer.ui.MainActivity; import com.hippo.scene.SceneFragment; import com.hippo.widget.ContentLayout; @@ -62,6 +61,8 @@ import com.hippo.yorozuya.ViewUtils; import java.util.ArrayList; import java.util.Locale; +import eu.kanade.tachiyomi.ui.reader.ReaderActivity; + public class GalleryPreviewsScene extends ToolbarScene { public static final String KEY_GALLERY_INFO = "gallery_info"; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt index b64903a6d..0b46d9611 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.kt @@ -45,7 +45,6 @@ import com.hippo.ehviewer.dao.DownloadInfo import com.hippo.ehviewer.dao.HistoryInfo import com.hippo.ehviewer.download.DownloadManager.DownloadInfoListener import com.hippo.ehviewer.ui.CommonOperations -import eu.kanade.tachiyomi.ui.reader.ReaderActivity import com.hippo.ehviewer.ui.dialog.SelectItemWithIconAdapter import com.hippo.ehviewer.widget.SimpleRatingView import com.hippo.scene.Announcer @@ -54,6 +53,7 @@ import com.hippo.view.ViewTransition import com.hippo.widget.LoadImageView import com.hippo.widget.recyclerview.AutoStaggeredGridLayoutManager import com.hippo.yorozuya.ViewUtils +import eu.kanade.tachiyomi.ui.reader.ReaderActivity import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch import rikka.core.res.resolveColor diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt index d9294cbed..96d14562c 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt @@ -220,7 +220,8 @@ abstract class SearchBarScene : ToolbarScene() { } - inner class TagSuggestion constructor(private var mHint: String, private var mKeyword: String) : Suggestion() { + inner class TagSuggestion constructor(private var mHint: String, private var mKeyword: String) : + Suggestion() { override fun getText(textView: TextView): CharSequence { return if (textView.id == android.R.id.text1) {