添加更新服务器选择

AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.hippo.ehviewer"
     android:versionCode="13"
-    android:versionName="0.4.0" >
+    android:versionName="0.4.3" >
     
     <uses-sdk
         android:minSdkVersion="14"

bin/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.hippo.ehviewer"
     android:versionCode="13"
-    android:versionName="0.4.0" >
+    android:versionName="0.4.3" >
     
     <uses-sdk
         android:minSdkVersion="14"

res/raw/change_log

@@ -2,6 +2,7 @@ Version 0.4.3 (2014-??-??)
 * 更丰富的错误提示
 * 禁止多次同时更新
 * 修正由于版本之间数据不同导致的阅读时崩溃
+* 添加更新服务器选择
 
 Version 0.4.2 (2014-04-04)
 * 添加内置存储空间或 Sd Card 检测

res/values-zh-rCN/strings.xml

@@ -134,16 +134,15 @@
     
     <string name="preference_settings_title">设置</string>
     <string name="preference_category_cache">缓存</string>
-    <string name="preference_cp_cache">封面与预览缓存大小</string>
-    <string name="preference_clear_cp_cache">清除封面与预览缓存</string>
-    <string name="preference_page_cache">页面缓存大小</string>
-    <string name="preference_clear_page_cache">清除页面缓存</string>
+    <string name="preference_cache">缓存大小</string>
+    <string name="preference_clear_cache">清除缓存</string>
     <string name="preference_cache_summary" formatted="false">大小 : %.2f / %d MB</string>
     <string name="preference_cache_summary_no">无缓存</string>
     <string name="preference_auto_page_cache">自动清理页面缓存</string>
     <string name="preference_auto_page_cache_summary_on">当应用关闭时清除页面缓存</string>
     <string name="preference_auto_page_cache_summary_off">啥都不做</string>
     <string name="preference_download_path">下载路径</string>
+    <string name="preference_update_server">更新服务器</string>
     
     
     <string name="preference_category_about">关于</string>
@@ -153,6 +152,10 @@
     <string name="input_error">输入错误</string>
     <string name="create_cache_error">创建缓存错误</string>
     
+    <!-- server -->
+    <string name="update_server_google">国外服务器</string>
+    <string name="update_server_qiniu">国内服务器</string>
+    
     <!-- Tag -->
     <string name="add_tag">添加标签</string>
     <string name="tag_name">标签名称：</string>

res/values/array.xml

@@ -75,9 +75,20 @@
         <item>2</item>
     </string-array>
     
+    <string-array name="preference_update_server_entries">
+        <item>@string/update_server_google</item>
+        <item>@string/update_server_qiniu</item>
+    </string-array>
+    
+    <string-array name="preference_update_server_entry_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+    
+    
     <string-array name="is_exhentai" translatable="false">
         <item>g.e-hentai.org</item>
         <item>exhentai.org</item>
     </string-array>
-
+    
 </resources>

res/values/strings.xml

@@ -138,16 +138,15 @@
     
     <string name="preference_settings_title">Settings</string>
     <string name="preference_category_cache">Cache</string>
-    <string name="preference_cp_cache">Cover and preview cache size</string>
-    <string name="preference_clear_cp_cache">Clear cover and preview cache</string>
-    <string name="preference_page_cache">Page cache size</string>
-    <string name="preference_clear_page_cache">Clear page cache</string>
+    <string name="preference_cache">Cache size</string>
+    <string name="preference_clear_cache">Clear cache</string>
     <string name="preference_cache_summary" formatted="false">Size : %.2f / %d MB</string>
     <string name="preference_cache_summary_no">No cache</string>
     <string name="preference_auto_page_cache">Auto clear page cache</string>
     <string name="preference_auto_page_cache_summary_on">Clean page cache when the application close</string>
     <string name="preference_auto_page_cache_summary_off">Leave page cache alone</string>
     <string name="preference_download_path">Download path</string>
+    <string name="preference_update_server">Update server</string>
     
     
     <string name="preference_category_about">About</string>
@@ -160,6 +159,10 @@
     <string name="create_cache_error">Create cache error</string>
     
     
+    <!-- server -->
+    <string name="update_server_google">Google</string>
+    <string name="update_server_qiniu">Qiniu</string>
+    
     <!-- Tag -->
     <string name="add_tag">Add tag</string>
     <string name="tag_name">Tag name : </string>

res/xml/settings.xml

@@ -31,12 +31,12 @@
         <EditTextPreference
             android:defaultValue="25"
             android:inputType="number"
-            android:key="preference_cp_cache"
-            android:title="@string/preference_cp_cache" />
+            android:key="preference_cache"
+            android:title="@string/preference_cache" />
         
         <Preference 
-            android:key="preference_clear_cp_cache"
-            android:title="@string/preference_clear_cp_cache" />
+            android:key="preference_clear_cache"
+            android:title="@string/preference_clear_cache" />
         
     </PreferenceCategory>
     
@@ -68,6 +68,14 @@
             android:title="@string/update"
             android:summary="@string/tap_update" />
         
+        <com.hippo.ehviewer.preference.AutoListPreference
+            android:defaultValue="1"
+            android:entries="@array/preference_update_server_entries"
+            android:entryValues="@array/preference_update_server_entry_values"
+            android:key="preference_update_server"
+            android:summary="%s"
+            android:title="@string/preference_update_server" />
+        
     </PreferenceCategory>
     
     <PreferenceCategory android:title="@string/develop" >

src/com/hippo/ehviewer/UpdateHelper.java

@@ -36,18 +36,11 @@ public class UpdateHelper {
     
     public static final String UPDATE_API = "http://ehviewersu.appsp0t.com/API";
     
-    // Update host
-    private static final int GOOGLE = 0;
-    private static final int QINIU = 1;
-    
     private AppContext mAppContext;
-    private String updateFileName;
     private OnCheckUpdateListener mListener;
     
     private static boolean mEnabled = true;
     
-    private int downloadHost = QINIU;
-    
     public interface OnCheckUpdateListener {
         public void onSuccess(String version, long size, String url, String info);
         public void onNoUpdate();
@@ -102,9 +95,7 @@ public class UpdateHelper {
                     
                     JSONObject detailJO = new JSONObject();
                     detailJO.put("version", pi.versionName);
-                    
-                    // TODO switch server
-                    detailJO.put("server", "qiniu");
+                    detailJO.put("server", Config.getUpdateServer());
                     
                     jo.put("detail", detailJO);
                     

src/com/hippo/ehviewer/activity/SettingsActivity.java

@@ -34,7 +34,6 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.support.v4.util.LruCache;
-import android.util.Log;
 import android.view.View;
 import android.webkit.WebView;
 import android.widget.Toast;
@@ -50,8 +49,8 @@ public class SettingsActivity extends PreferenceActivity {
 
     public LruCache<String, Bitmap> memoryCache;
 
-    private static final String CP_CACHE = "preference_cp_cache";
-    private static final String CLEAR_CP_CACHE = "preference_clear_cp_cache";
+    private static final String CACHE = "preference_cache";
+    private static final String CLEAR_CACHE = "preference_clear_cache";
     private static final String AUTHOR = "preference_author";
     private static final String SCREEN_ORI = "preference_screen_ori";
     private static final String CHANGELOG = "preference_changelog";
@@ -59,8 +58,8 @@ public class SettingsActivity extends PreferenceActivity {
     private static final String UPDATE = "preference_update";
     private static final String RAN = "preference_remove_all_noification";
 
-    private EditTextPreference cpCachePre;
-    private Preference clearCpCachePre;
+    private EditTextPreference cachePre;
+    private Preference clearCachePre;
     private Preference authorPer;
     private AutoListPreference screenOriPer;
     private Preference changelogPer;
@@ -104,8 +103,8 @@ public class SettingsActivity extends PreferenceActivity {
         // Set PreferenceActivity
         PreferenceScreen screen = getPreferenceScreen();
 
-        cpCachePre = (EditTextPreference) screen.findPreference(CP_CACHE);
-        cpCachePre
+        cachePre = (EditTextPreference) screen.findPreference(CACHE);
+        cachePre
                 .setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
                     @Override
                     public boolean onPreferenceChange(Preference preference,
@@ -148,9 +147,9 @@ public class SettingsActivity extends PreferenceActivity {
                     }
                 });
 
-        clearCpCachePre = (Preference) screen.findPreference(CLEAR_CP_CACHE);
+        clearCachePre = (Preference) screen.findPreference(CLEAR_CACHE);
         updateCpCacheSummary();
-        clearCpCachePre
+        clearCachePre
                 .setOnPreferenceClickListener(new OnPreferenceClickListener() {
                     @Override
                     public boolean onPreferenceClick(Preference preference) {
@@ -293,15 +292,15 @@ public class SettingsActivity extends PreferenceActivity {
     
     private void updateCpCacheSummary() {
         if (Cache.cpCache != null) {
-            clearCpCachePre.setSummary(String.format(
+            clearCachePre.setSummary(String.format(
                     getString(R.string.preference_cache_summary),
                     Cache.cpCache.size() / 1024 / 1024f,
                     Cache.cpCache.maxSize() / 1024 / 1024));
-            clearCpCachePre.setEnabled(true);
+            clearCachePre.setEnabled(true);
         } else {
-            clearCpCachePre
+            clearCachePre
                     .setSummary(getString(R.string.preference_cache_summary_no));
-            clearCpCachePre.setEnabled(false);
+            clearCachePre.setEnabled(false);
         }
     }
 }

src/com/hippo/ehviewer/gallery/data/ImageSet.java

@@ -93,6 +93,8 @@ public class ImageSet {
         if (folder == null || !folder.isDirectory())
             size = 0;
         
+        
+        // TODO
         /*
         if (folder == null)
             throw new IllegalArgumentException("Folder is null");
@@ -109,6 +111,7 @@ public class ImageSet {
         if (startIndex > endIndex)
             startIndex = endIndex;
         
+        // TODO
         /*
         if (size < 0 || startIndex < 0
                 || startIndex > endIndex || endIndex > size)

src/com/hippo/ehviewer/util/Config.java

@@ -27,6 +27,9 @@ public class Config {
     private static final String DOWNLOAD_PATH = "preference_download_path";
     private static final String DOWNLOAD_PATH_DEFAULT = Environment.getExternalStorageDirectory() + "/EhViewer/download/";
     
+    private static final String UPDATE_SERVER = "preference_update_server";
+    private static final String UPDATE_SERVER_DEFAULT = "1";
+    
     private static boolean mInit = false;
 
     private static Context mContext;
@@ -190,4 +193,23 @@ public class Config {
         mConfigPre.edit().putInt(KEY_UPDATE_DATE, date).apply();
     }
     
+    public static String getUpdateServer() {
+        
+        int value = 1;
+        try {
+            value = Integer.parseInt(mConfigPre.getString(UPDATE_SERVER, null));
+        } catch (Exception e) {
+            mConfigPre.edit().putString(UPDATE_SERVER, UPDATE_SERVER_DEFAULT)
+                    .apply();
+        }
+        
+        switch (value) {
+        case 1:
+            return "qiniu";
+        
+        case 0:
+        default:
+            return "google";
+        }
+    }
 }