diff --git a/app/src/main/java/com/hippo/ehviewer/EhDB.java b/app/src/main/java/com/hippo/ehviewer/EhDB.java index 3c0ad5fdd..ad5d5dd54 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhDB.java +++ b/app/src/main/java/com/hippo/ehviewer/EhDB.java @@ -364,6 +364,11 @@ public class EhDB { dao.deleteByKey(gid); } + public static synchronized void clearDownloadDirname() { + DownloadDirnameDao dao = sDaoSession.getDownloadDirnameDao(); + dao.deleteAll(); + } + @NonNull public static synchronized List getAllDownloadLabelList() { DownloadLabelDao dao = sDaoSession.getDownloadLabelDao(); diff --git a/app/src/main/java/com/hippo/ehviewer/preference/ClearDownloadPathCachePreference.java b/app/src/main/java/com/hippo/ehviewer/preference/ClearDownloadPathCachePreference.java new file mode 100644 index 000000000..a94eb911f --- /dev/null +++ b/app/src/main/java/com/hippo/ehviewer/preference/ClearDownloadPathCachePreference.java @@ -0,0 +1,69 @@ +/* + * Copyright 2016 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.ehviewer.preference; + +import android.content.Context; +import android.support.v7.app.AlertDialog; +import android.util.AttributeSet; + +import com.hippo.ehviewer.EhDB; +import com.hippo.ehviewer.R; +import com.hippo.preference.MessagePreference; + +public class ClearDownloadPathCachePreference extends MessagePreference { + + public ClearDownloadPathCachePreference(Context context) { + super(context); + init(context); + } + + public ClearDownloadPathCachePreference(Context context, AttributeSet attrs) { + super(context, attrs); + init(context); + } + + public ClearDownloadPathCachePreference(Context context, + AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(context); + } + + public ClearDownloadPathCachePreference(Context context, + AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + init(context); + } + + public void init(Context context) { + setDialogMessage(context.getString(R.string.settings_advanced_clear_download_path_cache_message)); + } + + @Override + protected void onPrepareDialogBuilder(AlertDialog.Builder builder) { + super.onPrepareDialogBuilder(builder); + builder.setTitle(null); + } + + @Override + protected void onDialogClosed(boolean positiveResult) { + super.onDialogClosed(positiveResult); + + if (positiveResult) { + EhDB.clearDownloadDirname(); + } + } +} diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.java index cfae7b2bf..3f4a5fdea 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.java @@ -58,8 +58,8 @@ public class AdvancedFragment extends PreferenceFragment implements Preference.O } Resources resources = getResources(); Toast.makeText(getActivity(), - ok ? resources.getString(R.string.settings_about_dump_logcat_to, file.getPath()) : - resources.getString(R.string.settings_about_dump_logcat_failed), Toast.LENGTH_SHORT).show(); + ok ? resources.getString(R.string.settings_advanced_dump_logcat_to, file.getPath()) : + resources.getString(R.string.settings_advanced_dump_logcat_failed), Toast.LENGTH_SHORT).show(); return true; } return false; diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index bda65eb5e..4b7d2b4b0 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -363,12 +363,15 @@ 成功恢复 %s 项 高级 - 解析失败时保存页面内容 - 页面内容可能含有隐私敏感信息 - 导出日志 - 保存日志至外置存储器 - 导出日志失败 - 已保存日志至 %s + 解析失败时保存页面内容 + 页面内容可能含有隐私敏感信息 + 导出日志 + 保存日志至外置存储器 + 导出日志失败 + 已保存日志至 %s + 清除画廊下载路径缓存 + 画廊下载路径可能出错了，导致重新下载。清除画廊下载路径缓存可能解决这个问题。 + 清除画廊下载路径缓存？ 关于 作者 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 7890d0b7f..b4e4681a6 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -363,12 +363,14 @@ 成功恢復 %s 項 高級 - 解析失敗時保存頁面內容 - 頁面內容可能含有隱私敏感信息 - 導出日誌 - 保存日誌至外置存儲器 - 導出日誌失敗 - 已保存日誌至 %s + 解析失敗時保存頁面內容 + 頁面內容可能含有隱私敏感信息 + 導出日誌 + 保存日誌至外置存儲器 + 導出日誌失敗 + 已保存日誌至 %s + 清除畫廊下載路徑緩存 + 畫廊下載路徑可能出錯了，導致重新下載。清除畫廊下載路徑緩存可能解決這個問題。 關於 作者 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 761ae57a1..a2f7ec79d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -363,12 +363,14 @@ 成功恢復 %s 項 高階 - 解析失敗時儲存頁面內容 - 頁面內容可能含有隱私敏感資訊 - 匯出日誌 - 儲存日誌至外接儲存器 - 匯出日誌失敗 - 已儲存日誌至 %s + 解析失敗時儲存頁面內容 + 頁面內容可能含有隱私敏感資訊 + 匯出日誌 + 儲存日誌至外接儲存器 + 匯出日誌失敗 + 已儲存日誌至 %s + 清除畫廊下載路徑快取 + 畫廊下載路徑可能出錯了，導致重新下載。清除畫廊下載路徑快取可能解決這個問題。 關於 作者 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a7d9f53df..0a370877f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -402,12 +402,15 @@ Restore %d items successfully Advanced - Save html content when parsing error - Html content may be privacy-sensitive - Dump logcat - Save logcat to external storage - Dump logcat failed - Saved logcat to %s + Save html content when parsing error + Html content may be privacy-sensitive + Dump logcat + Save logcat to external storage + Dump logcat failed + Saved logcat to %s + Clear download path cache + Gallery download path might be wrong and it need to be redownload. Clearing download path cache might solve the problem. + Clear download path cache? About Author diff --git a/app/src/main/res/xml/advanced_settings.xml b/app/src/main/res/xml/advanced_settings.xml index 5c525fca7..671b5e99d 100644 --- a/app/src/main/res/xml/advanced_settings.xml +++ b/app/src/main/res/xml/advanced_settings.xml @@ -20,13 +20,18 @@ + android:title="@string/settings_advanced_dump_logcat" + android:summary="@string/settings_advanced_dump_logcat_summary"/> + +