diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.java b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.java index 294f92ebc..654177587 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.java +++ b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.java @@ -146,7 +146,7 @@ public class EhEngine { } String url = EhUrl.API_SIGN_IN; Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()) + Request request = new EhRequestBuilder(url) .post(builder.build()) .build(); Call call = okHttpClient.newCall(request); @@ -175,7 +175,7 @@ public class EhEngine { public static GalleryListParser.Result getGalleryList(@Nullable EhClient.Task task, OkHttpClient okHttpClient, String url) throws Throwable { Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()).build(); + Request request = new EhRequestBuilder(url).build(); Call call = okHttpClient.newCall(request); // Put call @@ -308,7 +308,7 @@ public class EhEngine { public static GalleryDetail getGalleryDetail(@Nullable EhClient.Task task, OkHttpClient okHttpClient, String url) throws Throwable { Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()).build(); + Request request = new EhRequestBuilder(url).build(); Call call = okHttpClient.newCall(request); // Put call @@ -336,7 +336,7 @@ public class EhEngine { public static Pair getPreviewSet( @Nullable EhClient.Task task, OkHttpClient okHttpClient, String url) throws Throwable { Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()).build(); + Request request = new EhRequestBuilder(url).build(); Call call = okHttpClient.newCall(request); // Put call @@ -374,7 +374,7 @@ public class EhEngine { final RequestBody requestBody = RequestBody.create(MEDIA_TYPE_JSON, json.toString()); String url = EhUrl.getApiUrl(); Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()) + Request request = new EhRequestBuilder(url) .post(requestBody) .build(); Call call = okHttpClient.newCall(request); @@ -405,7 +405,7 @@ public class EhEngine { FormBody.Builder builder = new FormBody.Builder() .add("commenttext_new", comment); Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()) + Request request = new EhRequestBuilder(url) .post(builder.build()) .build(); Call call = okHttpClient.newCall(request); @@ -447,7 +447,7 @@ public class EhEngine { final RequestBody requestBody = RequestBody.create(MEDIA_TYPE_JSON, json.toString()); String url = EhUrl.getApiUrl(); Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()) + Request request = new EhRequestBuilder(url) .post(requestBody) .build(); Call call = okHttpClient.newCall(request); @@ -476,7 +476,7 @@ public class EhEngine { public static FavoritesParser.Result getFavorites(@Nullable EhClient.Task task, OkHttpClient okHttpClient, String url, boolean callApi) throws Throwable { Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()).build(); + Request request = new EhRequestBuilder(url).build(); Call call = okHttpClient.newCall(request); // Put call @@ -535,7 +535,7 @@ public class EhEngine { builder.add("update", "1"); String url = EhUrl.getAddFavorites(gid, token); Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()) + Request request = new EhRequestBuilder(url) .post(builder.build()) .build(); Call call = okHttpClient.newCall(request); @@ -589,7 +589,7 @@ public class EhEngine { } builder.add("apply", "Apply"); Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()) + Request request = new EhRequestBuilder(url) .post(builder.build()) .build(); Call call = okHttpClient.newCall(request); @@ -630,7 +630,7 @@ public class EhEngine { public static Pair[] getTorrentList(@Nullable EhClient.Task task, OkHttpClient okHttpClient, String url) throws Throwable { Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()).build(); + Request request = new EhRequestBuilder(url).build(); Call call = okHttpClient.newCall(request); // Put call @@ -660,7 +660,7 @@ public class EhEngine { public static Pair[]> getArchiveList(@Nullable EhClient.Task task, OkHttpClient okHttpClient, String url) throws Throwable { Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()).build(); + Request request = new EhRequestBuilder(url).build(); Call call = okHttpClient.newCall(request); // Put call @@ -699,7 +699,7 @@ public class EhEngine { builder.add("hathdl_xres", res); String url = EhUrl.getDownloadArchive(gid, token, or); Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()) + Request request = new EhRequestBuilder(url) .post(builder.build()) .build(); Call call = okHttpClient.newCall(request); @@ -736,7 +736,7 @@ public class EhEngine { OkHttpClient okHttpClient) throws Throwable { String url = EhUrl.HOST_E; Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()).build(); + Request request = new EhRequestBuilder(url).build(); Call call = okHttpClient.newCall(request); // Put call @@ -775,7 +775,7 @@ public class EhEngine { private static ProfileParser.Result getProfileInternal(@Nullable EhClient.Task task, OkHttpClient okHttpClient, String url) throws Throwable { Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()).build(); + Request request = new EhRequestBuilder(url).build(); Call call = okHttpClient.newCall(request); // Put call @@ -803,7 +803,7 @@ public class EhEngine { OkHttpClient okHttpClient) throws Throwable { String url = EhUrl.URL_FORUMS; Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()).build(); + Request request = new EhRequestBuilder(url).build(); Call call = okHttpClient.newCall(request); // Put call @@ -840,7 +840,7 @@ public class EhEngine { final RequestBody requestBody = RequestBody.create(MEDIA_TYPE_JSON, json.toString()); String url = EhUrl.getApiUrl(); Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()) + Request request = new EhRequestBuilder(url) .post(requestBody) .build(); Call call = okHttpClient.newCall(request); @@ -901,7 +901,7 @@ public class EhEngine { ); String url = EhUrl.getImageSearchUrl(); Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()) + Request request = new EhRequestBuilder(url) .post(builder.build()) .build(); Call call = okHttpClient.newCall(request); @@ -966,7 +966,7 @@ public class EhEngine { public static GalleryPageParser.Result getGalleryPage(@Nullable EhClient.Task task, OkHttpClient okHttpClient, String url) throws Throwable { Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()).build(); + Request request = new EhRequestBuilder(url).build(); Call call = okHttpClient.newCall(request); // Put call @@ -1001,7 +1001,7 @@ public class EhEngine { final RequestBody requestBody = RequestBody.create(MEDIA_TYPE_JSON, json.toString()); String url = EhUrl.getApiUrl(); Log.d(TAG, url); - Request request = new EhRequestBuilder(url, null != task ? task.getEhConfig() : Settings.getEhConfig()) + Request request = new EhRequestBuilder(url) .post(requestBody) .build(); Call call = okHttpClient.newCall(request); diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhRequestBuilder.java b/app/src/main/java/com/hippo/ehviewer/client/EhRequestBuilder.java index ec681f78b..7c4b24c49 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/EhRequestBuilder.java +++ b/app/src/main/java/com/hippo/ehviewer/client/EhRequestBuilder.java @@ -16,17 +16,11 @@ package com.hippo.ehviewer.client; -import com.hippo.ehviewer.Settings; import com.hippo.okhttp.ChromeRequestBuilder; public class EhRequestBuilder extends ChromeRequestBuilder { public EhRequestBuilder(String url) { - this(url, Settings.getEhConfig()); - } - - public EhRequestBuilder(String url, EhConfig ehConfig) { super(url); - tag(ehConfig); } } 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 5e492a28c..ac9240687 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java @@ -33,7 +33,6 @@ import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.GetText; import com.hippo.ehviewer.R; import com.hippo.ehviewer.Settings; -import com.hippo.ehviewer.client.EhConfig; import com.hippo.ehviewer.client.EhEngine; import com.hippo.ehviewer.client.EhRequestBuilder; import com.hippo.ehviewer.client.EhUrl; @@ -736,14 +735,14 @@ public final class SpiderQueen implements Runnable { } } - private SpiderInfo readSpiderInfoFromInternet(EhConfig config) { + private SpiderInfo readSpiderInfoFromInternet() { try { SpiderInfo spiderInfo = new SpiderInfo(); spiderInfo.gid = mGalleryInfo.gid; spiderInfo.token = mGalleryInfo.token; Request request = new EhRequestBuilder(EhUrl.getGalleryDetailUrl( - mGalleryInfo.gid, mGalleryInfo.token, 0, false), config).build(); + mGalleryInfo.gid, mGalleryInfo.token, 0, false)).build(); Response response = mHttpClient.newCall(request).execute(); String body = response.body().string(); @@ -757,7 +756,7 @@ public final class SpiderQueen implements Runnable { } } - private String getPTokenFromInternet(int index, EhConfig config) { + private String getPTokenFromInternet(int index) { SpiderInfo spiderInfo = mSpiderInfo.get(); if (spiderInfo == null) { return null; @@ -781,7 +780,7 @@ public final class SpiderQueen implements Runnable { Log.d(TAG, "index " + index + ", previewIndex " + previewIndex + ", previewPerPage " + spiderInfo.previewPerPage+ ", url " + url); } - Request request = new EhRequestBuilder(url, config).build(); + Request request = new EhRequestBuilder(url).build(); Response response = mHttpClient.newCall(request).execute(); String body = response.body().string(); readPreviews(body, previewIndex, spiderInfo); @@ -827,11 +826,6 @@ public final class SpiderQueen implements Runnable { } private void runInternal() { - // Get EhConfig - EhConfig config = Settings.getEhConfig().clone(); - config.previewSize = EhConfig.PREVIEW_SIZE_NORMAL; - config.setDirty(); - // Read spider info SpiderInfo spiderInfo = readSpiderInfoFromLocal(); @@ -842,7 +836,7 @@ public final class SpiderQueen implements Runnable { // Spider info from internet if (spiderInfo == null) { - spiderInfo = readSpiderInfoFromInternet(config); + spiderInfo = readSpiderInfoFromInternet(); } // Error! Can't get spiderInfo @@ -913,10 +907,10 @@ public final class SpiderQueen implements Runnable { } // Get pToken from internet - pToken = getPTokenFromInternet(index, config); + pToken = getPTokenFromInternet(index); if (null == pToken) { // Preview size may changed, so try to get pToken twice - pToken = getPTokenFromInternet(index, config); + pToken = getPTokenFromInternet(index); } if (null == pToken) {