From ceeb84812b3f0ee138e57d20f5ba9252b94990be Mon Sep 17 00:00:00 2001 From: seven332 Date: Thu, 20 Dec 2018 18:16:37 +0800 Subject: [PATCH] Only ignore a special version update --- .../com/hippo/ehviewer/EhApplication.java | 1 - .../java/com/hippo/ehviewer/Settings.java | 12 ++++++--- .../hippo/ehviewer/ui/CommonOperations.java | 26 ++++++++++++------- .../com/hippo/ehviewer/ui/MainActivity.java | 4 +-- app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/bools.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/xml/about_settings.xml | 5 ---- 15 files changed, 30 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.java b/app/src/main/java/com/hippo/ehviewer/EhApplication.java index c81891326..9cf1087a7 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhApplication.java +++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.java @@ -63,7 +63,6 @@ public class EhApplication extends RecordingApplication { private static final String TAG = EhApplication.class.getSimpleName(); public static final boolean BETA = false; - public static final boolean AUTO_UPDATE = true; private static final boolean DEBUG_CONACO = false; private static final boolean DEBUG_PRINT_NATIVE_MEMORY = false; diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.java b/app/src/main/java/com/hippo/ehviewer/Settings.java index ccb94f825..612e65e25 100755 --- a/app/src/main/java/com/hippo/ehviewer/Settings.java +++ b/app/src/main/java/com/hippo/ehviewer/Settings.java @@ -976,8 +976,8 @@ public class Settings { ********************/ private static final String KEY_BETA_UPDATE_CHANNEL = "beta_update_channel"; private static final boolean DEFAULT_BETA_UPDATE_CHANNEL = EhApplication.BETA; - private static final String KEY_AUTO_CHECK_FOR_UPDATES = "auto_check_for_updates"; - private static final boolean DEFAULT_AUTO_CHECK_FOR_UPDATES = EhApplication.AUTO_UPDATE; + private static final String KEY_SKIP_UPDATE_VERSION = "skip_update_version"; + private static final int DEFAULT_SKIP_UPDATE_VERSION = 0; public static boolean getBetaUpdateChannel() { return getBoolean(KEY_BETA_UPDATE_CHANNEL, DEFAULT_BETA_UPDATE_CHANNEL); @@ -987,8 +987,12 @@ public class Settings { putBoolean(KEY_BETA_UPDATE_CHANNEL, value); } - public static boolean getAutoCheckUpdateEnable() { - return getBoolean(KEY_AUTO_CHECK_FOR_UPDATES, DEFAULT_AUTO_CHECK_FOR_UPDATES); + public static int getSkipUpdateVersion() { + return getInt(KEY_SKIP_UPDATE_VERSION, DEFAULT_SKIP_UPDATE_VERSION); + } + + public static void putSkipUpdateVersion(int value) { + putInt(KEY_SKIP_UPDATE_VERSION, value); } /******************** diff --git a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java index 880dae0db..91f32fc15 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/CommonOperations.java @@ -101,17 +101,13 @@ public final class CommonOperations { } private void showUpToDateDialog() { - if (!mFeedback) { - return; - } - new AlertDialog.Builder(mActivity) .setMessage(R.string.update_to_date) .setPositiveButton(android.R.string.ok, null) .show(); } - private void showUpdateDialog(String versionName, String size, CharSequence info, final String url) { + private void showUpdateDialog(String versionName, int versionCode, String size, CharSequence info, final String url) { new AlertDialog.Builder(mActivity) .setTitle(R.string.update) .setMessage(mActivity.getString(R.string.update_plain, versionName, size, info)) @@ -120,16 +116,22 @@ public final class CommonOperations { public void onClick(DialogInterface dialog, int which) { UrlOpener.openUrl(mActivity, url, false); } + }) + .setNegativeButton(R.string.update_ignore, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + Settings.putSkipUpdateVersion(versionCode); + } }).show(); } - private void handleResult(JSONObject jo) { if (null == jo || mActivity.isFinishing()) { return; } String versionName; + int versionCode; String size; CharSequence info; String url; @@ -138,10 +140,12 @@ public final class CommonOperations { PackageManager pm = mActivity.getPackageManager(); PackageInfo pi = pm.getPackageInfo(mActivity.getPackageName(), PackageManager.GET_ACTIVITIES); int currentVersionCode = pi.versionCode; - int newVersionCode = jo.getInt("version_code"); - if (currentVersionCode >= newVersionCode) { + versionCode = jo.getInt("version_code"); + if (currentVersionCode >= versionCode) { // Update to date - showUpToDateDialog(); + if (mFeedback) { + showUpToDateDialog(); + } return; } @@ -153,7 +157,9 @@ public final class CommonOperations { return; } - showUpdateDialog(versionName, size, info, url); + if (mFeedback || versionCode != Settings.getSkipUpdateVersion()) { + showUpdateDialog(versionName, versionCode, size, info, url); + } } @Override diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java index 6304d0004..489d40ed0 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java @@ -350,9 +350,7 @@ public final class MainActivity extends StageActivity if (savedInstanceState == null) { onInit(); - if (Settings.getAutoCheckUpdateEnable()) { - CommonOperations.checkUpdate(this, false); - } + CommonOperations.checkUpdate(this, false); checkDownloadLocation(); if (Settings.getCellularNetworkWarning()) { checkCellularNetwork(); diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 578b1f67b..d89c7f9d6 100755 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -465,7 +465,6 @@ Über die Analyse Versionnummer Auf Update überprüfen - Auf Updates automatisch überprüfen Beta-Version testen Beta-Version kann funktionieren möglicherweise nicht Aktivieren diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e4438bde3..7d0467814 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -477,7 +477,6 @@ Acerca de analytics Versión de compilación Verificar actualizaciones - Verificar automáticamente actualizaciones Canal de versiones de prueba Las versiones de prueba podrían tener errores diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0b8b3acf2..fa095ff01 100755 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -501,7 +501,6 @@ A propos de l\'analyse Numéro de version Chercher mise à jour - Chercher les MÀJ automatiquement Chaîne de mises à jour beta Versions beta riquent de ne pas fonctionner correctement sur votre appareil diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d7f6685d2..0b419129e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -638,7 +638,6 @@ 変更履歴 システム言語（既定） Telegram - 更新を自動で確認 ダウンロードサービス ホストをアプリ既定のIPにマッピング\nカスタムhosts.txtに上書きされます。 カスタムhosts.txt diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 791bee5d2..a6adaffac 100755 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -497,7 +497,6 @@ 데이터 분석 정보 빌드 버전 업데이트 확인 - 업데이트 자동 확인 베타 업데이트 채널 베타 버전은 사용자의 기기에서 정상적으로 작동하지 않을 수 있습니다. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4887cc17c..7b5964be1 100755 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -116,6 +116,7 @@ 更新 版本：%1$s\n大小：%2$s\n\n%3$s EhViewer 已是最新版本 + 忽略 搜索 ExHentai @@ -547,7 +548,6 @@ 关于数据统计 版本号 检查更新 - 自动检查更新 更新测试版 测试版可能在你的设备上出现不可预知的错误 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 7a8853b27..8f3e6cd91 100755 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -116,6 +116,7 @@ 更新 版本：%1$s\n大小：%2$s\n\n%3$s EhViewer 已是最新版本 + 忽略 搜索 ExHentai diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 3aed64723..2e721d1cc 100755 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -116,6 +116,7 @@ 更新 版本：%1$s\n大小：%2$s\n\n%3$s EhViewer 已是最新版本 + 忽略 在 ExHentai 中搜尋 diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml index a5710c2a5..f1c3b1d75 100644 --- a/app/src/main/res/values/bools.xml +++ b/app/src/main/res/values/bools.xml @@ -19,5 +19,5 @@ false true - true + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aadb61c36..c0cd25d6b 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -158,6 +158,7 @@ Update Version: %1$s\nSize: %2$s\n\n%3$s You are using the latest version of EhViewer. + Ignore Search ExHentai @@ -593,7 +594,6 @@ About analytics Build version Check for updates - Auto. check for updates Beta update channel Beta versions may contain unsolved bugs. diff --git a/app/src/main/res/xml/about_settings.xml b/app/src/main/res/xml/about_settings.xml index 64d3c408c..783c77448 100644 --- a/app/src/main/res/xml/about_settings.xml +++ b/app/src/main/res/xml/about_settings.xml @@ -72,11 +72,6 @@ android:summary="@string/settings_about_beta_update_channel_summary" android:defaultValue="@bool/beta"/> - -