When set to a non-null value the {@link #getActionBar()} method will return - * an {@link android.support.v7.app.ActionBar} object that can be used to control the given toolbar as if it were - * a traditional window decor action bar. The toolbar's menu will be populated with the - * Activity's options menu and the navigation button will be wired through the standard - * {@link android.R.id#home home} menu select action.
+ * an {@link androidx.appcompat.app.ActionBar} object that can be used to control the given + * toolbar as if it were a traditional window decor action bar. The toolbar's menu will be + * populated with the Activity's options menu and the navigation button will be wired through + * the standard {@link android.R.id#home home} menu select action. * *In order to use a Toolbar within the Activity's window content the application * must not request the window feature * {@link android.view.Window#FEATURE_ACTION_BAR FEATURE_SUPPORT_ACTION_BAR}.
* - * @param toolbar Toolbar to set as the Activity's action bar + * @param toolbar Toolbar to set as the Activity's action bar, or {@code null} to clear it */ public void setSupportActionBar(@Nullable Toolbar toolbar) { getDelegate().setSupportActionBar(toolbar); } - @NonNull @Override public MenuInflater getMenuInflater() { return getDelegate().getMenuInflater(); @@ -117,6 +147,24 @@ public void addContentView(View view, ViewGroup.LayoutParams params) { public void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); getDelegate().onConfigurationChanged(newConfig); + if (mResources != null) { + // The real (and thus managed) resources object was already updated + // by ResourcesManager, so pull the current metrics from there. + final DisplayMetrics newMetrics = super.getResources().getDisplayMetrics(); + mResources.updateConfiguration(newConfig, newMetrics); + } + } + + @Override + protected void onPostResume() { + super.onPostResume(); + getDelegate().onPostResume(); + } + + @Override + protected void onStart() { + super.onStart(); + getDelegate().onStart(); } @Override @@ -125,10 +173,10 @@ protected void onStop() { getDelegate().onStop(); } + @SuppressWarnings("TypeParameterUnusedInFormals") @Override - protected void onPostResume() { - super.onPostResume(); - getDelegate().onPostResume(); + publicThe default implementation of this method adds the parent chain of this activity - * as specified in the manifest to the supplied {@link android.support.v4.app.TaskStackBuilder}. Applications + * as specified in the manifest to the supplied {@link androidx.core.app.TaskStackBuilder}. Applications * may choose to override this method to construct the desired task stack in a different * way.
* @@ -243,12 +326,12 @@ public ActionMode startSupportActionMode(ActionMode.Callback callback) { * *Applications that wish to supply extra Intent parameters to the parent stack defined * by the manifest should override - * {@link #onPrepareSupportNavigateUpTaskStack(android.support.v4.app.TaskStackBuilder)}.
+ * {@link #onPrepareSupportNavigateUpTaskStack(androidx.core.app.TaskStackBuilder)}. * * @param builder An empty TaskStackBuilder - the application should add intents representing * the desired task stack */ - public void onCreateSupportNavigateUpTaskStack(TaskStackBuilder builder) { + public void onCreateSupportNavigateUpTaskStack(@NonNull TaskStackBuilder builder) { builder.addParentStack(this); } @@ -259,15 +342,15 @@ public void onCreateSupportNavigateUpTaskStack(TaskStackBuilder builder) { * Prepare the synthetic task stack that will be generated during Up navigation * from a different task. * - *This method receives the {@link android.support.v4.app.TaskStackBuilder} with the constructed series of - * Intents as generated by {@link #onCreateSupportNavigateUpTaskStack(android.support.v4.app.TaskStackBuilder)}. + *
This method receives the {@link androidx.core.app.TaskStackBuilder} with the constructed series of + * Intents as generated by {@link #onCreateSupportNavigateUpTaskStack(androidx.core.app.TaskStackBuilder)}. * If any extra data should be added to these intents before launching the new task, * the application should override this method and add that data here.
* * @param builder A TaskStackBuilder that has been populated with Intents by * onCreateNavigateUpTaskStack. */ - public void onPrepareSupportNavigateUpTaskStack(TaskStackBuilder builder) { + public void onPrepareSupportNavigateUpTaskStack(@NonNull TaskStackBuilder builder) { } /** @@ -278,7 +361,7 @@ public void onPrepareSupportNavigateUpTaskStack(TaskStackBuilder builder) { * default Up navigation will be handled automatically. See * {@link #getSupportParentActivityIntent()} for how to specify the parent. If any activity * along the parent chain requires extra Intent arguments, the Activity subclass - * should override the method {@link #onPrepareSupportNavigateUpTaskStack(android.support.v4.app.TaskStackBuilder)} + * should override the method {@link #onPrepareSupportNavigateUpTaskStack(androidx.core.app.TaskStackBuilder)} * to supply those arguments. * *See Tasks and @@ -286,7 +369,7 @@ public void onPrepareSupportNavigateUpTaskStack(TaskStackBuilder builder) { * Navigation from the design guide * for more information about navigating within your app.
* - *See the {@link android.support.v4.app.TaskStackBuilder} class and the Activity methods + *
See the {@link androidx.core.app.TaskStackBuilder} class and the Activity methods * {@link #getSupportParentActivityIntent()}, {@link #supportShouldUpRecreateTask(android.content.Intent)}, and * {@link #supportNavigateUpTo(android.content.Intent)} for help implementing custom Up navigation.
* @@ -322,15 +405,15 @@ public boolean onSupportNavigateUp() { /** * Obtain an {@link android.content.Intent} that will launch an explicit target activity - * specified by sourceActivity's {@link android.support.v4.app.NavUtils#PARENT_ACTIVITY} <meta-data> + * specified by sourceActivity's {@link androidx.core.app.NavUtils#PARENT_ACTIVITY} <meta-data> * element in the application's manifest. If the device is running * Jellybean or newer, the android:parentActivityName attribute will be preferred * if it is present. * * @return a new Intent targeting the defined parent activity of sourceActivity */ - @Override @Nullable + @Override public Intent getSupportParentActivityIntent() { return NavUtils.getParentActivityIntent(this); } @@ -342,13 +425,13 @@ public Intent getSupportParentActivityIntent() { *If this method returns false the app can trivially call * {@link #supportNavigateUpTo(android.content.Intent)} using the same parameters to correctly perform * up navigation. If this method returns false, the app should synthesize a new task stack - * by using {@link android.support.v4.app.TaskStackBuilder} or another similar mechanism to perform up navigation.
+ * by using {@link androidx.core.app.TaskStackBuilder} or another similar mechanism to perform up navigation. * * @param targetIntent An intent representing the target destination for up navigation * @return true if navigating up should recreate a new task stack, false if the same task * should be used for the destination */ - public boolean supportShouldUpRecreateTask(Intent targetIntent) { + public boolean supportShouldUpRecreateTask(@NonNull Intent targetIntent) { return NavUtils.shouldUpRecreateTask(this, targetIntent); } @@ -364,7 +447,7 @@ public boolean supportShouldUpRecreateTask(Intent targetIntent) { * * @param upIntent An intent representing the target destination for up navigation */ - public void supportNavigateUpTo(Intent upIntent) { + public void supportNavigateUpTo(@NonNull Intent upIntent) { NavUtils.navigateUpTo(this, upIntent); } @@ -374,13 +457,114 @@ public ActionBarDrawerToggle.Delegate getDrawerToggleDelegate() { return getDelegate().getDrawerToggleDelegate(); } + /** + * {@inheritDoc} + * + *Please note: AppCompat uses its own feature id for the action bar: + * {@link AppCompatDelegate#FEATURE_SUPPORT_ACTION_BAR FEATURE_SUPPORT_ACTION_BAR}.
+ */ + @Override + public boolean onMenuOpened(int featureId, Menu menu) { + return super.onMenuOpened(featureId, menu); + } + + /** + * {@inheritDoc} + * + *Please note: AppCompat uses its own feature id for the action bar: + * {@link AppCompatDelegate#FEATURE_SUPPORT_ACTION_BAR FEATURE_SUPPORT_ACTION_BAR}.
+ */ + @Override + public void onPanelClosed(int featureId, Menu menu) { + super.onPanelClosed(featureId, menu); + } + + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + getDelegate().onSaveInstanceState(outState); + } + /** * @return The {@link AppCompatDelegate} being used by this Activity. */ + @NonNull public AppCompatDelegate getDelegate() { if (mDelegate == null) { mDelegate = AppCompatDelegate.create(this, this); } return mDelegate; } + + @SuppressLint("RestrictedApi") + @Override + public boolean dispatchKeyEvent(KeyEvent event) { + // Let support action bars open menus in response to the menu key prioritized over + // the window handling it + final int keyCode = event.getKeyCode(); + final ActionBar actionBar = getSupportActionBar(); + if (keyCode == KeyEvent.KEYCODE_MENU + && actionBar != null && actionBar.onMenuKeyEvent(event)) { + return true; + } + return super.dispatchKeyEvent(event); + } + + @SuppressLint("RestrictedApi") + @Override + public Resources getResources() { + if (mResources == null && VectorEnabledTintResources.shouldBeUsed()) { + mResources = new VectorEnabledTintResources(this, super.getResources()); + } + return mResources == null ? super.getResources() : mResources; + } + + /** + * KeyEvents with non-default modifiers are not dispatched to menu's performShortcut in API 25 + * or lower. Here, we check if the keypress corresponds to a menuitem's shortcut combination + * and perform the corresponding action. + */ + private boolean performMenuItemShortcut(int keycode, KeyEvent event) { + if (!(Build.VERSION.SDK_INT >= 26) && !event.isCtrlPressed() + && !KeyEvent.metaStateHasNoModifiers(event.getMetaState()) + && event.getRepeatCount() == 0 + && !KeyEvent.isModifierKey(event.getKeyCode())) { + final Window currentWindow = getWindow(); + if (currentWindow != null && currentWindow.getDecorView() != null) { + final View decorView = currentWindow.getDecorView(); + if (decorView.dispatchKeyShortcutEvent(event)) { + return true; + } + } + } + return false; + } + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (performMenuItemShortcut(keyCode, event)) { + return true; + } + return super.onKeyDown(keyCode, event); + } + + @SuppressLint("RestrictedApi") + @Override + public void openOptionsMenu() { + ActionBar actionBar = getSupportActionBar(); + if (getWindow().hasFeature(Window.FEATURE_OPTIONS_PANEL) + && (actionBar == null || !actionBar.openOptionsMenu())) { + super.openOptionsMenu(); + } + } + + @SuppressLint("RestrictedApi") + @Override + public void closeOptionsMenu() { + ActionBar actionBar = getSupportActionBar(); + if (getWindow().hasFeature(Window.FEATURE_OPTIONS_PANEL) + && (actionBar == null || !actionBar.closeOptionsMenu())) { + super.closeOptionsMenu(); + } + } } diff --git a/app/src/main/java/com/hippo/app/CheckBoxDialogBuilder.java b/app/src/main/java/com/hippo/app/CheckBoxDialogBuilder.java index 34af8a97b..ca9a4c9d4 100644 --- a/app/src/main/java/com/hippo/app/CheckBoxDialogBuilder.java +++ b/app/src/main/java/com/hippo/app/CheckBoxDialogBuilder.java @@ -18,12 +18,11 @@ import android.annotation.SuppressLint; import android.content.Context; -import android.support.v7.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.widget.CheckBox; import android.widget.TextView; - +import androidx.appcompat.app.AlertDialog; import com.hippo.ehviewer.R; public class CheckBoxDialogBuilder extends AlertDialog.Builder { diff --git a/app/src/main/java/com/hippo/app/EditTextDialogBuilder.java b/app/src/main/java/com/hippo/app/EditTextDialogBuilder.java index 750bc39bf..4c89ce9d3 100644 --- a/app/src/main/java/com/hippo/app/EditTextDialogBuilder.java +++ b/app/src/main/java/com/hippo/app/EditTextDialogBuilder.java @@ -19,15 +19,14 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.DialogInterface; -import android.support.design.widget.TextInputLayout; -import android.support.v7.app.AlertDialog; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; import android.widget.Button; import android.widget.EditText; import android.widget.TextView; - +import androidx.appcompat.app.AlertDialog; +import com.google.android.material.textfield.TextInputLayout; import com.hippo.ehviewer.R; public class EditTextDialogBuilder extends AlertDialog.Builder implements EditText.OnEditorActionListener { diff --git a/app/src/main/java/com/hippo/app/ListCheckBoxDialogBuilder.java b/app/src/main/java/com/hippo/app/ListCheckBoxDialogBuilder.java index ebdb09763..a84822787 100644 --- a/app/src/main/java/com/hippo/app/ListCheckBoxDialogBuilder.java +++ b/app/src/main/java/com/hippo/app/ListCheckBoxDialogBuilder.java @@ -18,14 +18,13 @@ import android.annotation.SuppressLint; import android.content.Context; -import android.support.v7.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.CheckBox; import android.widget.ListView; - +import androidx.appcompat.app.AlertDialog; import com.hippo.ehviewer.R; import com.hippo.yorozuya.ViewUtils; diff --git a/app/src/main/java/com/hippo/app/PrettyPreferenceActivity.java b/app/src/main/java/com/hippo/app/PrettyPreferenceActivity.java new file mode 100644 index 000000000..2ddb26b2c --- /dev/null +++ b/app/src/main/java/com/hippo/app/PrettyPreferenceActivity.java @@ -0,0 +1,113 @@ +/* + * Copyright 2018 Hippo Seven + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.hippo.app; + +import android.content.Context; +import android.preference.PreferenceActivity; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.ImageView; +import android.widget.ListAdapter; +import android.widget.TextView; +import androidx.annotation.NonNull; +import com.hippo.ehviewer.R; +import java.util.ArrayList; +import java.util.List; + +public abstract class PrettyPreferenceActivity extends AppCompatPreferenceActivity { + + @Override + public void setListAdapter(ListAdapter adapter) { + if (adapter == null) { + super.setListAdapter(null); + return; + } + + int count = adapter.getCount(); + ListYou do not have any watched tags"); if (body.contains("No hits found
")) { result.pages = 0; //noinspection unchecked result.galleryInfoList = Collections.EMPTY_LIST; return result; + } else if (d.getElementsByClass("ptt").isEmpty()) { + result.pages = 1; } else { - throw e; + result.pages = Integer.MAX_VALUE; } } try { - Elements es = d.getElementsByClass("itg").first().child(0).children(); - List" + + EhCookieStore.KEY_IPD_PASS_HASH + ": " + ipbPassHash + "
" + + EhCookieStore.KEY_IGNEOUS + ": " + igneous; + setDialogMessage(Html.fromHtml(getContext().getString(R.string.settings_eh_identity_cookies_signed, message))); + message = message.replace("
", "\n"); + } else { + setDialogMessage(getContext().getString(R.string.settings_eh_identity_cookies_tourist)); + } + } + + @Override + protected void onPrepareDialogBuilder(AlertDialog.Builder builder) { + super.onPrepareDialogBuilder(builder); + if (message != null) { + builder.setPositiveButton(R.string.settings_eh_identity_cookies_copy, (dialog, which) -> { + ClipboardManager cmb = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE); + cmb.setPrimaryClip(ClipData.newPlainText(null, message)); + Toast.makeText(getContext(), R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show(); + + IdentityCookiePreference.this.onClick(dialog, which); + }); + } + } +} diff --git a/app/src/main/java/com/hippo/ehviewer/preference/HatHProxyPreference.java b/app/src/main/java/com/hippo/ehviewer/preference/ProxyPreference.java similarity index 57% rename from app/src/main/java/com/hippo/ehviewer/preference/HatHProxyPreference.java rename to app/src/main/java/com/hippo/ehviewer/preference/ProxyPreference.java index 02e1dd3f7..c5e14a095 100644 --- a/app/src/main/java/com/hippo/ehviewer/preference/HatHProxyPreference.java +++ b/app/src/main/java/com/hippo/ehviewer/preference/ProxyPreference.java @@ -20,64 +20,71 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; -import android.support.annotation.Nullable; -import android.support.design.widget.TextInputLayout; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.SwitchCompat; +import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.widget.EditText; - +import android.widget.Spinner; +import androidx.appcompat.app.AlertDialog; +import com.google.android.material.textfield.TextInputLayout; +import com.hippo.ehviewer.EhApplication; +import com.hippo.ehviewer.EhProxySelector; import com.hippo.ehviewer.R; import com.hippo.ehviewer.Settings; import com.hippo.network.InetValidator; import com.hippo.preference.DialogPreference; +import com.hippo.yorozuya.MathUtils; import com.hippo.yorozuya.ViewUtils; -public class HatHProxyPreference extends DialogPreference implements View.OnClickListener { +public class ProxyPreference extends DialogPreference implements View.OnClickListener { - @Nullable - private SwitchCompat mEnable; - @Nullable + private Spinner mType; private TextInputLayout mIpInputLayout; - @Nullable private EditText mIp; - @Nullable private TextInputLayout mPortInputLayout; - @Nullable private EditText mPort; - @Nullable - private TextInputLayout mPasskeyInputLayout; - @Nullable - private EditText mPasskey; - public HatHProxyPreference(Context context) { + public ProxyPreference(Context context) { super(context); init(); } - public HatHProxyPreference(Context context, AttributeSet attrs) { + public ProxyPreference(Context context, AttributeSet attrs) { super(context, attrs); init(); } - public HatHProxyPreference(Context context, AttributeSet attrs, int defStyleAttr) { + public ProxyPreference(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); init(); } private void init() { - setDialogLayoutResource(R.layout.preference_dialog_hath_proxy); - updateSummary(Settings.getHathProxy(), Settings.getHathIp(), Settings.getHathPort()); + setDialogLayoutResource(R.layout.preference_dialog_proxy); + updateSummary(Settings.getProxyType(), Settings.getProxyIp(), Settings.getProxyPort()); + } + + private String getProxyTypeText(Context context, int type) { + String[] array = context.getResources().getStringArray(R.array.proxy_types); + return array[MathUtils.clamp(type, 0, array.length - 1)]; } - private void updateSummary(boolean hathProxy, String hathIp, int hathPort) { - if (InetValidator.isValidInet4Address(hathIp) && InetValidator.isValidInetPort(hathPort)) { + private void updateSummary(int type, String ip, int port) { + if ((type == EhProxySelector.TYPE_HTTP || type == EhProxySelector.TYPE_SOCKS) + && (TextUtils.isEmpty(ip) || !InetValidator.isValidInetPort(port)) ) { + type = EhProxySelector.TYPE_SYSTEM; + } + + if (type == EhProxySelector.TYPE_HTTP || type == EhProxySelector.TYPE_SOCKS) { Context context = getContext(); - setSummary(context.getString(R.string.settings_eh_hath_proxy_summary_1, - context.getString(hathProxy ? R.string.enabled : R.string.disabled), hathIp, hathPort)); + setSummary(context.getString(R.string.settings_advanced_proxy_summary_1, + getProxyTypeText(context, type), + ip, + port)); } else { - setSummary(R.string.settings_eh_hath_proxy_summary_2); + Context context = getContext(); + setSummary(context.getString(R.string.settings_advanced_proxy_summary_2, + getProxyTypeText(context, type))); } } @@ -94,73 +101,63 @@ protected void onDialogCreated(AlertDialog dialog) { dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(this); - mEnable = (SwitchCompat) ViewUtils.$$(dialog, R.id.enable); + mType = (Spinner) ViewUtils.$$(dialog, R.id.type); mIpInputLayout = (TextInputLayout) ViewUtils.$$(dialog, R.id.ip_input_layout); mIp = (EditText) ViewUtils.$$(dialog, R.id.ip); mPortInputLayout = (TextInputLayout) ViewUtils.$$(dialog, R.id.port_input_layout); mPort = (EditText) ViewUtils.$$(dialog, R.id.port); - mPasskeyInputLayout = (TextInputLayout) ViewUtils.$$(dialog, R.id.passkey_input_layout); - mPasskey = (EditText) ViewUtils.$$(dialog, R.id.passkey); - mEnable.setChecked(Settings.getHathProxy()); - String ip = Settings.getHathIp(); - if (!InetValidator.isValidInet4Address(ip)) { - ip = null; - } + int type = Settings.getProxyType(); + String[] array = getContext().getResources().getStringArray(R.array.proxy_types); + mType.setSelection(MathUtils.clamp(type, 0, array.length)); + + mIp.setText(Settings.getProxyIp()); + String portString; - int port = Settings.getHathPort(); + int port = Settings.getProxyPort(); if (!InetValidator.isValidInetPort(port)) { portString = null; } else { - portString = Integer.toString(Settings.getHathPort()); + portString = Integer.toString(port); } - mIp.setText(ip); mPort.setText(portString); - mPasskey.setText(Settings.getHathPasskey()); } @Override protected void onDialogClosed(boolean positiveResult) { super.onDialogClosed(positiveResult); - mEnable = null; + mType = null; mIpInputLayout = null; mIp = null; mPortInputLayout = null; mPort = null; - mPasskeyInputLayout = null; - mPasskey = null; } @Override public void onClick(View v) { Dialog dialog = getDialog(); Context context = getContext(); - if (null == dialog || null == context || null == mEnable || + if (null == dialog || null == context || null == mType || null == mIpInputLayout || null == mIp || - null == mPortInputLayout || null == mPort || - null == mPasskeyInputLayout || null == mPasskey) { + null == mPortInputLayout || null == mPort) { return; } - boolean enable = mEnable.isChecked(); + int type = mType.getSelectedItemPosition(); String ip = mIp.getText().toString().trim(); if (ip.isEmpty()) { - if (enable) { + if (type == EhProxySelector.TYPE_HTTP || type == EhProxySelector.TYPE_SOCKS) { mIpInputLayout.setError(context.getString(R.string.text_is_empty)); return; } - } else if (!InetValidator.isValidInet4Address(ip)) { - mIpInputLayout.setError(context.getString(R.string.domain_not_supported)); - return; - } else { - mIpInputLayout.setError(null); } + mIpInputLayout.setError(null); int port; String portString = mPort.getText().toString().trim(); if (portString.isEmpty()) { - if (enable) { + if (type == EhProxySelector.TYPE_HTTP || type == EhProxySelector.TYPE_SOCKS) { mPortInputLayout.setError(context.getString(R.string.text_is_empty)); return; } else { @@ -173,19 +170,19 @@ public void onClick(View v) { port = -1; } if (!InetValidator.isValidInetPort(port)) { - mPortInputLayout.setError(context.getString(R.string.invalid_port)); + mPortInputLayout.setError(context.getString(R.string.proxy_invalid_port)); return; } } + mPortInputLayout.setError(null); - String passkey = mPasskey.getText().toString(); + Settings.putProxyType(type); + Settings.putProxyIp(ip); + Settings.putProxyPort(port); - Settings.putHathProxy(enable); - Settings.putHathIp(ip); - Settings.putHathPort(port); - Settings.putHathPasskey(passkey); + updateSummary(type, ip, port); - updateSummary(enable, ip, port); + EhApplication.getEhProxySelector(getContext()).updateProxy(); dialog.dismiss(); } diff --git a/app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.java b/app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.java index be5879127..61b322301 100644 --- a/app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.java +++ b/app/src/main/java/com/hippo/ehviewer/preference/RestoreDownloadPreference.java @@ -20,28 +20,27 @@ import android.content.Context; import android.os.Parcel; import android.preference.Preference; -import android.support.annotation.NonNull; import android.util.AttributeSet; import android.widget.Toast; - +import androidx.annotation.NonNull; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.EhDB; import com.hippo.ehviewer.R; import com.hippo.ehviewer.Settings; import com.hippo.ehviewer.client.EhEngine; +import com.hippo.ehviewer.client.EhUrl; import com.hippo.ehviewer.client.data.GalleryInfo; import com.hippo.ehviewer.download.DownloadManager; import com.hippo.ehviewer.spider.SpiderInfo; import com.hippo.ehviewer.spider.SpiderQueen; import com.hippo.unifile.UniFile; +import com.hippo.util.ExceptionUtils; import com.hippo.yorozuya.IOUtils; - import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.Collections; import java.util.List; - import okhttp3.OkHttpClient; public class RestoreDownloadPreference extends TaskPreference { @@ -120,6 +119,10 @@ protected Object doInBackground(Void... params) { List
* null for wait */ - private Object request(int index, boolean force, boolean addNeighbor) { + private Object request(int index, boolean ignoreError, boolean force, boolean addNeighbor) { if (mQueenThread == null) { return null; } @@ -492,7 +495,8 @@ private Object request(int index, boolean force, boolean addNeighbor) { int state = getPageState(index); // Fix state for force - if (force && (state == STATE_FINISHED || state == STATE_FAILED)) { + if ((force && (state == STATE_FINISHED || state == STATE_FAILED)) || + (ignoreError && state == STATE_FAILED)) { // Update state to none at once updatePageState(index, STATE_NONE); state = STATE_NONE; @@ -518,7 +522,7 @@ private Object request(int index, boolean force, boolean addNeighbor) { } else { size = Integer.MAX_VALUE; } - for (int i = index + 1, n = index + i + mPreloadNumber; i < n && i < size; i++) { + for (int i = index + 1, n = index + 1 + mPreloadNumber; i < n && i < size; i++) { if (STATE_NONE == getPageState(i)) { mRequestPageQueue2.add(i); } @@ -667,7 +671,7 @@ protected Void doInBackground(Void... params) { writeSpiderInfoToLocal(spiderInfo); return null; } - }.execute(); + }.executeOnExecutor(IoThreadPoolExecutor.getInstance()); } } @@ -713,10 +717,13 @@ private void readPreviews(String body, int index, SpiderInfo spiderInfo) throws spiderInfo.pages = GalleryDetailParser.parsePages(body); spiderInfo.previewPages = GalleryDetailParser.parsePreviewPages(body); PreviewSet previewSet = GalleryDetailParser.parsePreviewSet(body); - if ((index >= 0 && index < spiderInfo.pages - 1) || (index == 0 && spiderInfo.pages == 1)) { - spiderInfo.previewPerPage = previewSet.size(); - } else { - spiderInfo.previewPerPage = Math.max(spiderInfo.previewPerPage, previewSet.size()); + + if (previewSet.size() > 0) { + if (index == 0) { + spiderInfo.previewPerPage = previewSet.size(); + } else { + spiderInfo.previewPerPage = previewSet.getPosition(0) / index; + } } for (int i = 0, n = previewSet.size(); i < n; i++) { @@ -729,14 +736,14 @@ private void readPreviews(String body, int index, SpiderInfo spiderInfo) throws } } - 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), EhUrl.getReferer()).build(); Response response = mHttpClient.newCall(request).execute(); String body = response.body().string(); @@ -744,12 +751,13 @@ private SpiderInfo readSpiderInfoFromInternet(EhConfig config) { spiderInfo.pTokenMap = new SparseArray<>(spiderInfo.pages); readPreviews(body, 0, spiderInfo); return spiderInfo; - } catch (Exception e) { + } catch (Throwable e) { + ExceptionUtils.throwIfFatal(e); return null; } } - private String getPTokenFromInternet(int index, EhConfig config) { + private String getPTokenFromInternet(int index) { SpiderInfo spiderInfo = mSpiderInfo.get(); if (spiderInfo == null) { return null; @@ -762,15 +770,19 @@ private String getPTokenFromInternet(int index, EhConfig config) { } else { previewIndex = 0; } + if (spiderInfo.previewPages > 0) { + previewIndex = Math.min(previewIndex, spiderInfo.previewPages - 1); + } try { String url = EhUrl.getGalleryDetailUrl( mGalleryInfo.gid, mGalleryInfo.token, previewIndex, false); + String referer = EhUrl.getReferer(); if (DEBUG_PTOKEN) { Log.d(TAG, "index " + index + ", previewIndex " + previewIndex + ", previewPerPage " + spiderInfo.previewPerPage+ ", url " + url); } - Request request = new EhRequestBuilder(url, config).build(); + Request request = new EhRequestBuilder(url, referer).build(); Response response = mHttpClient.newCall(request).execute(); String body = response.body().string(); readPreviews(body, previewIndex, spiderInfo); @@ -783,7 +795,8 @@ private String getPTokenFromInternet(int index, EhConfig config) { pToken = spiderInfo.pTokenMap.get(index); } return pToken; - } catch (Exception e) { + } catch (Throwable e) { + ExceptionUtils.throwIfFatal(e); return null; } } @@ -795,7 +808,8 @@ private synchronized void writeSpiderInfoToLocal(@NonNull SpiderInfo spiderInfo) UniFile file = downloadDir.createFile(SPIDER_INFO_FILENAME); try { spiderInfo.write(file.openOutputStream()); - } catch (Exception e) { + } catch (Throwable e) { + ExceptionUtils.throwIfFatal(e); // Ignore } } @@ -814,11 +828,6 @@ private synchronized void writeSpiderInfoToLocal(@NonNull SpiderInfo spiderInfo) } private void runInternal() { - // Get EhConfig - EhConfig config = Settings.getEhConfig().clone(); - config.previewSize = EhConfig.PREVIEW_SIZE_NORMAL; - config.setDirty(); - // Read spider info SpiderInfo spiderInfo = readSpiderInfoFromLocal(); @@ -829,7 +838,7 @@ private void runInternal() { // Spider info from internet if (spiderInfo == null) { - spiderInfo = readSpiderInfoFromInternet(config); + spiderInfo = readSpiderInfoFromInternet(); } // Error! Can't get spiderInfo @@ -900,10 +909,10 @@ private void runInternal() { } // 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) { @@ -1026,8 +1035,20 @@ private String getPageUrl(long gid, int index, String pToken, return pageUrl; } - private GalleryPageParser.Result getImageUrl(int index, String pageUrl) throws Exception { - GalleryPageParser.Result result = EhEngine.getGalleryPage(null, mHttpClient, pageUrl); + private GalleryPageParser.Result fetchPageResultFromHtml(int index, String pageUrl) throws Throwable { + GalleryPageParser.Result result = EhEngine.getGalleryPage(null, mHttpClient, pageUrl, mGalleryInfo.gid, mGalleryInfo.token); + if (StringUtils.endsWith(result.imageUrl, URL_509_SUFFIX_ARRAY)) { + // Get 509 + // Notify listeners + notifyGet509(index); + throw new Image509Exception(); + } + + return result; + } + + private GalleryPageApiParser.Result fetchPageResultFromApi(long gid, int index, String pToken, String showKey, String previousPToken) throws Throwable { + GalleryPageApiParser.Result result = EhEngine.getGalleryPageApi(null, mHttpClient, gid, index, pToken, showKey, previousPToken); if (StringUtils.endsWith(result.imageUrl, URL_509_SUFFIX_ARRAY)) { // Get 509 // Notify listeners @@ -1039,137 +1060,241 @@ private GalleryPageParser.Result getImageUrl(int index, String pageUrl) throws E } // false for stop - private boolean downloadImage(long gid, int index, String pToken, boolean force) { - List
+
+
E-Hentai Galleries: The Free Hentai Doujinshi, Manga and Image Gallery System
+ + + + +Showing 48,197 results
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1928 | > |
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1928 | > |
Visit the E-Hentai Forums E-Hentai @ Twitter Play the HentaiVerse Minigame Lo-Fi Version
Please read the Terms of Service before participating with or uploading any content to this site.
+
+
diff --git a/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestEExtended.html b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestEExtended.html
new file mode 100644
index 000000000..d90b84939
--- /dev/null
+++ b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestEExtended.html
@@ -0,0 +1,33 @@
+
+
+
+
+
+
E-Hentai Galleries: The Free Hentai Doujinshi, Manga and Image Gallery System
+ + + + +Showing 48,197 results
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1928 | > |
![[NekoNiwa] Stomach-filling Activity](https://ul.ehgt.org/dc/ad/dcad4eda683c3fa6422737048171330dcf1215cd-753622-2150-3035-jpg_250.jpg "[NekoNiwa] Stomach-filling Activity") | |
![[NekoNiwa] Ritoseikatsu](https://ul.ehgt.org/5e/5d/5e5d4aaaccea1061ad49f0818a7c687a78271064-730707-2153-3080-jpg_250.jpg "[NekoNiwa] Ritoseikatsu") | |
![(C91) [Aoirokanata (Shikitani Asuka)] Neko Flan to Kainushi Koishi | 貓芙蘭和飼主戀 (Touhou Project) [Chinese] [魔恋汉化组]](https://ehgt.org/t/7c/de/7cde7a891ea99aba2ee2f497212deb7deb02672c-10121090-2068-3021-png_250.jpg "(C91) [Aoirokanata (Shikitani Asuka)] Neko Flan to Kainushi Koishi | 貓芙蘭和飼主戀 (Touhou Project) [Chinese] [魔恋汉化组]") | |
![[Yaruku] GOLD PLEASE! Sono 1 (Touhou Project)](https://ehgt.org/t/4c/bd/4cbde601ef33dda8ae968c019a50e76125ca4025-401285-754-1056-jpg_250.jpg "[Yaruku] GOLD PLEASE! Sono 1 (Touhou Project)") | |
![[Yaruku] 絹代式修理法 (Girls und Panzer) [Digital]](https://ehgt.org/t/25/14/251491479565219eec896d754b79c1a9bc2aaf9c-766037-888-1214-png_250.jpg "[Yaruku] 絹代式修理法 (Girls und Panzer) [Digital]") | |
![[Pixiv] Koi Han (21218143)](https://ehgt.org/t/cc/00/cc00a12d75d9124ff0caed6668c117aa87e6b01a-924638-2480-3508-jpg_250.jpg "[Pixiv] Koi Han (21218143)") | |
![[Pixiv] Koi Han (21218143)](https://ehgt.org/t/ab/a9/aba9fb2a9562fd636daa89abf31001187dcedf9b-2305957-6142-6142-jpg_250.jpg "[Pixiv] Koi Han (21218143)") | |
 | |
 | |
![(Comifuro 9) [SunProject (Mimi N)] Existence (Original) (Bahasa Indonesia)](https://ehgt.org/t/3a/0c/3a0caf9d5968bb1a94a44cd1d5986b22aede9452-1092041-1189-1654-jpg_250.jpg "(Comifuro 9) [SunProject (Mimi N)] Existence (Original) (Bahasa Indonesia)") | |
![Ayano's Weight Gain Diary [English]](https://ehgt.org/t/63/4e/634ec3a287e616120ba191a6ed6bccb3f57beef9-5939405-4299-6071-jpg_250.jpg "Ayano's Weight Gain Diary [English]") | |
![(FF31) [-Sakimiya- (sakimiya)] Level 1 Typical Days Vol. 5 (Kantai Collection -KanColle-) [Chinese]](https://ehgt.org/t/1e/9e/1e9ee370350357b696b581ea554994a5e0ca911f-6688111-4315-6049-jpg_250.jpg "(FF31) [-Sakimiya- (sakimiya)] Level 1 Typical Days Vol. 5 (Kantai Collection -KanColle-) [Chinese]") | |
![(FF31) [-Sakimiya- (sakimiya)] Level 1 Typical Days Vol. 4 (Kantai Collection -KanColle-) [Chinese]](https://ehgt.org/t/f1/ab/f1ab2d63e1b56768c5966f4e54797b6052eaca09-9234109-4280-6093-jpg_250.jpg "(FF31) [-Sakimiya- (sakimiya)] Level 1 Typical Days Vol. 4 (Kantai Collection -KanColle-) [Chinese]") | |
![[Himura Kiseki] Getsuyoubi no Tawawa [Colorized] [English] [Ongoing]](https://ehgt.org/t/de/fa/defa931d8d5b36b020e58f377adb67016882ef9c-2031733-3013-2081-jpg_250.jpg "[Himura Kiseki] Getsuyoubi no Tawawa [Colorized] [English] [Ongoing]") | |
![(Kouroumu 3) [Ennui Akadako (Tako)] Goudou Sougi | Combined Funeral (Touhou Project) [English] {Gaku-Touhou}](https://ehgt.org/t/ea/4a/ea4a42ce29266d517e9c916512b4cdfbe400c8ee-774230-2153-1510-jpg_250.jpg "(Kouroumu 3) [Ennui Akadako (Tako)] Goudou Sougi | Combined Funeral (Touhou Project) [English] {Gaku-Touhou}") | |
![[Dog House (Inugami Ryu)] Inu to Kuma. - Dog&Bear. 4 [English] [Digital]](https://ehgt.org/t/b4/f5/b4f5238b3c47a045cebb650d5ec8ec7f7aa25d24-288825-1000-1407-jpg_250.jpg "[Dog House (Inugami Ryu)] Inu to Kuma. - Dog&Bear. 4 [English] [Digital]") | |
![(Reitaisai SP) [Mugijirushi (Tairi)] 4 (Touhou Project) [English] {Gaku-Touhou}](https://ehgt.org/t/48/0b/480bf71a4d427fdbc84bb4e97ad49acbab6775d3-2032668-2858-2000-jpg_250.jpg "(Reitaisai SP) [Mugijirushi (Tairi)] 4 (Touhou Project) [English] {Gaku-Touhou}") | |
![(Reitaisai 5) [Fusuma Cafe (Suichuu Hanabi)] Mushi to Mahou no Baisen Coffee | Roast Blend of Insects and Magic (Touhou Project) [English] {Gaku-Touhou}](https://ehgt.org/t/c8/7d/c87d6cea4b7750490d92cc58346cc0527845a2b9-695546-2155-1514-jpg_250.jpg "(Reitaisai 5) [Fusuma Cafe (Suichuu Hanabi)] Mushi to Mahou no Baisen Coffee | Roast Blend of Insects and Magic (Touhou Project) [English] {Gaku-Touhou}") | |
![(C95) [Miniomelet Ongakudan (Hiyama Yuki)] Hito no Kimochi Kemono no Kimochi (Kemono Friends) [Chinese] [砂糖汉化组]](https://ehgt.org/t/78/cf/78cf070854aa19a317ff888fb242334bc5f759b2-2899913-1058-1515-png_250.jpg "(C95) [Miniomelet Ongakudan (Hiyama Yuki)] Hito no Kimochi Kemono no Kimochi (Kemono Friends) [Chinese] [砂糖汉化组]") | |
![[Studio Tar (Kyouichirou)] Akuma o Produce!! | 악마를 프로듀스!! (Youjo Senki) [Korean] [2017-09-08]](https://ehgt.org/t/17/2b/172bbe034644aa1098a519d232cf1a0fd477cf41-7997922-6307-9090-jpg_250.jpg "[Studio Tar (Kyouichirou)] Akuma o Produce!! | 악마를 프로듀스!! (Youjo Senki) [Korean] [2017-09-08]") | |
![[Pixiv] 意面 [188984]](https://ehgt.org/t/28/d2/28d2c3ff9f593839b9c558c57951b48dcc806e11-1402327-1800-2571-jpg_250.jpg "[Pixiv] 意面 [188984]") | |
![(C95) [Konagona Makki Shoujou (Kona Matsu)] 19-sai no Virtual | 虚拟的19岁 (Tsukino Mito, Higuchi Kaede) [Chinese] [杂鱼DD汉化组]](https://ehgt.org/t/ff/6f/ff6f58fc271da85bc83a75a5bae4ecd986dc1d49-370886-1420-2024-jpg_250.jpg "(C95) [Konagona Makki Shoujou (Kona Matsu)] 19-sai no Virtual | 虚拟的19岁 (Tsukino Mito, Higuchi Kaede) [Chinese] [杂鱼DD汉化组]") | |
 | |
![[Eto] Tachie Sabun](https://ehgt.org/t/8f/57/8f57eed601aa39425aa5c71ececab33e51e648cb-248231-720-1200-jpg_250.jpg "[Eto] Tachie Sabun") | |
![[Jouyama Yui] Zanuff The Butcher [ENG]](https://ehgt.org/t/6f/0e/6f0e225e77497dd3ea5b8c2fcd8d9479ca1b13c5-689284-2145-3003-jpg_250.jpg "[Jouyama Yui] Zanuff The Butcher [ENG]") |
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1928 | > |
Visit the E-Hentai Forums E-Hentai @ Twitter Play the HentaiVerse Minigame Lo-Fi Version
Please read the Terms of Service before participating with or uploading any content to this site.
+
+
diff --git a/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestEMinimal.html b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestEMinimal.html
new file mode 100644
index 000000000..d2b119cc0
--- /dev/null
+++ b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestEMinimal.html
@@ -0,0 +1,33 @@
+
+
+
+
+
+
E-Hentai Galleries: The Free Hentai Doujinshi, Manga and Image Gallery System
+ + + + +Showing 48,197 results
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1928 | > |
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1928 | > |
Visit the E-Hentai Forums E-Hentai @ Twitter Play the HentaiVerse Minigame Lo-Fi Version
Please read the Terms of Service before participating with or uploading any content to this site.
+
+
diff --git a/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestEMinimalPlus.html b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestEMinimalPlus.html
new file mode 100644
index 000000000..86d82e3c8
--- /dev/null
+++ b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestEMinimalPlus.html
@@ -0,0 +1,33 @@
+
+
+
+
+
+
E-Hentai Galleries: The Free Hentai Doujinshi, Manga and Image Gallery System
+ + + + +Showing 48,197 results
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1928 | > |
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1928 | > |
Visit the E-Hentai Forums E-Hentai @ Twitter Play the HentaiVerse Minigame Lo-Fi Version
Please read the Terms of Service before participating with or uploading any content to this site.
+
+
diff --git a/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestEThumbnail.html b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestEThumbnail.html
new file mode 100644
index 000000000..fe39d7be0
--- /dev/null
+++ b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestEThumbnail.html
@@ -0,0 +1,36 @@
+
+
+
+
+
+
E-Hentai Galleries: The Free Hentai Doujinshi, Manga and Image Gallery System
+ + + + +Showing 48,197 results
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1928 | > |
(C91) [Aoirokanata (Shikitani Asuka)] Neko Flan to Kainushi Koishi | 貓芙蘭和飼主戀 (Touhou Project) [Chinese] [魔恋汉化组]
chinese
Non-H
2019-04-03 09:21
28 pages
(Comifuro 9) [SunProject (Mimi N)] Existence (Original) (Bahasa Indonesia)
Non-H
2019-04-03 04:17
70 pages
(FF31) [-Sakimiya- (sakimiya)] Level 1 Typical Days Vol. 5 (Kantai Collection -KanColle-) [Chinese]
chinese
Non-H
2019-04-03 00:04
38 pages
(FF31) [-Sakimiya- (sakimiya)] Level 1 Typical Days Vol. 4 (Kantai Collection -KanColle-) [Chinese]
chinese
Non-H
2019-04-03 00:00
42 pages
(Kouroumu 3) [Ennui Akadako (Tako)] Goudou Sougi | Combined Funeral (Touhou Project) [English] {Gaku-Touhou}
Non-H
2019-04-02 16:28
44 pages
[Dog House (Inugami Ryu)] Inu to Kuma. - Dog&Bear. 4 [English] [Digital]
Non-H
2019-04-02 16:27
34 pages
(Reitaisai SP) [Mugijirushi (Tairi)] 4 (Touhou Project) [English] {Gaku-Touhou}
Non-H
2019-04-02 16:21
28 pages
(Reitaisai 5) [Fusuma Cafe (Suichuu Hanabi)] Mushi to Mahou no Baisen Coffee | Roast Blend of Insects and Magic (Touhou Project) [English] {Gaku-Touhou}
Non-H
2019-04-02 16:15
43 pages
(C95) [Miniomelet Ongakudan (Hiyama Yuki)] Hito no Kimochi Kemono no Kimochi (Kemono Friends) [Chinese] [砂糖汉化组]
chinese
Non-H
2019-04-02 15:59
34 pages
[Studio Tar (Kyouichirou)] Akuma o Produce!! | 악마를 프로듀스!! (Youjo Senki) [Korean] [2017-09-08]
Non-H
2019-04-02 15:26
16 pages
(C95) [Konagona Makki Shoujou (Kona Matsu)] 19-sai no Virtual | 虚拟的19岁 (Tsukino Mito, Higuchi Kaede) [Chinese] [杂鱼DD汉化组]
chinese
Non-H
2019-04-02 12:55
21 pages
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1928 | > |
Visit the E-Hentai Forums E-Hentai @ Twitter Play the HentaiVerse Minigame Lo-Fi Version
Please read the Terms of Service before participating with or uploading any content to this site.
+
+
diff --git a/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestExCompat.html b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestExCompat.html
new file mode 100644
index 000000000..ccd012060
--- /dev/null
+++ b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestExCompat.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
diff --git a/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestExExtended.html b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestExExtended.html
new file mode 100644
index 000000000..6e50c6fbe
--- /dev/null
+++ b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestExExtended.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
Showing 49,597 results
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1984 | > |
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1984 | > |
+
+
+
diff --git a/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestExMinimal.html b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestExMinimal.html
new file mode 100644
index 000000000..e527a6c1a
--- /dev/null
+++ b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestExMinimal.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
Showing 49,597 results
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1984 | > |
![(C91) [Aoirokanata (Shikitani Asuka)] Neko Flan to Kainushi Koishi | 貓芙蘭和飼主戀 (Touhou Project) [Chinese] [魔恋汉化组]](https://exhentai.org/t/7c/de/7cde7a891ea99aba2ee2f497212deb7deb02672c-10121090-2068-3021-png_250.jpg "(C91) [Aoirokanata (Shikitani Asuka)] Neko Flan to Kainushi Koishi | 貓芙蘭和飼主戀 (Touhou Project) [Chinese] [魔恋汉化组]") | |
![[Yaruku] GOLD PLEASE! Sono 1 (Touhou Project)](https://exhentai.org/t/4c/bd/4cbde601ef33dda8ae968c019a50e76125ca4025-401285-754-1056-jpg_250.jpg "[Yaruku] GOLD PLEASE! Sono 1 (Touhou Project)") | |
![[Yaruku] 絹代式修理法 (Girls und Panzer) [Digital]](https://exhentai.org/t/25/14/251491479565219eec896d754b79c1a9bc2aaf9c-766037-888-1214-png_250.jpg "[Yaruku] 絹代式修理法 (Girls und Panzer) [Digital]") | |
![[Pixiv] Koi Han (21218143)](https://exhentai.org/t/cc/00/cc00a12d75d9124ff0caed6668c117aa87e6b01a-924638-2480-3508-jpg_250.jpg "[Pixiv] Koi Han (21218143)") | |
![[Pixiv] Koi Han (21218143)](https://exhentai.org/t/ab/a9/aba9fb2a9562fd636daa89abf31001187dcedf9b-2305957-6142-6142-jpg_250.jpg "[Pixiv] Koi Han (21218143)") | |
 | |
 | |
![(Comifuro 9) [SunProject (Mimi N)] Existence (Original) (Bahasa Indonesia)](https://exhentai.org/t/3a/0c/3a0caf9d5968bb1a94a44cd1d5986b22aede9452-1092041-1189-1654-jpg_250.jpg "(Comifuro 9) [SunProject (Mimi N)] Existence (Original) (Bahasa Indonesia)") | |
![Ayano's Weight Gain Diary [English]](https://exhentai.org/t/63/4e/634ec3a287e616120ba191a6ed6bccb3f57beef9-5939405-4299-6071-jpg_250.jpg "Ayano's Weight Gain Diary [English]") | |
![(FF31) [-Sakimiya- (sakimiya)] Level 1 Typical Days Vol. 5 (Kantai Collection -KanColle-) [Chinese]](https://exhentai.org/t/1e/9e/1e9ee370350357b696b581ea554994a5e0ca911f-6688111-4315-6049-jpg_250.jpg "(FF31) [-Sakimiya- (sakimiya)] Level 1 Typical Days Vol. 5 (Kantai Collection -KanColle-) [Chinese]") | |
![(FF31) [-Sakimiya- (sakimiya)] Level 1 Typical Days Vol. 4 (Kantai Collection -KanColle-) [Chinese]](https://exhentai.org/t/f1/ab/f1ab2d63e1b56768c5966f4e54797b6052eaca09-9234109-4280-6093-jpg_250.jpg "(FF31) [-Sakimiya- (sakimiya)] Level 1 Typical Days Vol. 4 (Kantai Collection -KanColle-) [Chinese]") | |
![[Himura Kiseki] Getsuyoubi no Tawawa [Colorized] [English] [Ongoing]](https://exhentai.org/t/de/fa/defa931d8d5b36b020e58f377adb67016882ef9c-2031733-3013-2081-jpg_250.jpg "[Himura Kiseki] Getsuyoubi no Tawawa [Colorized] [English] [Ongoing]") | |
![(Kouroumu 3) [Ennui Akadako (Tako)] Goudou Sougi | Combined Funeral (Touhou Project) [English] {Gaku-Touhou}](https://exhentai.org/t/ea/4a/ea4a42ce29266d517e9c916512b4cdfbe400c8ee-774230-2153-1510-jpg_250.jpg "(Kouroumu 3) [Ennui Akadako (Tako)] Goudou Sougi | Combined Funeral (Touhou Project) [English] {Gaku-Touhou}") | |
![[Dog House (Inugami Ryu)] Inu to Kuma. - Dog&Bear. 4 [English] [Digital]](https://exhentai.org/t/b4/f5/b4f5238b3c47a045cebb650d5ec8ec7f7aa25d24-288825-1000-1407-jpg_250.jpg "[Dog House (Inugami Ryu)] Inu to Kuma. - Dog&Bear. 4 [English] [Digital]") | |
![(Reitaisai SP) [Mugijirushi (Tairi)] 4 (Touhou Project) [English] {Gaku-Touhou}](https://exhentai.org/t/48/0b/480bf71a4d427fdbc84bb4e97ad49acbab6775d3-2032668-2858-2000-jpg_250.jpg "(Reitaisai SP) [Mugijirushi (Tairi)] 4 (Touhou Project) [English] {Gaku-Touhou}") | |
![(Reitaisai 5) [Fusuma Cafe (Suichuu Hanabi)] Mushi to Mahou no Baisen Coffee | Roast Blend of Insects and Magic (Touhou Project) [English] {Gaku-Touhou}](https://exhentai.org/t/c8/7d/c87d6cea4b7750490d92cc58346cc0527845a2b9-695546-2155-1514-jpg_250.jpg "(Reitaisai 5) [Fusuma Cafe (Suichuu Hanabi)] Mushi to Mahou no Baisen Coffee | Roast Blend of Insects and Magic (Touhou Project) [English] {Gaku-Touhou}") | |
![(C95) [Miniomelet Ongakudan (Hiyama Yuki)] Hito no Kimochi Kemono no Kimochi (Kemono Friends) [Chinese] [砂糖汉化组]](https://exhentai.org/t/78/cf/78cf070854aa19a317ff888fb242334bc5f759b2-2899913-1058-1515-png_250.jpg "(C95) [Miniomelet Ongakudan (Hiyama Yuki)] Hito no Kimochi Kemono no Kimochi (Kemono Friends) [Chinese] [砂糖汉化组]") | |
![[Studio Tar (Kyouichirou)] Akuma o Produce!! | 악마를 프로듀스!! (Youjo Senki) [Korean] [2017-09-08]](https://exhentai.org/t/17/2b/172bbe034644aa1098a519d232cf1a0fd477cf41-7997922-6307-9090-jpg_250.jpg "[Studio Tar (Kyouichirou)] Akuma o Produce!! | 악마를 프로듀스!! (Youjo Senki) [Korean] [2017-09-08]") | |
![[Pixiv] 意面 [188984]](https://exhentai.org/t/28/d2/28d2c3ff9f593839b9c558c57951b48dcc806e11-1402327-1800-2571-jpg_250.jpg "[Pixiv] 意面 [188984]") | |
![(C95) [Konagona Makki Shoujou (Kona Matsu)] 19-sai no Virtual | 虚拟的19岁 (Tsukino Mito, Higuchi Kaede) [Chinese] [杂鱼DD汉化组]](https://exhentai.org/t/ff/6f/ff6f58fc271da85bc83a75a5bae4ecd986dc1d49-370886-1420-2024-jpg_250.jpg "(C95) [Konagona Makki Shoujou (Kona Matsu)] 19-sai no Virtual | 虚拟的19岁 (Tsukino Mito, Higuchi Kaede) [Chinese] [杂鱼DD汉化组]") | |
 | |
![[Eto] Tachie Sabun](https://exhentai.org/t/8f/57/8f57eed601aa39425aa5c71ececab33e51e648cb-248231-720-1200-jpg_250.jpg "[Eto] Tachie Sabun") | |
![[Jouyama Yui] Zanuff The Butcher [ENG]](https://exhentai.org/t/6f/0e/6f0e225e77497dd3ea5b8c2fcd8d9479ca1b13c5-689284-2145-3003-jpg_250.jpg "[Jouyama Yui] Zanuff The Butcher [ENG]") | |
![[Imasori Dondai (Us Them)] 鳥獣伎楽がどんぶらこする本 (Touhou Project) [Digital]](https://exhentai.org/t/ee/16/ee1646af838699d0294518bde9b78b0ff582a881-155625-2480-3508-png_250.jpg "[Imasori Dondai (Us Them)] 鳥獣伎楽がどんぶらこする本 (Touhou Project) [Digital]") | |
![(C90) [Utsura Uraraka (Eretto)] Libeccio mo konnatoki ha yamenaide hosii. (Kantai Collection -KanColle-)](https://exhentai.org/t/42/75/42758ebc33dc80c8ac7813b459e18eee8e297b61-4951396-2083-2996-jpg_250.jpg "(C90) [Utsura Uraraka (Eretto)] Libeccio mo konnatoki ha yamenaide hosii. (Kantai Collection -KanColle-)") |
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1984 | > |
+
+
+
diff --git a/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestExMinimalPlus.html b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestExMinimalPlus.html
new file mode 100644
index 000000000..dfa1d99e6
--- /dev/null
+++ b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestExMinimalPlus.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
Showing 49,597 results
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1984 | > |
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1984 | > |
+
+
+
diff --git a/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestExThumbnail.html b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestExThumbnail.html
new file mode 100644
index 000000000..53c5cac4c
--- /dev/null
+++ b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryListParserTestExThumbnail.html
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
Showing 49,597 results
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1984 | > |
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1984 | > |
+
+
+
diff --git a/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryPageApiParserTest.json b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryPageApiParserTest.json
new file mode 100644
index 000000000..2d7414c7b
--- /dev/null
+++ b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryPageApiParserTest.json
@@ -0,0 +1 @@
+{"p":3,"s":"s\/7e7a4305a4\/1366222-3","n":"
+
+
+
+
+
+
Showing 49,597 results
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1984 | > |
(C91) [Aoirokanata (Shikitani Asuka)] Neko Flan to Kainushi Koishi | 貓芙蘭和飼主戀 (Touhou Project) [Chinese] [魔恋汉化组]
chinese
Non-H
2019-04-03 09:21
28 pages
(Comifuro 9) [SunProject (Mimi N)] Existence (Original) (Bahasa Indonesia)
Non-H
2019-04-03 04:17
70 pages
(FF31) [-Sakimiya- (sakimiya)] Level 1 Typical Days Vol. 5 (Kantai Collection -KanColle-) [Chinese]
chinese
Non-H
2019-04-03 00:04
38 pages
(FF31) [-Sakimiya- (sakimiya)] Level 1 Typical Days Vol. 4 (Kantai Collection -KanColle-) [Chinese]
chinese
Non-H
2019-04-03 00:00
42 pages
(Kouroumu 3) [Ennui Akadako (Tako)] Goudou Sougi | Combined Funeral (Touhou Project) [English] {Gaku-Touhou}
Non-H
2019-04-02 16:28
44 pages
[Dog House (Inugami Ryu)] Inu to Kuma. - Dog&Bear. 4 [English] [Digital]
Non-H
2019-04-02 16:27
34 pages
(Reitaisai SP) [Mugijirushi (Tairi)] 4 (Touhou Project) [English] {Gaku-Touhou}
Non-H
2019-04-02 16:21
28 pages
(Reitaisai 5) [Fusuma Cafe (Suichuu Hanabi)] Mushi to Mahou no Baisen Coffee | Roast Blend of Insects and Magic (Touhou Project) [English] {Gaku-Touhou}
Non-H
2019-04-02 16:15
43 pages
(C95) [Miniomelet Ongakudan (Hiyama Yuki)] Hito no Kimochi Kemono no Kimochi (Kemono Friends) [Chinese] [砂糖汉化组]
chinese
Non-H
2019-04-02 15:59
34 pages
[Studio Tar (Kyouichirou)] Akuma o Produce!! | 악마를 프로듀스!! (Youjo Senki) [Korean] [2017-09-08]
Non-H
2019-04-02 15:26
16 pages
(C95) [Konagona Makki Shoujou (Kona Matsu)] 19-sai no Virtual | 虚拟的19岁 (Tsukino Mito, Higuchi Kaede) [Chinese] [杂鱼DD汉化组]
chinese
Non-H
2019-04-02 12:55
21 pages
(C90) [Utsura Uraraka (Eretto)] Libeccio mo konnatoki ha yamenaide hosii. (Kantai Collection -KanColle-)
Non-H
2019-04-02 08:06
27 pages
| < | 1 | 2 | 3 | 4 | 5 | 6 | 7 | ... | 1984 | > |
![](\"https:\/\/ehgt.org\/g\/f.png\")
<\/a>![](\"https:\/\/ehgt.org\/g\/p.png\")
<\/a>3<\/span> \/ 13<\/span><\/div>![](\"https:\/\/ehgt.org\/g\/n.png\")
<\/a>![](\"https:\/\/ehgt.org\/g\/l.png\")
<\/a><\/div>","i":"
<\/a><\/a><\/div>","i":"Valentines_2019_002.jpg :: 1280 x 960 :: 178.8 KB<\/div>","k":"7e7a4305a4","i3":"![](\"http:\/\/69.30.203.46:60111\/h\/6047fa2f194742f6fa541ec1f631ec3ab438f960-183117-1280-960-jpg\/keystamp=1550291100-c4438f48c8;fileindex=67379169;xres=1280\/Valentines_2019_002.jpg\")
<\/a>","i5":"![](\"https:\/\/ehgt.org\/g\/b.png\")
<\/a><\/div>","i6":" ![](\"https:\/\/ehgt.org\/g\/mr.gif\")
Show all galleries with this file<\/a> Generate a static forum image link<\/a> Click here if the image fails loading<\/a> ","i7":" Download original 1600 x 1200 335.9 KB source<\/a>","si":15151,"x":"1280","y":"960"}
\ No newline at end of file
diff --git a/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryPageParserTest.html b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryPageParserTest.html
new file mode 100644
index 000000000..e7da42e7c
--- /dev/null
+++ b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryPageParserTest.html
@@ -0,0 +1,17 @@
+
+
+
+(C95) [rurudot (rurudo)] Innocence
+
+
+
+
+
+
+
+
diff --git a/build.gradle b/build.gradle
index 99945643d..2f7108447 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,12 +2,15 @@
buildscript {
repositories {
+ google()
jcenter()
+ maven { url "https://maven.fabric.io/public" }
maven { url "https://jitpack.io" }
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
- classpath 'com.github.seven332:android-chinese-string-gradle-plugin:0.1.0'
+ classpath 'com.android.tools.build:gradle:3.4.2'
+ classpath 'com.google.gms:google-services:4.3.0'
+ classpath 'io.fabric.tools:gradle:1.27.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -16,6 +19,7 @@ buildscript {
allprojects {
repositories {
+ google()
jcenter()
maven { url "https://jitpack.io" }
}
@@ -24,19 +28,3 @@ allprojects {
task clean(type: Delete) {
delete rootProject.buildDir
}
-
-ext {
- supportLibrary = '25.3.1'
-}
-
-subprojects {
- project.configurations.all {
- resolutionStrategy.eachDependency { details ->
- // Keep all android support library update to date
- if (details.requested.group == 'com.android.support'
- && !details.requested.name.contains('multidex') ) {
- details.useVersion "$supportLibrary"
- }
- }
- }
-}
diff --git a/daogenerator/build.gradle b/daogenerator/build.gradle
index b5c683bab..a608c6623 100644
--- a/daogenerator/build.gradle
+++ b/daogenerator/build.gradle
@@ -24,6 +24,6 @@ task executeDaoGenerator(type:JavaExec) {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'org.greenrobot:greendao-generator:2.2.0'
- compile 'org.jboss.forge.roaster:roaster-api:2.18.7.Final'
- compile 'org.jboss.forge.roaster:roaster-jdt:2.18.7.Final'
+ compile 'org.jboss.forge.roaster:roaster-api:2.20.1.Final'
+ compile 'org.jboss.forge.roaster:roaster-jdt:2.20.1.Final'
}
diff --git a/daogenerator/src/main/java/com/hippo/ehviewer/daogenerator/EhDaoGenerator.java b/daogenerator/src/main/java/com/hippo/ehviewer/daogenerator/EhDaoGenerator.java
index a7e155608..bbee9db8b 100644
--- a/daogenerator/src/main/java/com/hippo/ehviewer/daogenerator/EhDaoGenerator.java
+++ b/daogenerator/src/main/java/com/hippo/ehviewer/daogenerator/EhDaoGenerator.java
@@ -32,7 +32,7 @@ public class EhDaoGenerator {
private static final String OUT_DIR = "../app/src/main/java-gen";
private static final String DELETE_DIR = "../app/src/main/java-gen/com/hippo/ehviewer/dao";
- private static final int VERSION = 2;
+ private static final int VERSION = 4;
private static final String DOWNLOAD_INFO_PATH = "../app/src/main/java-gen/com/hippo/ehviewer/dao/DownloadInfo.java";
private static final String HISTORY_INFO_PATH = "../app/src/main/java-gen/com/hippo/ehviewer/dao/HistoryInfo.java";
@@ -138,6 +138,10 @@ private static void addQuickSearch(Schema schema) {
entity.addStringProperty("keyword");
entity.addIntProperty("advanceSearch").notNull();
entity.addIntProperty("minRating").notNull();
+ // Since 4
+ entity.addIntProperty("pageFrom").notNull();
+ // Since 4
+ entity.addIntProperty("pageTo").notNull();
entity.addLongProperty("time").notNull();
}
@@ -190,6 +194,8 @@ private static void addFilter(Schema schema) {
entity.addIdProperty();
entity.addIntProperty("mode").notNull();
entity.addStringProperty("text");
+ // Since 3
+ entity.addBooleanProperty("enable");
}
private static void adjustDownloadInfo() throws Exception {
@@ -351,6 +357,8 @@ private static void adjustQuickSearch() throws Exception {
javaClass.getField("keyword").setPublic();
javaClass.getField("advanceSearch").setPublic();
javaClass.getField("minRating").setPublic();
+ javaClass.getField("pageFrom").setPublic();
+ javaClass.getField("pageTo").setPublic();
javaClass.getField("time").setPublic();
javaClass.addMethod("\t@Override\n" +
@@ -496,7 +504,13 @@ private static void adjustFilter() throws Exception {
// Set field public
javaClass.getField("mode").setPublic();
javaClass.getField("text").setPublic();
- // Add equals method
+ javaClass.getField("enable").setPublic();
+ // Add hashCode method and equals method
+ javaClass.addImport("com.hippo.util.HashCodeUtils");
+ javaClass.addMethod("\t@Override\n" +
+ "\tpublic int hashCode() {\n" +
+ "\t\treturn HashCodeUtils.hashCode(mode, text);\n" +
+ "\t}");
javaClass.addImport("com.hippo.yorozuya.ObjectUtils");
javaClass.addMethod("\t@Override\n" +
"\tpublic boolean equals(Object o) {\n" +
diff --git a/gradle.properties b/gradle.properties
index 1d3591c8a..027ef9db8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,4 +15,7 @@
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c3bb56012..cd7237a48 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Jan 18 22:31:05 CST 2016
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
<\/a>","i5":"<\/a><\/div>","i6":" Show all galleries with this file<\/a> Generate a static forum image link<\/a> Click here if the image fails loading<\/a> ","i7":" Download original 1600 x 1200 335.9 KB source<\/a>","si":15151,"x":"1280","y":"960"}
\ No newline at end of file
diff --git a/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryPageParserTest.html b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryPageParserTest.html
new file mode 100644
index 000000000..e7da42e7c
--- /dev/null
+++ b/app/src/test/resources/com/hippo/ehviewer/client/parser/GalleryPageParserTest.html
@@ -0,0 +1,17 @@
+
+
+
+(C95) [rurudot (rurudo)] Innocence
10 / 11
10.jpg :: 1280 x 879 :: 184.4 KB
10.jpg :: 1280 x 879 :: 184.4 KB
10 / 11
