diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5b6b44378..f8e51485d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -35,6 +35,7 @@
         android:label="@string/app_name"
         android:largeHeap="false"
         android:theme="@style/AppTheme.Normal" >
+
         <activity
             android:name=".StartActivity"
             android:label="@string/app_name"
@@ -42,10 +43,10 @@
             android:theme="@style/AppTheme.NoActionBar.Transparent" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
         <activity
             android:name=".ui.GalleryListActivity"
             android:configChanges="orientation|screenSize"
@@ -56,11 +57,11 @@
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
-
             <meta-data
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
         </activity>
+
         <activity
             android:name=".ui.GalleryDetailActivity"
             android:configChanges="orientation|screenSize"
@@ -68,10 +69,8 @@
             android:windowSoftInputMode="adjustPan|adjustUnspecified|stateHidden" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <data android:scheme="http" />
                 <data android:host="exhentai.org" />
                 <data android:host="g.e-hentai.org" />
@@ -79,11 +78,14 @@
                 <data android:pathPrefix="/g/" />
             </intent-filter>
         </activity>
+
         <activity
             android:name=".ui.GalleryActivity"
             android:configChanges="orientation|screenSize"
-            android:screenOrientation="behind" >
+            android:screenOrientation="behind"
+            android:theme="@style/AppTheme.NoActionBar" >
         </activity>
+
         <activity
             android:name=".ui.SettingsActivity"
             android:configChanges="orientation|screenSize"
@@ -91,6 +93,7 @@
             android:label="@string/preference_settings_title"
             android:screenOrientation="behind" >
         </activity>
+
         <activity
             android:name=".ui.FavouriteActivity"
             android:configChanges="orientation|screenSize"
@@ -99,6 +102,7 @@
             android:screenOrientation="behind"
             android:theme="@style/AppTheme.ListActivity" >
         </activity>
+
         <activity
             android:name=".ui.DownloadActivity"
             android:configChanges="orientation|screenSize"
@@ -111,13 +115,6 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.hippo.ehviewer.activity.MangaListActivity" />
         </activity>
-        <activity
-            android:name="com.hippo.ehviewer.ui.GalleryDownloadActivity"
-            android:configChanges="orientation|screenSize"
-            android:icon="@drawable/ic_action_download"
-            android:label="@string/download"
-            android:screenOrientation="behind" >
-        </activity>
 
         <service
             android:name=".service.DownloadService"
diff --git a/res/drawable/sadpanda.jpg b/res/drawable/sadpanda.jpg
deleted file mode 100644
index 11634b21e..000000000
Binary files a/res/drawable/sadpanda.jpg and /dev/null differ
diff --git a/res/layout/comments.xml b/res/layout/comments.xml
deleted file mode 100644
index 6ec808e3f..000000000
--- a/res/layout/comments.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 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.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
-
-    <ListView
-        android:id="@+id/commtens_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false" >
-    </ListView>
-
-    <ProgressBar
-        android:id="@+id/commtens_wait"
-        style="@style/ProgressBar.Large"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true" />
-
-    <Button
-        android:id="@+id/commtens_refresh"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:text="@string/refresh"
-        android:visibility="gone" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/detail_avg_text.xml b/res/layout/detail_avg_text.xml
deleted file mode 100644
index 4196b5457..000000000
--- a/res/layout/detail_avg_text.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 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.
--->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/DetailSubtitle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:gravity="center_horizontal" />
diff --git a/res/layout/detail_header.xml b/res/layout/detail_header.xml
deleted file mode 100644
index b3645b615..000000000
--- a/res/layout/detail_header.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 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.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="@dimen/detail_thumb_height" >
-
-    <com.hippo.ehviewer.widget.LoadImageView
-        android:id="@+id/detail_cover"
-        android:layout_width="@dimen/detail_thumb_width"
-        android:layout_height="@dimen/detail_thumb_height"
-        android:scaleType="fitCenter" />
-
-    <TextView
-        android:id="@+id/detail_title"
-        style="@style/DetailTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
-        android:layout_marginTop="2dp"
-        android:layout_toRightOf="@id/detail_cover" />
-
-    <TextView
-        android:id="@+id/detail_uploader"
-        style="@style/DetailSubtitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/detail_title"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
-        android:layout_marginTop="4dp"
-        android:layout_toRightOf="@id/detail_cover"
-        android:paddingLeft="4dp"
-        android:paddingTop="2dp"
-        android:paddingRight="4dp"
-        android:paddingBottom="2dp"
-        android:background="@drawable/clickable_bg_blue"
-        android:textColor="@color/blue_bn_text" />
-
-
-    <TextView
-        android:id="@+id/detail_category"
-        style="@style/TextTag"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="10.0dp"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
-        android:layout_toRightOf="@id/detail_cover"
-        android:background="@android:color/transparent" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="10.0dp"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
-        android:orientation="vertical" >
-
-        <Button
-            android:id="@+id/detail_do_rate"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10.0dp"
-            android:text="@string/rate" />
-
-        <Button
-            android:id="@+id/detail_read"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/read" />
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/detail_offensive.xml b/res/layout/detail_offensive.xml
deleted file mode 100644
index 2d2b3b470..000000000
--- a/res/layout/detail_offensive.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical" >
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:text="@string/detail_offensive_title"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textColor="#ff0000" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:text="@string/detail_offensive" />
-
-    <Button
-        android:id="@+id/detail_button_cancel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:text="@string/detail_button_cancel" />
-
-    <Button
-        android:id="@+id/detail_button_once"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:text="@string/detail_button_once" />
-
-    <Button
-        android:id="@+id/detail_button_every"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:text="@string/detail_button_every" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/detail_pining.xml b/res/layout/detail_pining.xml
deleted file mode 100644
index 5b1632d0e..000000000
--- a/res/layout/detail_pining.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical" >
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginTop="8dp"
-        android:text="@string/detail_pining" />
-
-    <Button
-        android:id="@+id/detail_button_known"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:text="@string/detail_button_known" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/start.xml b/res/layout/start.xml
deleted file mode 100644
index 899e633c8..000000000
--- a/res/layout/start.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/app_start_view"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:background="@drawable/welcome" >
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/viewpager.xml b/res/layout/viewpager.xml
deleted file mode 100644
index 30f706a4c..000000000
--- a/res/layout/viewpager.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
- -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-    
-    <com.hippo.ehviewer.widget.FswView
-        android:id="@+id/alignment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-    
-    <android.support.v4.view.ViewPager
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/wait.xml b/res/layout/wait.xml
deleted file mode 100644
index cb8ba22fb..000000000
--- a/res/layout/wait.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:orientation="horizontal"
-    android:padding="12dp" >
-
-    <TextView
-        android:id="@+id/wait_message"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_margin="12dp"
-        android:textSize="18sp" />
-
-    <ProgressBar
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_margin="12dp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/xml/data_settings.xml b/res/xml/data_settings.xml
index 164c05f20..38eb07039 100644
--- a/res/xml/data_settings.xml
+++ b/res/xml/data_settings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 Hippo Seven
+<!--
+     Copyright (C) 2014 Hippo Seven
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,47 +17,32 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <PreferenceCategory
-        android:title="@string/cache_data_settings_title">
-        
-        <EditTextPreference
-            android:defaultValue="25"
-            android:inputType="number"
-            android:key="cache_size"
-            android:title="@string/cache_size_title" />
-        
-        <Preference 
-            android:key="clear_cache"
-            android:title="@string/clear_cache_title" />
-        
-    </PreferenceCategory>
-    
     <PreferenceCategory
         android:title="@string/download_data_settings_title">
 
         <Preference
             android:key="download_path"
             android:title="@string/download_path_title" />
-        
+
         <CheckBoxPreference
             android:key="media_scan"
             android:title="@string/media_scan_title"
             android:summaryOn="@string/media_scan_summary_on"
             android:summaryOff="@string/media_scan_summary_off"
             android:defaultValue="false" />
-        
+
     </PreferenceCategory>
-    
+
     <PreferenceCategory
         android:title="@string/favorite_data_settings_title">
-        
+
         <com.hippo.ehviewer.preference.AutoListPreference
             android:key="default_favorite"
             android:title="@string/default_favorite"
             android:entryValues="@array/default_favorite_entry_values"
             android:defaultValue="-2"
             android:summary="%s" />
-        
+
     </PreferenceCategory>
-    
+
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/com/hippo/ehviewer/AppContext.java b/src/com/hippo/ehviewer/AppContext.java
index 8d81bd4cb..24f093edf 100644
--- a/src/com/hippo/ehviewer/AppContext.java
+++ b/src/com/hippo/ehviewer/AppContext.java
@@ -28,6 +28,7 @@ import android.app.Application;
 import com.hippo.ehviewer.cache.ImageCache;
 import com.hippo.ehviewer.data.Data;
 import com.hippo.ehviewer.ehclient.EhClient;
+import com.hippo.ehviewer.ehclient.ExDownloadManager;
 import com.hippo.ehviewer.util.Config;
 import com.hippo.ehviewer.util.Crash;
 import com.hippo.ehviewer.util.Download;
@@ -45,10 +46,18 @@ public class AppContext extends Application implements UncaughtExceptionHandler
 
     private Thread.UncaughtExceptionHandler mDefaultHandler;
 
-    private Data mData;
-    private EhClient mEhClient;
     private ThreadPool mNetworkThreadPool;
 
+    private static AppContext sInstance;
+
+    public static AppContext getInstance() {
+        return sInstance;
+    }
+
+    public AppContext() {
+        sInstance = this;
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -62,6 +71,7 @@ public class AppContext extends Application implements UncaughtExceptionHandler
         Download.init(this);
         Favorite.init(this);
         Data.createInstance(this);
+        ExDownloadManager.createInstance();
         MaterialToast.setContext(this);
 
         // Do catch error prepare
diff --git a/src/com/hippo/ehviewer/ImageLoader.java b/src/com/hippo/ehviewer/ImageLoader.java
index 8e8ad2489..6ee76720e 100644
--- a/src/com/hippo/ehviewer/ImageLoader.java
+++ b/src/com/hippo/ehviewer/ImageLoader.java
@@ -26,6 +26,7 @@ import com.hippo.ehviewer.cache.ImageCache;
 import com.hippo.ehviewer.network.HttpHelper;
 
 public class ImageLoader {
+    @SuppressWarnings("unused")
     private static final String TAG = ImageLoader.class.getSimpleName();
 
     private static ImageLoader sInstance;
@@ -47,7 +48,6 @@ public class ImageLoader {
     private final Stack<LoadTask> mLoadTasks;
     private final ImageCache mImageCache;
     private final ImageDownloader mImageDownloader;
-    private final Object mLock;
 
     public ImageLoader(Context context) {
         mLoadTasks = new Stack<LoadTask>();
@@ -56,7 +56,6 @@ public class ImageLoader {
         mContext = context;
         mImageCache = ImageCache.getInstance(mContext);
 
-        mLock = new Object();
         Thread thread = new Thread(new LoadFromCacheTask());
         thread.setPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);
         thread.start();
@@ -70,9 +69,9 @@ public class ImageLoader {
     }
 
     public void add(String url, String key, OnGetImageListener listener) {
-        synchronized (mLock) {
+        synchronized (mLoadTasks) {
             mLoadTasks.push(new LoadTask(url, key, listener));
-            mLock.notify();
+            mLoadTasks.notify();
         }
     }
 
@@ -81,10 +80,10 @@ public class ImageLoader {
         public void run() {
             LoadTask loadTask;
             while (true) {
-                synchronized (mLock) {
+                synchronized (mLoadTasks) {
                     if (mLoadTasks.isEmpty()) {
                         try {
-                            mLock.wait();
+                            mLoadTasks.wait();
                         } catch (InterruptedException e) {}
                         continue;
                     }
@@ -107,15 +106,13 @@ public class ImageLoader {
         private static final int MAX_DOWNLOAD_THREADS = 5;
         private final Stack<LoadTask> mDownloadTasks;
         private int mWorkingThreadNum = 0;
-        private final Object mLock;
 
         public ImageDownloader() {
-            mLock = new Object();
             mDownloadTasks = new Stack<LoadTask>();
         }
 
         public void add(LoadTask loadTask) {
-            synchronized (mLock) {
+            synchronized (mDownloadTasks) {
                 mDownloadTasks.push(loadTask);
                 if (mWorkingThreadNum < MAX_DOWNLOAD_THREADS) {
                     Thread thread = new Thread(new DownloadImageTask());
@@ -132,7 +129,7 @@ public class ImageLoader {
                 LoadTask loadTask;
                 HttpHelper httpHelper = new HttpHelper(mContext);
                 while (true) {
-                    synchronized (mLock) {
+                    synchronized (mDownloadTasks) {
                         if (mDownloadTasks.isEmpty()) {
                             loadTask = null;
                             mWorkingThreadNum--;
diff --git a/src/com/hippo/ehviewer/StartActivity.java b/src/com/hippo/ehviewer/StartActivity.java
index 58051aff2..3e6a772f5 100644
--- a/src/com/hippo/ehviewer/StartActivity.java
+++ b/src/com/hippo/ehviewer/StartActivity.java
@@ -16,12 +16,6 @@
 
 package com.hippo.ehviewer;
 
-import com.hippo.ehviewer.ui.GalleryListActivity;
-import com.hippo.ehviewer.util.Config;
-import com.hippo.ehviewer.util.Crash;
-import com.hippo.ehviewer.widget.AlertButton;
-import com.hippo.ehviewer.widget.DialogBuilder;
-
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -37,20 +31,25 @@ import android.view.View;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 import android.view.animation.Animation.AnimationListener;
-import android.widget.LinearLayout;
+
+import com.hippo.ehviewer.ui.GalleryListActivity;
+import com.hippo.ehviewer.util.Config;
+import com.hippo.ehviewer.util.Crash;
+import com.hippo.ehviewer.widget.AlertButton;
+import com.hippo.ehviewer.widget.DialogBuilder;
 
 public class StartActivity extends Activity {
-    
+
     private static final int CHECK_WARING = 0;
     private static final int CHECK_ANALYTICS = 1;
     private static final int CHECK_NETWORK = 2;
     private static final int CHECK_CRASH = 3;
     private static final int CHECK_EXTERNAL_STORAGE = 4;
-    
+
     private String lastCrash;
     private boolean isAnimationOver = false;
     private boolean isCheckOver = false;
-    
+
     private AlertDialog createWarningDialog() {
         return new DialogBuilder(this).setCancelable(false)
                 .setTitle(R.string.dailog_waring_title)
@@ -61,7 +60,7 @@ public class StartActivity extends Activity {
                     public void onClick(View v) {
                         ((AlertButton)v).dialog.dismiss();
                         Config.allowed();
-                        
+
                         check(CHECK_ANALYTICS);
                     }
                 }).setNegativeButton(R.string.dailog_waring_no,
@@ -73,7 +72,7 @@ public class StartActivity extends Activity {
                     }
                 }).create();
     }
-    
+
     private AlertDialog createAllowAnalyicsDialog() {
         return new DialogBuilder(this).setCancelable(false)
                 .setTitle(R.string.dailog_analyics_title)
@@ -95,7 +94,7 @@ public class StartActivity extends Activity {
                     }
                 }).create();
     }
-    
+
     private AlertDialog createNetworkErrorDialog() {
         return new DialogBuilder(this).setCancelable(false)
                 .setTitle(R.string.error).setMessage(R.string.em_no_network)
@@ -104,7 +103,7 @@ public class StartActivity extends Activity {
                     @Override
                     public void onClick(View v) {
                         ((AlertButton)v).dialog.dismiss();
-                        
+
                         check(CHECK_CRASH);
                     }
                 })
@@ -117,7 +116,7 @@ public class StartActivity extends Activity {
                     }
                 }).create();
     }
-    
+
     private AlertDialog createSendCrashDialog() {
         return new DialogBuilder(this).setCancelable(false)
                 .setTitle(R.string.dialog_send_crash_title)
@@ -126,7 +125,7 @@ public class StartActivity extends Activity {
                     @Override
                     public void onClick(View v) {
                         ((AlertButton)v).dialog.dismiss();
-                        
+
                         new DialogBuilder(StartActivity.this).setCancelable(false)
                                 .setTitle(R.string.wait)
                                 .setMessage(R.string.dialog_wait_send_crash_msg)
@@ -135,11 +134,11 @@ public class StartActivity extends Activity {
                                             @Override
                                             public void onClick(View v) {
                                                 ((AlertButton)v).dialog.dismiss();
-                                                
+
                                                 check(CHECK_EXTERNAL_STORAGE);
                                             }
                                         }).show();
-                        
+
                         Intent i = new Intent(Intent.ACTION_SENDTO);
                         i.setData(Uri.parse("mailto:ehviewersu@gmail.com"));
                         i.putExtra(Intent.EXTRA_SUBJECT, "I found a bug in EhViewer !");
@@ -148,17 +147,17 @@ public class StartActivity extends Activity {
                         lastCrash = null;
                     }
                 }).setNegativeButton(R.string.dialog_send_crash_no, new View.OnClickListener() {
-                    
+
                     @Override
                     public void onClick(View v) {
                         ((AlertButton)v).dialog.dismiss();
                         lastCrash = null;
-                        
+
                         check(CHECK_EXTERNAL_STORAGE);
                     }
                 }).create();
     }
-    
+
     private AlertDialog createNoSdCardDialog() {
         return new DialogBuilder(this).setCancelable(false)
                 .setTitle("未检测到内置存储空间或 Sd Card")
@@ -167,7 +166,7 @@ public class StartActivity extends Activity {
                     @Override
                     public void onClick(View v) {
                         ((AlertButton)v).dialog.dismiss();
-                        
+
                         checkOver();
                     }
                 }).setNegativeButton("算了", new View.OnClickListener() {
@@ -178,15 +177,17 @@ public class StartActivity extends Activity {
                     }
                 }).create();
     }
-    
+
+    @SuppressWarnings("deprecation")
     @SuppressLint("InlinedApi")
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.start);
-        
-        LinearLayout wellcome = (LinearLayout)findViewById(R.id.app_start_view);
-        
+
+        View wellcome = new View(this);
+        wellcome.setBackgroundDrawable(getResources().getDrawable(R.drawable.welcome));
+        setContentView(wellcome);
+
         // For fullscreen
         if (Build.VERSION.SDK_INT >= 19) {
             wellcome.setSystemUiVisibility(
@@ -197,18 +198,16 @@ public class StartActivity extends Activity {
                     | View.SYSTEM_UI_FLAG_FULLSCREEN
                     | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
         }
-        
+
         // Show welcome in progress
         AlphaAnimation aa = new AlphaAnimation(0.3f,1.0f);
         aa.setDuration(2000);
         aa.setAnimationListener(new AnimationListener() {
             @Override
             public void onAnimationEnd(Animation arg0) {
-                synchronized (StartActivity.this) {
-                    if (isCheckOver)
-                        redirectTo();
-                    isAnimationOver = true;
-                }
+                if (isCheckOver)
+                    redirectTo();
+                isAnimationOver = true;
             }
             @Override
             public void onAnimationRepeat(Animation animation) {}
@@ -218,7 +217,7 @@ public class StartActivity extends Activity {
         wellcome.startAnimation(aa);
         check(CHECK_WARING);
     }
-    
+
     /**
      * Order is
      * 1. check waring
@@ -226,7 +225,7 @@ public class StartActivity extends Activity {
      * 3. check network
      * 4. check crash
      * 5. check external storage
-     * 
+     *
      * @param order
      */
     private void check(int order) {
@@ -260,13 +259,13 @@ public class StartActivity extends Activity {
         }
         checkOver();
     }
-    
-    private synchronized void checkOver() {
+
+    private void checkOver() {
         if (isAnimationOver)
             redirectTo();
         isCheckOver = true;
     }
-    
+
     private boolean isNetworkAvailable() {
         ConnectivityManager cm = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo mNetworkInfo = cm.getActiveNetworkInfo();
@@ -275,8 +274,8 @@ public class StartActivity extends Activity {
         else
             return true;
     }
-    
-    private void redirectTo(){        
+
+    private void redirectTo(){
         Intent intent = new Intent(this, GalleryListActivity.class);
         startActivity(intent);
         finish();
diff --git a/src/com/hippo/ehviewer/ehclient/DetailParser.java b/src/com/hippo/ehviewer/ehclient/DetailParser.java
index a1cf05fb8..5847996fd 100644
--- a/src/com/hippo/ehviewer/ehclient/DetailParser.java
+++ b/src/com/hippo/ehviewer/ehclient/DetailParser.java
@@ -143,9 +143,9 @@ public class DetailParser {
             if (m.find()) {
                 re |= DETAIL;
 
-                thumb = Utils.htmlUnsescape(m.group(1));
-                title = Utils.htmlUnsescape(m.group(2));
-                title_jpn = Utils.htmlUnsescape(m.group(3));
+                thumb = Utils.unescapeXml(m.group(1));
+                title = Utils.unescapeXml(m.group(2));
+                title_jpn = Utils.unescapeXml(m.group(3));
                 category = EhClient.getType(m.group(4));
                 uploader = m.group(5);
                 posted = m.group(6);
diff --git a/src/com/hippo/ehviewer/ehclient/DetailUrlParser.java b/src/com/hippo/ehviewer/ehclient/DetailUrlParser.java
index 92b4b45ab..964b82a56 100644
--- a/src/com/hippo/ehviewer/ehclient/DetailUrlParser.java
+++ b/src/com/hippo/ehviewer/ehclient/DetailUrlParser.java
@@ -20,10 +20,10 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class DetailUrlParser {
-    
+
     public int gid;
     public String token;
-    
+
     public boolean parser(String url) {
         Pattern p = Pattern.compile("/(\\d+)/(\\w+)");
         Matcher m = p.matcher(url);
diff --git a/src/com/hippo/ehviewer/ehclient/EdDetailParser.java b/src/com/hippo/ehviewer/ehclient/EdDetailParser.java
new file mode 100644
index 000000000..c9697117e
--- /dev/null
+++ b/src/com/hippo/ehviewer/ehclient/EdDetailParser.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2014 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.ehclient;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class EdDetailParser {
+
+    int previewPageNum;
+    int previewStartIndex;
+    int imageNum;
+    boolean isLastPage;
+    List<String> pageTokenArray;
+    String emsg;
+
+    public boolean parser(String body, int mode, boolean needPreviewInfo) {
+        Pattern p;
+        Matcher m;
+
+        if (!body.contains("<"))
+            emsg = body;
+
+        if (mode == EhClient.MODE_LOFI) {
+            // Check is last page
+            p = Pattern.compile("<a[^>]+>Next Page &gt;</a>");
+            m = p.matcher(body);
+            if (m.find())
+                isLastPage = false;
+            else
+                isLastPage = true;
+
+            // Parser preview
+            p = Pattern.compile("<div class=\"gi\"[^>]*><a href=\"http://lofi.e-hentai.org/s/(\\w+)/\\d+-(\\d+)\"[^>]*>");
+            m = p.matcher(body);
+            boolean first = true;
+            while(m.find()) {
+                if (first) {
+                    pageTokenArray = new LinkedList<String>();
+                    previewStartIndex = Integer.parseInt(m.group(2)) - 1;
+                    first = false;
+                }
+                pageTokenArray.add(m.group(1));
+            }
+            if (first)
+                return false;
+            else
+                return true;
+
+        } else {
+            // Parser preview info
+            if (needPreviewInfo) {
+                p = Pattern.compile("<td[^>]+><a[^>]+>([\\d,]+)</a></td><td[^>]+>(?:<a[^>]+>)?&gt;(?:</a>)?</td>");
+                m = p.matcher(body);
+                if (m.find())
+                    previewPageNum = Integer.valueOf(m.group(1).replace(",", ""));
+                else
+                    return false;
+
+                p = Pattern.compile("<td class=\"gdt1\">Images:</td><td class=\"gdt2\">([\\d,]+) ");
+                m = p.matcher(body);
+                if (m.find())
+                    imageNum = Integer.valueOf(m.group(1).replace(",", ""));
+                else
+                    return false;
+            }
+
+            // Parser preview
+            p = Pattern.compile("<div class=\"gdtm\"[^>]*><div[^>]*><a href=\"http://exhentai.org/s/(\\w+)/\\d+-(\\d+)\">");
+            m = p.matcher(body);
+            boolean first = true;
+            while(m.find()) {
+                if (first) {
+                    pageTokenArray = new LinkedList<String>();
+                    previewStartIndex = Integer.parseInt(m.group(2)) - 1;
+                    first = false;
+                }
+                pageTokenArray.add(m.group(1));
+            }
+            if (first)
+                return false;
+            else
+                return true;
+        }
+    }
+
+}
diff --git a/src/com/hippo/ehviewer/ehclient/EhClient.java b/src/com/hippo/ehviewer/ehclient/EhClient.java
index 08b742ec0..89edb6dcc 100644
--- a/src/com/hippo/ehviewer/ehclient/EhClient.java
+++ b/src/com/hippo/ehviewer/ehclient/EhClient.java
@@ -32,6 +32,7 @@ import org.json.JSONObject;
 import android.graphics.Bitmap;
 import android.os.Handler;
 import android.os.Message;
+import android.os.Process;
 
 import com.hippo.ehviewer.Analytics;
 import com.hippo.ehviewer.AppContext;
@@ -103,7 +104,7 @@ public class EhClient {
         return sInstance;
     }
 
-    public EhClient(AppContext appContext) {
+    private EhClient(AppContext appContext) {
         mAppContext = appContext;
         mThreadPool = mAppContext.getNetworkThreadPool();
         mHandler = AppHandler.getInstance();
@@ -170,11 +171,11 @@ public class EhClient {
                 .append("/?p=").append(pageNum).toString();
     }
 
-    public String getPageUrl(String gid, String token, int pageNum) {
+    public String getPageUrl(int gid, String token, int pageNum) {
         return getPageUrl(gid, token, pageNum, Config.getMode());
     }
 
-    public static String getPageUrl(String gid, String token, int pageNum, int mode) {
+    public static String getPageUrl(int gid, String token, int pageNum, int mode) {
         StringBuilder sb = new StringBuilder();
         switch (mode) {
         case MODE_EX:
@@ -364,7 +365,7 @@ public class EhClient {
                 mHandler.post(responder);
             }
         });
-        thread.setPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);
+        thread.setPriority(Process.THREAD_PRIORITY_BACKGROUND);
         thread.start();
     }
 
@@ -388,7 +389,7 @@ public class EhClient {
                     listener.onGetAvatar(GET_AVATAR_ERROR);
                     return;
                 }
-                String profileUrl = Utils.htmlUnsescape(m.group(1));
+                String profileUrl = Utils.unescapeXml(m.group(1));
                 // Get avatar url
                 body = hp.get(profileUrl);
                 if (body == null) {
@@ -413,7 +414,7 @@ public class EhClient {
                 listener.onGetAvatar(GET_AVATAR_OK);
             }
         });
-        thread.setPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);
+        thread.setPriority(Process.THREAD_PRIORITY_BACKGROUND);
         thread.start();
     }
 
@@ -501,7 +502,7 @@ public class EhClient {
                 mHandler.post(responder);
             }
         });
-        thread.setPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);
+        thread.setPriority(Process.THREAD_PRIORITY_BACKGROUND);
         thread.start();
     }
 
@@ -661,7 +662,7 @@ public class EhClient {
                 mHandler.post(responder);
             }
         });
-        thread.setPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);
+        thread.setPriority(Process.THREAD_PRIORITY_BACKGROUND);
         thread.start();
     }
 
@@ -758,7 +759,7 @@ public class EhClient {
                 mHandler.post(responder);
             }
         });
-        thread.setPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);
+        thread.setPriority(Process.THREAD_PRIORITY_BACKGROUND);
         thread.start();
     }
 
@@ -826,7 +827,7 @@ public class EhClient {
                 mHandler.post(responder);
             }
         });
-        thread.setPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);
+        thread.setPriority(Process.THREAD_PRIORITY_BACKGROUND);
         thread.start();
     }
 
@@ -903,7 +904,7 @@ public class EhClient {
                 mHandler.post(responder);
             }
         });
-        thread.setPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);
+        thread.setPriority(Process.THREAD_PRIORITY_BACKGROUND);
         thread.start();
     }
 
@@ -953,7 +954,7 @@ public class EhClient {
                         strs[1] = "last";
                     else
                         strs[1] = m.group(2);
-                    strs[2] = Utils.htmlUnsescape(m.group(3));
+                    strs[2] = Utils.unescapeXml(m.group(3));
                 } else
                     eMsg = mAppContext.getString(R.string.em_parser_error);
             } else
@@ -1307,7 +1308,7 @@ public class EhClient {
             if (m.find()) {
                 prePage = m.group(1);
                 nextPage = m.group(2);
-                imageUrlStr = Utils.htmlUnsescape(m.group(3));
+                imageUrlStr = Utils.unescapeXml(m.group(3));
                 return true;
             }
             return false;
@@ -1700,7 +1701,7 @@ public class EhClient {
                                     gi.count = -1;
                                 gi.gid = j.getInt("gid");
                                 gi.token = j.getString("token");
-                                gi.title = Utils.htmlUnsescape(j.getString("title"));
+                                gi.title = Utils.unescapeXml(j.getString("title"));
                                 gi.posted = AppContext.sFormatter.format(Long.parseLong(j.getString("posted")) * 1000);
                                 gi.thumb = j.getString("thumb");
                                 gi.category = getType(j.getString("category"));
diff --git a/src/com/hippo/ehviewer/ehclient/EhInfo.java b/src/com/hippo/ehviewer/ehclient/EhInfo.java
index a42c1e378..422f1573c 100644
--- a/src/com/hippo/ehviewer/ehclient/EhInfo.java
+++ b/src/com/hippo/ehviewer/ehclient/EhInfo.java
@@ -89,7 +89,7 @@ public class EhInfo {
         } catch (FileNotFoundException e) {
             return null;
         } finally {
-            Utils.closeStreamQuietly(is);
+            Utils.closeQuietly(is);
         }
     }
 
@@ -113,11 +113,12 @@ public class EhInfo {
     };
 
     private String getUconfigString(String previewMode) {
-        return "cats_" + mDefaultCat
-                + "-ts_" + (previewMode == null ? mPreviewMode : previewMode)
-                + "-xns_" + mExculdeTagGroup
-                + "-xl_" + mExculdeLanguage
-                + "-tl_m-uh_y-tr_2-prn_n-dm_l-ar_0-rc_0-rx_0-ry_0-sa_y-oi_n-qb_n-tf_n-hp_-hk_-ms_n-mt_n";
+        return new StringBuilder().append("cats_").append(mDefaultCat)
+                .append("-ts_").append(previewMode == null ? mPreviewMode : previewMode)
+                .append("-xns_").append(mExculdeTagGroup)
+                .append("-xl_").append(mExculdeLanguage)
+                .append("-tl_m-uh_y-tr_2-prn_n-dm_l-ar_0-rc_0-rx_0-ry_0-sa_y-oi_n-qb_n-tf_n-hp_-hk_-ms_n-mt_n")
+                .toString();
     }
 
     private void updateUconfig() {
@@ -230,7 +231,7 @@ public class EhInfo {
         } catch (FileNotFoundException e) {
             e.printStackTrace();
         } finally {
-            Utils.closeStreamQuietly(os);
+            Utils.closeQuietly(os);
         }
     }
 
diff --git a/src/com/hippo/ehviewer/ehclient/ExDownloadManager.java b/src/com/hippo/ehviewer/ehclient/ExDownloadManager.java
new file mode 100644
index 000000000..aced35d8b
--- /dev/null
+++ b/src/com/hippo/ehviewer/ehclient/ExDownloadManager.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2014 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.ehclient;
+
+import java.io.File;
+
+import android.content.Context;
+import android.util.SparseArray;
+
+import com.hippo.ehviewer.AppContext;
+
+public class ExDownloadManager {
+
+    private static final String TAG = ExDownloadManager.class.getSimpleName();
+
+    private final Context mContext;
+    private final SparseArray<ExDownloader> mExDownloadList;
+    private final File mExDownloadInfoDir;
+
+    private static ExDownloadManager sInstance;
+
+    public static void createInstance() {
+        sInstance = new ExDownloadManager();
+    }
+
+    public static ExDownloadManager getInstance() {
+        return sInstance;
+    }
+
+    private ExDownloadManager() {
+        mContext = AppContext.getInstance();
+        mExDownloadList = new SparseArray<ExDownloader>();
+        // Init download info dir
+        String cachePath = mContext.getExternalCacheDir() != null
+                ? mContext.getExternalCacheDir().getPath()
+                : mContext.getCacheDir().getPath();
+        mExDownloadInfoDir = new File(cachePath, TAG);
+        if (!mExDownloadInfoDir.exists()) {
+            mExDownloadInfoDir.mkdirs();
+        }
+    }
+
+    File getExDownloadInfoDir() {
+        return mExDownloadInfoDir;
+    }
+
+    public synchronized ExDownloader getExDownloader(int gid, String token, String title, int mode) {
+        ExDownloader exDownloader = mExDownloadList.get(gid);
+        if (exDownloader == null) {
+            exDownloader = new ExDownloader(gid, token, title, mode);
+            mExDownloadList.append(gid, exDownloader);
+        }
+        exDownloader.occupy();
+        return exDownloader;
+    }
+
+    public synchronized void freeExDownloader(ExDownloader exDownloader) {
+        exDownloader.free();
+        if (exDownloader.isOrphans())
+            mExDownloadList.remove(exDownloader.getGid());
+    }
+}
diff --git a/src/com/hippo/ehviewer/ehclient/ExDownloader.java b/src/com/hippo/ehviewer/ehclient/ExDownloader.java
new file mode 100644
index 000000000..5e5d987d6
--- /dev/null
+++ b/src/com/hippo/ehviewer/ehclient/ExDownloader.java
@@ -0,0 +1,548 @@
+/*
+ * Copyright (C) 2014 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.ehclient;
+
+import java.io.BufferedInputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import android.content.Context;
+import android.os.Process;
+
+import com.hippo.ehviewer.AppContext;
+import com.hippo.ehviewer.network.HttpHelper;
+import com.hippo.ehviewer.util.AutoExpandArray;
+import com.hippo.ehviewer.util.Config;
+import com.hippo.ehviewer.util.Log;
+import com.hippo.ehviewer.util.Utils;
+
+public class ExDownloader implements Runnable {
+
+    private static final String TAG = ExDownloader.class.getSimpleName();
+
+    private static final int WORKER_NUM = 3;
+
+    private final Context mContext;
+    private final ExDownloadManager mManager;
+
+    private final int mGid;
+    private final String mToken;
+    private final String mTitle;
+    private final int mMode;
+    private int mPreviewPageNum = -1;
+    private int mPreviewPerPage = -1;
+    private int mImageNum = -1;
+    private final AutoExpandArray<String> mPageTokeArray = new AutoExpandArray<String>();
+
+    private volatile int mOwnerNum = 0;
+    private Thread mMainThread = null;
+    /** Only work for EhClient.MODE_LOFI **/
+    private int mCurMaxPreviewPage = -1;
+
+    private volatile int mStartIndex = 0;
+    private final Queue<Integer> mRequestIndexArray = new ConcurrentLinkedQueue<Integer>();
+    private final Queue<Integer> mNoTokenIndexArray = new ConcurrentLinkedQueue<Integer>();
+    private final Queue<Integer> mRequestPageIndexArray = new ConcurrentLinkedQueue<Integer>();
+    private volatile int mCurRequestPageIndex = -1;
+
+    private final Worker[] mWorkerArray = new Worker[WORKER_NUM];
+
+    private final Object mPageTokenLock = new Object();
+    private final Object mWorkerLock = new Object();
+    private final Object mWorkerGetIndexLock = new Object();
+
+    private final File mDir;
+
+    private static final int IO_BUFFER_SIZE = 8 * 1024;
+
+    ExDownloader(int gid, String token, String title, int mode) {
+        mContext = AppContext.getInstance();
+        mManager = ExDownloadManager.getInstance();
+        mGid = gid;
+        mToken = token;
+        mTitle = title;
+        mMode = mode;
+
+        // Make sure dir
+        mDir = new File(Config.getDownloadPath(),
+                Utils.standardizeFilename(mGid + "-" + mTitle));
+        if (!mDir.exists()) {
+            mDir.mkdirs();
+        } else if (mDir.isFile()) {
+            mDir.delete();
+            mDir.mkdirs();
+        }
+    }
+
+    void occupy() {
+        mOwnerNum++;
+    }
+
+    void free() {
+        mOwnerNum--;
+    }
+
+    boolean isOrphans() {
+        return mOwnerNum == 0;
+    }
+
+    public int getGid() {
+        return mGid;
+    }
+
+    public String getToken() {
+        return mToken;
+    }
+
+    public void setStartIndex(int startIndex) {
+        if (mImageNum != -1 && mStartIndex >= mImageNum)
+            mStartIndex = 0;
+        else
+            mStartIndex = startIndex;
+
+        ensureStart();
+        ensureWorkers();
+    }
+
+    public void setTargetIndex(int startIndex) {
+        if (mImageNum != -1 && mStartIndex >= mImageNum) {
+            mRequestIndexArray.offer(startIndex);
+            ensureStart();
+            ensureWorkers();
+        }
+    }
+
+    private synchronized void ensureStart() {
+        if (mMainThread != null)
+            return;
+
+        mMainThread = new Thread(this);
+        mMainThread.setPriority(Process.THREAD_PRIORITY_BACKGROUND);
+        mMainThread.start();
+    }
+
+    private File getExDownloadInfoFile() {
+        return new File(mManager.getExDownloadInfoDir(), String.valueOf(mGid));
+    }
+
+    private boolean checkMode(int samlpe, int target) {
+        return samlpe <= EhClient.MODE_EX && target <= EhClient.MODE_EX
+                || samlpe == EhClient.MODE_LOFI && target == EhClient.MODE_LOFI;
+    }
+
+    /**
+     * This function parser the download info file.<br>
+     * The file look like this:<br>
+     * <code>
+     * 728874<br>
+     * 306429c222<br>
+     * 1<br>
+     * 4<br>
+     * 40<br>
+     * 128<br>
+     * 1 43a64e6e79<br>
+     * </code><br>
+     * Fist line is gid, a integer.
+     * Second line is token, a ten-character string.
+     * Third line is mode.
+     * Fourth line is preview page num.
+     * Fifth line is preview per page.
+     *
+     * @param ediFile
+     * @return
+     */
+    private boolean parserEdiFile(File ediFile) {
+        if (!ediFile.exists() || !ediFile.isFile() || !ediFile.canRead()
+                || !ediFile.canWrite())
+            return false;
+
+        InputStream is = null;
+        try {
+            is = new BufferedInputStream(new FileInputStream(ediFile),
+                    IO_BUFFER_SIZE);
+            if (mGid != Integer.valueOf(Utils.readAsciiLine(is)) ||
+                    !mToken.equals(Utils.readAsciiLine(is)))
+                return false;
+
+            if (!checkMode(Integer.valueOf(Utils.readAsciiLine(is)), mMode)) {
+                // If preview info is not same
+                // skip preview page num and preview per page
+                Utils.readAsciiLine(is);
+                Utils.readAsciiLine(is);
+            } else {
+                mPreviewPageNum = Integer.valueOf(Utils.readAsciiLine(is));
+                mPreviewPerPage = Integer.valueOf(Utils.readAsciiLine(is));
+            }
+
+            mImageNum = Integer.parseInt(Utils.readAsciiLine(is));
+            if (mImageNum != -1)
+                mPageTokeArray.setCapacity(mImageNum);
+            else if (mPreviewPageNum != -1 && mPreviewPerPage != -1)
+                mPageTokeArray.setCapacity(mPreviewPageNum * mPreviewPerPage);
+
+            // read page token info
+            try {
+                while(true) {
+                    String line = Utils.readAsciiLine(is);
+                    int pos = line.indexOf(" ");
+                    if (pos == -1 && line.length() - pos != 11)
+                        continue;
+                    try {
+                        int index = Integer.parseInt(line.substring(0, pos));
+                        String token = line.substring(pos + 1);
+                        mPageTokeArray.set(index, token);
+                    } catch (NumberFormatException e) {
+                        continue;
+                    }
+                }
+            } catch (EOFException e) {
+                // Empty
+            }
+            return true;
+        } catch (Throwable e) {
+            // If read error
+            return false;
+        } finally {
+            Utils.closeQuietly(is);
+        }
+    }
+
+    private void writeEdiFile(File ediFile) {
+        try {
+            FileWriter writer = new FileWriter(ediFile);
+            writer.write(String.valueOf(mGid));
+            writer.write("\n");
+            writer.write(mToken);
+            writer.write("\n");
+            writer.write(mMode + '0');
+            writer.write("\n");
+            writer.write(String.valueOf(mPreviewPageNum));
+            writer.write("\n");
+            writer.write(String.valueOf(mPreviewPerPage));
+            writer.write("\n");
+            writer.write(String.valueOf(mImageNum));
+            writer.write("\n");
+            for (int i = 0; i < mPageTokeArray.length(); i++) {
+                String pageToken = mPageTokeArray.get(i);
+                if (pageToken != null) {
+                    writer.write(String.valueOf(i));
+                    writer.write(" ");
+                    writer.write(pageToken);
+                    writer.write("\n");
+                }
+            }
+            writer.flush();
+            writer.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private String getDetailInfo(int pageIndex, File ediFile, boolean needPreviewInfo) {
+        HttpHelper hh = new HttpHelper(mContext);
+        EdDetailParser edp = new EdDetailParser();
+        String url = EhClient.getDetailUrl(mGid, mToken, pageIndex, mMode);
+        hh.setPreviewMode("m");
+        String body = hh.get(url);
+        if (body == null)
+            return hh.getEMsg() != null ? hh.getEMsg() : "Http error";
+        if (!edp.parser(body, mMode, needPreviewInfo))
+            return edp.emsg != null ? edp.emsg : "Parser error"; // TODO
+        if (edp.previewStartIndex != pageIndex * mPreviewPerPage)
+            return "预测与实际不匹配"; // TODO
+
+        List<String> pageTokenArray = edp.pageTokenArray;
+        if (needPreviewInfo)
+            mPreviewPerPage = pageTokenArray.size();
+        if (mMode == EhClient.MODE_LOFI) {
+            // update mCurMaxPreviewPage
+            if (edp.isLastPage) {
+                mPreviewPageNum = pageIndex + 1;
+                mImageNum = pageIndex * mPreviewPerPage + pageTokenArray.size();
+            } else if (!edp.isLastPage && mPreviewPageNum == -1) {
+                mCurMaxPreviewPage = Math.max(mCurMaxPreviewPage, pageIndex + 1);
+            }
+        } else {
+            if (needPreviewInfo) {
+                mPreviewPageNum = edp.previewPageNum;
+                mImageNum = edp.imageNum;
+                mPageTokeArray.setCapacity(mPreviewPageNum * mPreviewPerPage);
+            }
+        }
+        for (int i = 0; i < pageTokenArray.size(); i++)
+            mPageTokeArray.set(i + edp.previewStartIndex, pageTokenArray.get(i));
+
+        if (!needPreviewInfo)
+            ; // TODO add loader page
+
+        writeEdiFile(ediFile);
+        return null;
+    }
+
+    private void ensureWorkers() {
+        synchronized(mWorkerArray) {
+            for (int i = 0; i < mWorkerArray.length; i++) {
+                if (mWorkerArray[i] == null) {
+                    Worker worker = new Worker();
+                    worker.start();
+                    mWorkerArray[i] = worker;
+                }
+            }
+        }
+    }
+
+    public int getMaxEnsureIndex() {
+        if (mImageNum != -1) {
+            return mImageNum;
+        } else {
+            return Math.max(Math.max(mStartIndex - 1,
+                    Math.max(mCurMaxPreviewPage, mPreviewPageNum - 1) * mPreviewPerPage),
+                    mPageTokeArray.maxValidIndex());
+        }
+    }
+
+    // TODO for download , when to claim download completed
+    @Override
+    public void run() {
+        // Try to get info from file
+        try {
+            File ediFile = getExDownloadInfoFile();
+            if (!parserEdiFile(ediFile) || mPreviewPerPage == -1 ||
+                    (mMode == EhClient.MODE_EX && mImageNum == -1)) {
+                getDetailInfo(0, ediFile, true);
+            }
+
+            ensureWorkers();
+
+            // A loop to get page token
+            while (true) {
+                Log.d(TAG, "A new loop to get page token");
+
+                int noTokenIndex = -1;
+                int pageIndex = -1;
+                synchronized(mPageTokenLock) {
+                    if (mNoTokenIndexArray.isEmpty()) {
+                        if (mRequestPageIndexArray.isEmpty()) {
+                            try {
+                                mPageTokenLock.wait();
+                            } catch (InterruptedException e) {}
+                            continue;
+                        } else {
+                            pageIndex = mRequestPageIndexArray.poll();
+                            mCurRequestPageIndex = pageIndex;
+                        }
+                    } else {
+                        noTokenIndex = mNoTokenIndexArray.poll();
+                    }
+                }
+
+                if (noTokenIndex != -1) {
+                    if (mPageTokeArray.get(noTokenIndex) == null) {
+                        getDetailInfo(noTokenIndex / mPreviewPerPage, ediFile, false);
+                    } else {
+                        // The token is already got, no need to re
+                    }
+                } else if (noTokenIndex == -1){
+                    getDetailInfo(pageIndex, ediFile, false);
+                    mCurRequestPageIndex = -1;
+                }
+
+                synchronized(mWorkerGetIndexLock) {mWorkerGetIndexLock.notifyAll();}
+                synchronized(mWorkerLock) {mWorkerLock.notifyAll();}
+            }
+        } catch (Throwable e) {
+            // TODO handle error here
+
+        } finally {
+            synchronized (this) {
+                mMainThread = null;
+            }
+        }
+    }
+
+    private class Worker extends Thread {
+
+        public Worker() {
+            super();
+            setPriority(Process.THREAD_PRIORITY_BACKGROUND);
+        }
+
+        private void addNoTokenIndex(int index) {
+            synchronized(mPageTokenLock) {
+                mNoTokenIndexArray.offer(index);
+                mPageTokenLock.notify();
+            }
+        }
+
+        private void addRequstPageIndex(int pageIndex) {
+            synchronized(mPageTokenLock) {
+                if (mCurRequestPageIndex != pageIndex &&
+                        !mRequestPageIndexArray.contains(pageIndex)) {
+                    mRequestPageIndexArray.offer(pageIndex);
+                    mPageTokenLock.notify();
+                }
+            }
+        }
+
+        private int getTargetIndex() {
+            synchronized(mWorkerGetIndexLock) {
+                while (true) {
+                    if (!mRequestIndexArray.isEmpty()) {
+                        return mRequestIndexArray.poll();
+                    } else if (mImageNum != -1 && mStartIndex == mImageNum) {
+                        return -1;
+                    } else if (mImageNum == -1 && mStartIndex > getMaxEnsureIndex()) {
+                        // If do not sure the index is valid
+                        addRequstPageIndex(getMaxEnsureIndex() / mPreviewPerPage);
+                        try {
+                            mWorkerGetIndexLock.wait();
+                        } catch (InterruptedException e) {}
+                    } else {
+                        return mStartIndex++;
+                    }
+                }
+            }
+        }
+
+        private String getExtension(String name, String defautl) {
+            int index = name.lastIndexOf('.');
+            if (index == -1 || index == name.length() - 1)
+                return defautl;
+            else
+                return name.substring(index + 1);
+        }
+
+        private String getImageName(int index, String url) {
+            return String.format("%08d.%s", index + 1, getExtension(url, "jpg"));
+        }
+
+        private String[] getPossibleFilenames(int index) {
+            String prefix = String.format("%08d.", index + 1);
+            return new String[]{prefix + "jpg", prefix + "jpeg", prefix + "png", prefix + "gif"};
+        }
+
+        @Override
+        public void run() {
+            HttpHelper hh = new HttpHelper(mContext);
+            ImagePageParser ipp = new ImagePageParser();
+
+            while (true) {
+                int targetIndex = getTargetIndex();
+                if (targetIndex == -1)
+                    break;
+
+                // Check is this already downloaded
+                boolean isAlreadyDownloaded = false;
+                for (String possibleFilename : getPossibleFilenames(targetIndex)) {
+                    File file = new File(mDir, possibleFilename);
+                    if (file.exists()) {
+                        isAlreadyDownloaded = true;
+                        break;
+                    }
+                }
+                if (isAlreadyDownloaded)
+                    continue;
+
+                String pageToken;
+                while (true) {
+                    pageToken = mPageTokeArray.get(targetIndex);
+                    if (pageToken == null) {
+                        addNoTokenIndex(targetIndex);
+                        synchronized(mWorkerLock) {
+                            try {mWorkerLock.wait();}
+                            catch (InterruptedException e) {}
+                        }
+                    } else {
+                        // Jump out of loop
+                        break;
+                    }
+                }
+
+                for (int i = 0; i < 2; i++) {
+                    // i == 1, add "?nl=48"
+                    hh.reset();
+                    ipp.reset();
+                    String body = hh.get(EhClient.getPageUrl(mGid, pageToken, targetIndex + 1, mMode)
+                            + (i == 1 ? "?nl=48" : ""));
+                    if (ipp.parser(body)) {
+                        String imageUrl = ipp.imageUrl;
+                        String filename = getImageName(targetIndex, imageUrl);
+                        for (int j = 0; j < 2; j++) {
+                            // j == 0, use proxy
+
+                        }
+                    } else {
+                        // TODO parser error, Do somthing
+                        break;
+                    }
+                }
+
+
+
+                // Parser image page
+                for (int i = 0; i < 2; i++) {
+                    hh.reset();
+                    ipp.reset();
+                    String body = hh.get(EhClient.getPageUrl(mGid, pageToken, targetIndex + 1, mMode)
+                            + (i == 1 ? "?nl=48" : ""));
+                    if (ipp.parser(body)) {
+                        // Download image
+                        String imageUrl = ipp.imageUrl;
+                        String filename = getImageName(targetIndex, imageUrl);
+                        hh.reset();
+                        if (hh.download(imageUrl, mDir, filename, false, null, null) == null) {
+                            hh.reset();
+                            if (hh.download(imageUrl, mDir, filename, true, null, null) == null) {
+                                if (i == 1) {
+                                    // TODO download error
+                                }
+                            } else {
+                                // download ok
+                                break;
+                            }
+                        } else {
+                            // download ok
+                            break;
+                        }
+                    } else {
+                        // TODO parser error, Do somthing
+                        break;
+                    }
+                }
+            }
+
+            // Worker over
+            synchronized(mWorkerArray) {
+                // Remove from mWorkerArray
+                for (int i = 0; i < mWorkerArray.length; i++) {
+                    if (mWorkerArray[i] == this) {
+                        mWorkerArray[i] = null;
+                        break;
+                    }
+                }
+            }
+            Log.d(TAG, "Worker over");
+        }
+    }
+}
diff --git a/src/com/hippo/ehviewer/ehclient/ImagePageParser.java b/src/com/hippo/ehviewer/ehclient/ImagePageParser.java
index ed56b5967..3e499804d 100644
--- a/src/com/hippo/ehviewer/ehclient/ImagePageParser.java
+++ b/src/com/hippo/ehviewer/ehclient/ImagePageParser.java
@@ -19,16 +19,16 @@ package com.hippo.ehviewer.ehclient;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.hippo.ehviewer.util.Utils;
+
 public class ImagePageParser {
 
     public String imageUrl;
-    public String fullImageUrl;
     public int gid;
     public String token;
 
     public void reset() {
         imageUrl = null;
-        fullImageUrl = null;
         gid = 0;
         token = null;
     }
@@ -36,14 +36,13 @@ public class ImagePageParser {
     public boolean parser(String body) {
         Pattern p = Pattern.compile("<div id=\"i3\">.+?<img id=\"img\" src=\"(.+?)\""
                 + ".+?"
-                + "<div id=\"i5\"><div class=\"sb\"><a href=\"(?:http|https)://.+?/g/(\\d+)/(\\w+)"
-                + "(?:.+?<div id=\"i7\" class=\"if\">.+?<a href=\"(.+?)\">)?");
+                + "<div id=\"i5\"><div class=\"sb\"><a href=\"(?:http|https)://.+?/g/(\\d+)/(\\w+)");
         Matcher m = p.matcher(body);
-        if (m.matches()) {
-            imageUrl = m.group(1);
+
+        if (m.find()) {
+            imageUrl = Utils.unescapeXml(m.group(1));
             gid = Integer.parseInt(m.group(2));
             token = m.group(3);
-            fullImageUrl = m.group(4);
             return true;
         } else {
             return false;
diff --git a/src/com/hippo/ehviewer/ehclient/ListParser.java b/src/com/hippo/ehviewer/ehclient/ListParser.java
index 1e415e14b..13f6f04c4 100644
--- a/src/com/hippo/ehviewer/ehclient/ListParser.java
+++ b/src/com/hippo/ehviewer/ehclient/ListParser.java
@@ -73,8 +73,8 @@ public class ListParser {
                 } else {
                     continue;
                 }
-                lgi.thumb = Utils.htmlUnsescape(m.group(2));
-                lgi.title = Utils.htmlUnsescape(m.group(3));
+                lgi.thumb = Utils.unescapeXml(m.group(2));
+                lgi.title = Utils.unescapeXml(m.group(3));
                 if (getPostedAndUploader(m.group(4), pau)) {
                     lgi.posted = pau[0];
                     lgi.uploader = pau[1];
@@ -147,12 +147,12 @@ public class ListParser {
                 gi.category = EhClient.getType(m.group(1));
                 gi.posted = m.group(2);
                 if (m.group(3) == null) {
-                    gi.thumb = Utils.htmlUnsescape("http://"
+                    gi.thumb = Utils.unescapeXml("http://"
                             + m.group(5).replace('~', '/'));
-                    gi.title = Utils.htmlUnsescape(m.group(6));
+                    gi.title = Utils.unescapeXml(m.group(6));
                 } else {
-                    gi.thumb = Utils.htmlUnsescape(m.group(3));
-                    gi.title = Utils.htmlUnsescape(m.group(4));
+                    gi.thumb = Utils.unescapeXml(m.group(3));
+                    gi.title = Utils.unescapeXml(m.group(4));
                 }
 
                 Pattern pattern = Pattern
diff --git a/src/com/hippo/ehviewer/gallery/data/ImageSet.java b/src/com/hippo/ehviewer/gallery/data/ImageSet.java
index bc2984aa7..c4c95246a 100644
--- a/src/com/hippo/ehviewer/gallery/data/ImageSet.java
+++ b/src/com/hippo/ehviewer/gallery/data/ImageSet.java
@@ -19,9 +19,15 @@ package com.hippo.ehviewer.gallery.data;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.util.Set;
 
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Movie;
+import android.util.SparseArray;
+
 import com.hippo.ehviewer.util.Future;
 import com.hippo.ehviewer.util.FutureListener;
 import com.hippo.ehviewer.util.ThreadPool;
@@ -29,19 +35,11 @@ import com.hippo.ehviewer.util.ThreadPool.Job;
 import com.hippo.ehviewer.util.ThreadPool.JobContext;
 import com.hippo.ehviewer.util.Utils;
 
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Movie;
-import com.hippo.ehviewer.util.Log;
-import android.util.SparseArray;
-
 // TODO 初期建立一个线程检索文件夹中所有文件以寻找到所有图片文件
 
 /**
  * @author Hippo
- * 
+ *
  * ImageSet 用于记录漫画的下载信息
  * 对于已完成下载的则无特殊之处。
  * 对于未完成下载的要记录，开始下载之处，目前下载截止之处，
@@ -49,67 +47,67 @@ import android.util.SparseArray;
  * 同时拥有检查该目录识别图片文件。
  */
 public class ImageSet {
-    
+
     @SuppressWarnings("unused")
     private static final String TAG = "ImageSet";
-    
+
     private static final String GIF_EXTENSION = "gif";
-    
+
     public static final int TYPE_NONE = 0x0;
     public static final int TYPE_BITMAP = 0x1;
     public static final int TYPE_MOVIE = 0x2;
-    
+
     public static final int INVALID_ID = -1;
-    
+
     public static final int STATE_NONE = 0;
     public static final int STATE_LOADING = 1;
     public static final int STATE_LOADED = 2;
     public static final int STATE_FAIL = 3;
-    
+
     protected Context mContext;
     protected int mGid;
     protected File mFolder;
     protected int mSize;
-    
-    private SparseArray<ImageData> mImagesDate;
-    
-    private ThreadPool mThreadPool;
+
+    private final SparseArray<ImageData> mImagesDate;
+
+    private final ThreadPool mThreadPool;
     private OnStateChangeListener mOnStateChangeListener;
-    
+
     public interface OnStateChangeListener {
         void onStateChange(int index, int state);
     }
-    
+
     public interface OnDecodeOverListener {
         /**
          * May return Bitmap or Movie
-         * 
+         *
          * @param res
          * @param index
          */
         void onDecodeOver(Object res, int index);
     }
-    
+
     private class ImageData {
         int state;
         String fileName;
         int type;
-        
+
         public ImageData() {
             state = STATE_NONE;
             fileName = null;
             type = TYPE_NONE;
         }
     }
-    
+
     // [startIndex, endIndex)
     public ImageSet(Context context, int gid, File folder, int size, int startIndex, int endIndex,
             Set<Integer> failIndexSet) {
-        
+
         if (folder == null || !folder.isDirectory())
             size = 0;
-        
-        
+
+
         // TODO
         /*
         if (folder == null)
@@ -117,7 +115,7 @@ public class ImageSet {
         if (!folder.isDirectory())
             throw new IllegalArgumentException("Folder is not directory, path is " + folder.getPath());
         */
-        
+
         if (size < 0)
             size = 0;
         if (endIndex > size)
@@ -126,7 +124,7 @@ public class ImageSet {
             startIndex = 0;
         if (startIndex > endIndex)
             startIndex = endIndex;
-        
+
         // TODO
         /*
         if (size < 0 || startIndex < 0
@@ -135,12 +133,12 @@ public class ImageSet {
                 + size + ", startIndex = " + startIndex
                 + ", endIndex = " + endIndex + ", path is " + folder.getPath());
         */
-        
+
         mContext = context;
         mGid = gid;
         mFolder = folder;
         mSize = size;
-        
+
         // TODO sometimes size is too large
         mImagesDate = new SparseArray<ImageData>(mSize);
         int i = 0;
@@ -163,18 +161,18 @@ public class ImageSet {
         for (; i < size; i++) {
             mImagesDate.append(i, new ImageData());
         }
-        
+
         mThreadPool = new ThreadPool(1, 1);
     }
 
     public int getSize() {
         return mSize;
     }
-    
+
     public void setOnStateChangeListener(OnStateChangeListener l) {
         mOnStateChangeListener = l;
     }
-    
+
     public int getImage(final int index, final OnDecodeOverListener listener) {
         final ImageData imageData = mImagesDate.get(index);
         int state;
@@ -190,7 +188,7 @@ public class ImageSet {
                     if (imageData.fileName == null
                             && !getFileForName(getFileNameForIndex(index), imageData))
                         return null;
-                    
+
                     File file = new File(mFolder, imageData.fileName);
                     FileInputStream fis = null;
                     try {
@@ -209,7 +207,7 @@ public class ImageSet {
                         e.printStackTrace();
                     } finally {
                         if (fis != null)
-                            Utils.closeStreamQuietly(fis);
+                            Utils.closeQuietly(fis);
                     }
                     return res;
                 }
@@ -222,12 +220,12 @@ public class ImageSet {
         }
         return state;
     }
-    
+
     @SuppressLint("DefaultLocale")
     public String getFileNameForIndex(int index) {
         return String.format("%05d", index + 1);
     }
-    
+
     public boolean getFileForName(String name, ImageData imageData) {
         String[] list = mFolder.list();
         for (String item : list) {
@@ -242,7 +240,7 @@ public class ImageSet {
         }
         return false;
     }
-    
+
     public void changeState(int index, int state) {
         final ImageData imageData = mImagesDate.get(index);
         if(imageData != null) {
@@ -252,11 +250,11 @@ public class ImageSet {
             }
         }
     }
-    
-    
+
+
     /**
      * mSize is faithful
-     * 
+     *
      */
     public void scan() {
         String[] fileList = mFolder.list();
diff --git a/src/com/hippo/ehviewer/network/Downloader.java b/src/com/hippo/ehviewer/network/Downloader.java
index 1aed610eb..185d79f96 100644
--- a/src/com/hippo/ehviewer/network/Downloader.java
+++ b/src/com/hippo/ehviewer/network/Downloader.java
@@ -343,7 +343,7 @@ public class Downloader implements Runnable {
             transferData(in, raf);
         } finally {
             if (in != null)
-                Utils.closeStreamQuietly(in);
+                Utils.closeQuietly(in);
             if (raf != null)
                 try {
                     raf.close();
diff --git a/src/com/hippo/ehviewer/network/HttpHelper.java b/src/com/hippo/ehviewer/network/HttpHelper.java
index 08ffd4ea9..c25a0ad6a 100644
--- a/src/com/hippo/ehviewer/network/HttpHelper.java
+++ b/src/com/hippo/ehviewer/network/HttpHelper.java
@@ -35,7 +35,6 @@ import java.net.UnknownHostException;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 import java.util.zip.GZIPInputStream;
 
 import org.apache.http.conn.ConnectTimeoutException;
@@ -54,6 +53,7 @@ import com.hippo.ehviewer.exception.StopRequestException;
 import com.hippo.ehviewer.util.Constants;
 import com.hippo.ehviewer.util.FastByteArrayOutputStream;
 import com.hippo.ehviewer.util.Log;
+import com.hippo.ehviewer.util.MathUtils;
 import com.hippo.ehviewer.util.Ui;
 import com.hippo.ehviewer.util.Utils;
 
@@ -66,7 +66,7 @@ import com.hippo.ehviewer.util.Utils;
 public class HttpHelper {
     private static final String TAG = HttpHelper.class.getSimpleName();
 
-    private static final int HTTP_RETRY_TIMES = 3;
+    private static final int HTTP_RETRY_TIMES = 5;
 
     public static final String SAD_PANDA_ERROR = "Sad Panda";
     public static final String HAPPY_PANDA_BODY = "Happy Panda";
@@ -79,16 +79,18 @@ public class HttpHelper {
 
     private static final String DEFAULT_CHARSET = "utf-8";
     private static final String CHARSET_KEY = "charset=";
-    private static int sProxyIndex;
-    private static Object sProxyIndexLock;
 
-    static {
-        // from 1 to 8
-        Random rdm = new Random(System.currentTimeMillis());
-        sProxyIndex = rdm.nextInt(7) + 1;
-
-        sProxyIndexLock = new Object();
-    }
+    private static final String[] PROXY_URLS = {
+        "http://proxyy0000.appsp0t.com/proxy",
+        "http://proxyy0001.appsp0t.com/proxy",
+        "http://proxyy0002.appsp0t.com/proxy",
+        "http://proxyy0003.appsp0t.com/proxy",
+        "http://proxyy0004.appsp0t.com/proxy",
+        "http://proxyy0005.appsp0t.com/proxy",
+        "http://proxyy0006.appsp0t.com/proxy"
+    };
+    private static int sProxyIndex = MathUtils.random(0, PROXY_URLS.length);
+    private static Object sProxyIndexLock = new Object();
 
     public class Package {
         public Object obj;
@@ -110,9 +112,18 @@ public class HttpHelper {
         void onFailure(String eMsg);
     }
 
+    public String getProxyUrl() {
+        synchronized(sProxyIndexLock) {
+            if (sProxyIndex < 0 || sProxyIndex >= PROXY_URLS.length)
+                sProxyIndex = 0;
+            return PROXY_URLS[sProxyIndex++];
+        }
+    }
+
     public void reset() {
         mListener = null;
         mException = null;
+        mLastUrl = null;
         mPreviewMode = null;
     }
 
@@ -387,8 +398,8 @@ public class HttpHelper {
             } catch (Exception e) {
                 throw e;
             } finally {
-                Utils.closeStreamQuietly(is);
-                Utils.closeStreamQuietly(baos);
+                Utils.closeQuietly(is);
+                Utils.closeQuietly(baos);
             }
             return body;
         }
@@ -696,16 +707,6 @@ public class HttpHelper {
             mListener = listener;
         }
 
-        public String getProxyUrl() {
-            String proxyUrl = null;
-            synchronized(sProxyIndexLock) {
-                proxyUrl = "http://proxy000" + sProxyIndex + ".herokuapp.com/proxy";
-                if (++sProxyIndex > 8)
-                    sProxyIndex = 1;
-            }
-            return proxyUrl;
-        }
-
         @Override
         public URL getUrl() throws MalformedURLException {
             return new URL(mIsProxy? getProxyUrl() : mUrl);
@@ -727,7 +728,8 @@ public class HttpHelper {
                 conn.setRequestMethod("GET");
                 conn.setRequestProperty("Range", "bytes=0-");
             }
-            mListener.onDownloadStartConnect();
+            if (mListener != null)
+                mListener.onDownloadStartConnect();
         }
 
         private int getContentLength(HttpURLConnection conn) {
@@ -760,7 +762,8 @@ public class HttpHelper {
         @Override
         public Object onAfterConnect(HttpURLConnection conn) throws Exception {
             mContentLength = getContentLength(conn);
-            mListener.onDownloadStartDownload(mContentLength);
+            if (mListener != null)
+                mListener.onDownloadStartDownload(mContentLength);
 
             // Make sure parent exist
             mDir.mkdirs();
@@ -768,7 +771,8 @@ public class HttpHelper {
             // Transfer
             transferData(conn.getInputStream(), new FileOutputStream(mFile));
             // Callback
-            mListener.onDownloadOver(DOWNLOAD_OK_CODE, null);
+            if (mListener != null)
+                mListener.onDownloadOver(DOWNLOAD_OK_CODE, null);
             return DOWNLOAD_OK_STR;
         }
 
@@ -778,10 +782,12 @@ public class HttpHelper {
             if (mFile != null)
                 mFile.delete();
             // Callback
-            if (e instanceof StopRequestException)
-                mListener.onDownloadOver(DOWNLOAD_STOP_CODE, getEMsg());
-            else
-                mListener.onDownloadOver(DOWNLOAD_STOP_CODE, getEMsg());
+            if (mListener != null) {
+                if (e instanceof StopRequestException)
+                    mListener.onDownloadOver(DOWNLOAD_STOP_CODE, getEMsg());
+                else
+                    mListener.onDownloadOver(DOWNLOAD_STOP_CODE, getEMsg());
+            }
         }
 
         private void transferData(InputStream in, OutputStream out)
@@ -790,7 +796,7 @@ public class HttpHelper {
             mReceivedSize = 0;
 
             while (true) {
-                if (mControlor.isStop())
+                if (mControlor != null && mControlor.isStop())
                     throw new StopRequestException();
 
                 int bytesRead = in.read(data);
@@ -798,8 +804,8 @@ public class HttpHelper {
                     break;
                 out.write(data, 0, bytesRead);
                 mReceivedSize += bytesRead;
-
-                mListener.onDownloadStatusUpdate(mReceivedSize, mContentLength);
+                if (mListener != null)
+                    mListener.onDownloadStatusUpdate(mReceivedSize, mContentLength);
             }
 
             if (mContentLength != -1 && mReceivedSize != mContentLength)
diff --git a/src/com/hippo/ehviewer/service/DownloadService.java b/src/com/hippo/ehviewer/service/DownloadService.java
index 36685a2e1..538784337 100644
--- a/src/com/hippo/ehviewer/service/DownloadService.java
+++ b/src/com/hippo/ehviewer/service/DownloadService.java
@@ -18,7 +18,6 @@ package com.hippo.ehviewer.service;
 
 import android.app.Notification;
 import android.app.NotificationManager;
-import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
@@ -29,7 +28,6 @@ import com.hippo.ehviewer.AppContext;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.ehclient.EhClient;
 import com.hippo.ehviewer.ehclient.EhClient.DownloadMangaManager;
-import com.hippo.ehviewer.ui.DownloadActivity;
 import com.hippo.ehviewer.ui.DownloadInfo;
 import com.hippo.ehviewer.util.Download;
 import com.hippo.ehviewer.util.Log;
@@ -167,9 +165,10 @@ public class DownloadService extends Service {
 
         builder.setSmallIcon(R.drawable.ic_launcher);
 
-        Intent intent = new Intent(DownloadService.this,DownloadActivity.class);
-        PendingIntent pendingIntent = PendingIntent.getActivity(DownloadService.this, 1, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-        builder.setContentIntent(pendingIntent);
+        // TODO
+        //Intent intent = new Intent(DownloadService.this,DownloadActivity.class);
+        //PendingIntent pendingIntent = PendingIntent.getActivity(DownloadService.this, 1, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        //builder.setContentIntent(pendingIntent);
     }
 
     @Override
diff --git a/src/com/hippo/ehviewer/ui/DownloadActivity.java b/src/com/hippo/ehviewer/ui/DownloadActivity.java
deleted file mode 100644
index d1303c2d8..000000000
--- a/src/com/hippo/ehviewer/ui/DownloadActivity.java
+++ /dev/null
@@ -1,397 +0,0 @@
-/*
- * Copyright (C) 2014 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.ui;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import android.app.AlertDialog;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.AdapterView.OnItemLongClickListener;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.hippo.ehviewer.AppContext;
-import com.hippo.ehviewer.ImageLoader;
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.service.DownloadService;
-import com.hippo.ehviewer.service.DownloadServiceConnection;
-import com.hippo.ehviewer.util.Config;
-import com.hippo.ehviewer.util.Download;
-import com.hippo.ehviewer.util.Ui;
-import com.hippo.ehviewer.util.Utils;
-import com.hippo.ehviewer.widget.AlertButton;
-import com.hippo.ehviewer.widget.DialogBuilder;
-import com.hippo.ehviewer.widget.DownloadItemLayout;
-import com.hippo.ehviewer.widget.LoadImageView;
-
-public class DownloadActivity extends AbstractActivity {
-
-    private static final String TAG = "DownloadActivity";
-
-    private final DownloadServiceConnection mServiceConn = new DownloadServiceConnection();
-
-    private AppContext mAppContext;
-    private ImageLoader mImageLoader;
-
-    private List<DownloadInfo> mDownloadInfos;
-    private DlAdapter mDlAdapter;
-    private int longClickItemIndex;
-
-    private AlertDialog longClickDialog;
-
-    private AlertDialog setLongClickDialog() {
-        return new DialogBuilder(this).setTitle(R.string.what_to_do)
-                .setItems(R.array.download_item_long_click, new OnItemClickListener() {
-                    @Override
-                    public void onItemClick(AdapterView<?> arg0, View arg1,
-                            int position, long arg3) {
-                        switch (position) {
-                        case 0: // Remove info item
-                            mServiceConn.getService().cancel(Download.getKey(longClickItemIndex));
-                            Download.remove(longClickItemIndex);
-                            mDlAdapter.notifyDataSetChanged();
-                            break;
-                        case 1: // Remove info item
-                            mServiceConn.getService().cancel(Download.getKey(longClickItemIndex));
-                            mDlAdapter.notifyDataSetChanged();
-                            File dir = new File(Config.getDownloadPath(), Utils.standardizeFilename(Download.get(longClickItemIndex).title));
-                            try {
-                                Utils.deleteContents(dir);
-                            } catch (IOException e) {
-                                e.printStackTrace();
-                            }
-                            dir.delete();
-                            Download.remove(longClickItemIndex);
-                            break;
-                        case 2:
-                            DownloadInfo di= mDownloadInfos.get(longClickItemIndex);
-                            Intent intent = new Intent(DownloadActivity.this,
-                                    GalleryDownloadActivity.class);
-                            intent.putExtra(GalleryDownloadActivity.KEY_TITLE, di.title);
-                            intent.putExtra(GalleryDownloadActivity.KEY_SIZE, di.pageSum);
-                            intent.putExtra(GalleryDownloadActivity.KEY_GID, Integer.parseInt(di.gid));
-                            intent.putExtra(GalleryDownloadActivity.KEY_END_INDEX, di.lastStartIndex);
-                            startActivity(intent);
-                        default:
-                            break;
-                        }
-                        longClickDialog.cancel();
-                    }
-                }).setNegativeButton(android.R.string.cancel, new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        ((AlertButton)v).dialog.dismiss();
-                    }
-                }).create();
-    }
-
-    private class DlAdapter extends BaseAdapter {
-        private final LayoutInflater mInflater;
-
-        public DlAdapter() {
-            mInflater = LayoutInflater.from(DownloadActivity.this);
-        }
-
-        @Override
-        public int getCount() {
-            return mDownloadInfos.size();
-        }
-
-        @Override
-        public Object getItem(int arg0) {
-            return mDownloadInfos.get(arg0);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return 0;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            DownloadInfo di= mDownloadInfos.get(position);
-            if (convertView != null) {
-                DownloadItemLayout view = (DownloadItemLayout)convertView;
-                if (!view.gid.equals(di.gid)) {
-                    view.gid = di.gid;
-                    view.status = di.status;
-                    view.type = di.type;
-                    view.lastStartIndex = di.lastStartIndex;
-                    view.downloadSize = di.downloadSize;
-                    view.isWait = false;
-
-                    LoadImageView thumb = (LoadImageView)view
-                            .findViewById(R.id.thumb);
-                    thumb.setImageDrawable(null);
-                    thumb.setLoadInfo(di.thumb, di.gid);
-                    mImageLoader.add(di.thumb, di.gid,
-                            new LoadImageView.SimpleImageGetListener(thumb));
-
-                    TextView title = (TextView)view.findViewById(R.id.title);
-                    title.setText(di.title);
-
-                    setDownloadInfo(view, di);
-                } else if (view.status != di.status || view.isWait) {
-                    view.status = di.status;
-                    view.type = di.type;
-                    view.lastStartIndex = di.lastStartIndex;
-                    view.downloadSize = di.downloadSize;
-                    view.isWait = false;
-
-                    setDownloadInfo(view, di);
-                } else if (view.status == DownloadInfo.DOWNLOADING &&
-                        (view.type != di.type
-                        || view.lastStartIndex != di.lastStartIndex
-                        || view.downloadSize != di.downloadSize)) {
-                    view.type = di.type;
-                    view.lastStartIndex = di.lastStartIndex;
-                    view.downloadSize = di.downloadSize;
-
-                    ProgressBar pb = (ProgressBar)view.findViewById(R.id.progressBar);
-                    TextView info = (TextView)view.findViewById(R.id.info);
-
-                    if (di.type == DownloadInfo.DETAIL_URL) {
-                        pb.setIndeterminate(true);
-                        info.setText(R.string.downloading);
-                    } else {
-                        pb.setIndeterminate(false);
-                        pb.setMax(di.pageSum);
-                        pb.setProgress(di.lastStartIndex);
-                        StringBuilder sb = new StringBuilder(getString(R.string.downloading));
-                        sb.append("  ").append(di.lastStartIndex).append(" / ").append(di.pageSum).append("\n");
-                        if (di.totalSize != 0)
-                            sb.append(String.format("%.2f", di.downloadSize))
-                                    .append(" / ").append(String.format("%.2f", di.totalSize)).append(" KB");
-                        info.setText(sb.toString());
-                    }
-                }
-                return view;
-            }
-
-            DownloadItemLayout view = (DownloadItemLayout)mInflater.inflate(R.layout.download_item, null);
-            view.gid = di.gid;
-            view.status = di.status;
-            view.type = di.type;
-            view.lastStartIndex = di.lastStartIndex;
-            view.downloadSize = di.downloadSize;
-            view.isWait = false;
-
-            LoadImageView thumb = (LoadImageView)view
-                    .findViewById(R.id.thumb);
-            thumb.setImageDrawable(null);
-            thumb.setLoadInfo(di.thumb, di.gid);
-            mImageLoader.add(di.thumb, di.gid,
-                    new LoadImageView.SimpleImageGetListener(thumb));
-
-            TextView title = (TextView)view.findViewById(R.id.title);
-            title.setText(di.title);
-
-            setDownloadInfo(view, di);
-
-            return view;
-        }
-
-        /**
-         * For clickable button, when click change message to "Please wait", then when action over change message
-         *
-         * @param view
-         * @param di
-         * @param position
-         */
-        private void setDownloadInfo(final DownloadItemLayout view, final DownloadInfo di) {
-            final ProgressBar pb = (ProgressBar)view.findViewById(R.id.progressBar);
-            final TextView info = (TextView)view.findViewById(R.id.info);
-            final ImageView action = (ImageView)view.findViewById(R.id.action);
-
-            if (di.status == DownloadInfo.STOP) {
-                pb.setVisibility(View.GONE);
-                String meg = getString(R.string.not_started) + (di.type == DownloadInfo.DETAIL_URL ? ""
-                        : ("  " + (di.lastStartIndex) + " / " + di.pageSum));
-                info.setText(meg);
-                action.setImageResource(R.drawable.ic_action_start);
-                action.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        pb.setVisibility(View.GONE);
-                        info.setText(R.string.wait);
-                        action.setClickable(false);
-                        view.isWait = true;
-
-                        Intent it = new Intent(DownloadActivity.this, DownloadService.class);
-                        startService(it);
-                        mServiceConn.getService().add(di);
-                    }
-                });
-            } else if (di.status == DownloadInfo.DOWNLOADING) {
-                pb.setVisibility(View.VISIBLE);
-                if (di.type == DownloadInfo.DETAIL_URL) {
-                    pb.setIndeterminate(true);
-                    info.setText(R.string.downloading);
-                } else {
-                    pb.setIndeterminate(false);
-                    pb.setMax(di.pageSum);
-                    pb.setProgress(di.lastStartIndex);
-                    StringBuilder sb = new StringBuilder(getString(R.string.downloading));
-                    sb.append("  ").append(di.lastStartIndex).append(" / ").append(di.pageSum).append("\n");
-                    if (di.totalSize != 0)
-                        sb.append(String.format("%.2f", di.downloadSize))
-                                .append(" / ").append(String.format("%.2f", di.totalSize)).append(" KB");
-                    info.setText(sb.toString());
-                }
-                action.setImageResource(R.drawable.ic_action_pause);
-                action.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        pb.setVisibility(View.GONE);
-                        info.setText(R.string.wait);
-                        action.setClickable(false);
-                        view.isWait = true;
-
-                        mServiceConn.getService().cancel(di.gid);
-                    }
-                });
-            } else if (di.status == DownloadInfo.WAITING) {
-                pb.setVisibility(View.GONE);
-                info.setText(R.string.waiting);
-                action.setImageResource(R.drawable.ic_action_pause);
-                action.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        pb.setVisibility(View.GONE);
-                        info.setText(R.string.wait);
-                        action.setClickable(false);
-                        view.isWait = true;
-
-                        mServiceConn.getService().cancel(di.gid);
-                    }
-                });
-            } else if (di.status == DownloadInfo.COMPLETED) {
-                pb.setVisibility(View.GONE);
-                info.setText(R.string.download_successfully);
-                action.setImageResource(R.drawable.ic_action_completed);
-                action.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Intent intent = new Intent(DownloadActivity.this,
-                                GalleryDownloadActivity.class);
-                        intent.putExtra(GalleryDownloadActivity.KEY_TITLE, di.title);
-                        intent.putExtra(GalleryDownloadActivity.KEY_SIZE, di.pageSum);
-                        intent.putExtra(GalleryDownloadActivity.KEY_GID, Integer.parseInt(di.gid));
-                        intent.putExtra(GalleryDownloadActivity.KEY_END_INDEX, di.lastStartIndex);
-                        startActivity(intent);
-                    }
-                });
-            } else if (di.status == DownloadInfo.FAILED) {
-                pb.setVisibility(View.GONE);
-                String meg = getString(R.string.download_unsuccessfully) + (di.type == DownloadInfo.DETAIL_URL ? ""
-                        : ("  " + (di.lastStartIndex) + " / " + di.pageSum));
-                info.setText(meg);
-                action.setImageResource(R.drawable.ic_action_start);
-                action.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        pb.setVisibility(View.GONE);
-                        info.setText(R.string.wait);
-                        action.setClickable(false);
-                        view.isWait = true;
-
-                        Intent it = new Intent(DownloadActivity.this, DownloadService.class);
-                        startService(it);
-                        mServiceConn.getService().add(di);
-                    }
-                });
-            }
-        }
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        unregisterReceiver(mReceiver);
-        unbindService(mServiceConn);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.download);
-
-        mAppContext = (AppContext)getApplication();
-        mImageLoader = ImageLoader.getInstance(this);
-
-        Ui.translucent(this, Ui.HOLO_BLUE_DARK);
-
-        // Download service
-        Intent it = new Intent(this, DownloadService.class);
-        bindService(it, mServiceConn, BIND_AUTO_CREATE);
-
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(DownloadService.ACTION_UPDATE);
-        registerReceiver(mReceiver, filter);
-
-        longClickDialog = setLongClickDialog();
-
-        mDownloadInfos = Download.getDownloadInfoList();
-
-        ListView listView = (ListView)findViewById(R.id.download);
-        mDlAdapter = new DlAdapter();
-        listView.setAdapter(mDlAdapter);
-        listView.setOnItemLongClickListener(new OnItemLongClickListener() {
-            @Override
-            public boolean onItemLongClick(AdapterView<?> arg0, View arg1,
-                    int position, long arg3) {
-                longClickItemIndex = position;
-                longClickDialog.show();
-                return true;
-            }
-        });
-    }
-
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver(){
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if(intent.getAction().equals(DownloadService.ACTION_UPDATE))
-                mDlAdapter.notifyDataSetChanged();
-        }
-    };
-
-    @Override
-    public void onOrientationChanged(int paddingTop, int paddingBottom) {
-        // TODO Auto-generated method stub
-
-    }
-}
diff --git a/src/com/hippo/ehviewer/ui/GalleryActivity.java b/src/com/hippo/ehviewer/ui/GalleryActivity.java
index 71463f820..177ff8c50 100644
--- a/src/com/hippo/ehviewer/ui/GalleryActivity.java
+++ b/src/com/hippo/ehviewer/ui/GalleryActivity.java
@@ -16,218 +16,32 @@
 
 package com.hippo.ehviewer.ui;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.RelativeLayout;
 
-import com.hippo.ehviewer.AppContext;
 import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.ehclient.EhClient;
-import com.hippo.ehviewer.gallery.GalleryView;
-import com.hippo.ehviewer.gallery.data.ImageSet;
-import com.hippo.ehviewer.gallery.ui.GLRootView;
-import com.hippo.ehviewer.network.Downloader;
-import com.hippo.ehviewer.util.Config;
-import com.hippo.ehviewer.util.Log;
-import com.hippo.ehviewer.util.Utils;
-import com.hippo.ehviewer.widget.MaterialToast;
 
 public class GalleryActivity extends AbstractActivity {
-    private final String TAG = "MangaActivity";
-
-    private AppContext mAppContext;
-    private EhClient mEhClient;
+    @SuppressWarnings("unused")
+    private final String TAG = GalleryActivity.class.getSimpleName();
 
     private RelativeLayout mainView;
 
-    private int gid;
-    private String title;
-
-    private int retryTimes = 0;
-    private static final int maxRetry = 3;
-    private boolean stopFlag = false;
-
-    // [firstPage, lastPage)
-    // last 是目前已下载的最后一页的 index + 1
-    private int pageSum;
-    private int firstPage;
-    private int lastPage;
-
-    private String allPrePageUrl;
-    private String allNextPageUrl;
-
-    private boolean getPrePage = false;
-    private boolean mStop = false;
-
-    private File mFolder;
-    private ImageSet mImageSet;
-
-    // two element, first is web url, second is image url
-    private List<String[]> imagesUrl;
-
-    // TODO use downloader to download image
-    // TODO combine it with MangaDownloadActivity
-    private class MangaUrlGetListener implements EhClient.OnGetMangaUrlListener {
-
-        @Override
-        public void onSuccess(Object checkFlag, String[] arg) {
-            if (stopFlag) {
-                Log.d(TAG, "Stop by stop flag");
-                return;
-            }
-            retryTimes = 0;
-
-            final int index = (Integer)checkFlag;
-            final String prePageUrl = arg[0];
-            final String nextPageUrl = arg[1];
-            final String imageUrl = arg[2];
-
-            String[] urls = imagesUrl.get(index);
-            if (urls == null) {
-                imagesUrl.set(index, urls = new String[2]);
-            }
-            urls[1] = imageUrl;
-            if (index == firstPage - 1 || (index == firstPage && allPrePageUrl == null)) {
-                allPrePageUrl = prePageUrl;
-                if (index > 0)
-                    imagesUrl.set(index - 1, new String[]{allPrePageUrl, null});
-            }
-            if (index == lastPage) {
-                allNextPageUrl = nextPageUrl;
-                if (index < pageSum - 1)
-                    imagesUrl.set(index + 1, new String[]{allNextPageUrl, null});
-            }
-            if (index != firstPage - 1 && (index == firstPage && allPrePageUrl == null) && index != lastPage) {
-                Log.e(TAG, "targetPage != firstPage - 1 && (targetPage == firstPage && allPrePageUrl == null) && targetPage != lastPage");
-            }
-
-            final String imageName = String.format("%05d", index + 1) + "." + Utils.getExtension(imageUrl);
-
-            final Downloader downloader = new Downloader(GalleryActivity.this);
-            try {
-                downloader.resetData(mFolder.getPath(),
-                        imageName,
-                        imageUrl);
-            } catch (MalformedURLException e) {
-                onFailure(checkFlag, mAppContext.getString(R.string.em_url_format_error));
-                e.printStackTrace();
-            }
-
-            // TODO threadpool
-            new Thread() {
-                @Override
-                public void run() {
-                    // First check is it in disk and ok
-                    if (testImage(mFolder.getPath(), imageName)) {
-                        onGetImage(index, Downloader.COMPLETED, nextPageUrl);
-                    } else {
-
-                        downloader.run();
-                        onGetImage(index, downloader.getStatus(), nextPageUrl);
-                    }
-                }
-            }.start();
-        }
-
-        // TODO only test bitmap here
-        private boolean testImage(String path, String name) {
-            boolean isImage = false;
-            File file = new File(path, name);
-            if (!file.exists() || !file.isFile())
-                return false;
-            FileInputStream fis = null;
-            try {
-                // Just test bound might error
-                fis = new FileInputStream(file);
-                BitmapFactory.Options ops = new BitmapFactory.Options();
-                // Make sure it do not malloc too many memory
-                ops.inSampleSize = 10000;
-                Bitmap bmp = BitmapFactory.decodeStream(fis, null, ops);
-                if (bmp != null) {
-                    isImage = true;
-                    bmp.recycle();
-                }
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-            } finally {
-                if (fis != null)
-                    Utils.closeStreamQuietly(fis);
-            }
-            return isImage;
-        }
-
-        private void onGetImage(int index, int state, String nextPageUrl) {
-            if (state == Downloader.COMPLETED) {
-                mImageSet.changeState(index, ImageSet.STATE_LOADED);
-            } else {
-                mImageSet.changeState(index, ImageSet.STATE_FAIL);
-            }
-            if (index == firstPage - 1 &&
-                    getPrePage == true) { // If get prePage
-                firstPage--;
-                getPrePage = false;
-            } else if (index == lastPage && nextPageUrl != "last") { // If get nextPage
-                lastPage++;
-                mEhClient.getMangaUrl(nextPageUrl, lastPage, new MangaUrlGetListener());
-                mImageSet.changeState(lastPage, ImageSet.STATE_LOADING);
-            }
-        }
-
-        @Override
-        public void onFailure(Object checkFlag, String eMsg) {
-            if (stopFlag) {
-                Log.d(TAG, "Stop by stop flag");
-                return;
-            }
-            retryTimes++;
-            int targetPage = (Integer)checkFlag;
-            if (retryTimes < maxRetry) {
-                MaterialToast.showToast(eMsg + " " +
-                        String.format(getString(R.string.em_retry_times), retryTimes)); // TODO
-                if (targetPage == firstPage - 1 &&
-                        getPrePage == true) {
-                    mEhClient.getMangaUrl(allPrePageUrl, targetPage, new MangaUrlGetListener());
-                }
-                else {
-                    mEhClient.getMangaUrl(allNextPageUrl, targetPage, new MangaUrlGetListener());
-                }
-                mImageSet.changeState(targetPage, ImageSet.STATE_LOADING);
-            } else {
-                retryTimes = 0;
-                if (targetPage == firstPage - 1 &&
-                        getPrePage == true) {
-                    getPrePage = false;
-                    MaterialToast.showToast(R.string.retry_max_pre);
-                }
-                else {
-                    MaterialToast.showToast(R.string.retry_max_next);
-                    mStop = true;
-                }
-                mImageSet.changeState(targetPage, ImageSet.STATE_FAIL);
-            }
-        }
+    @Override
+    public void onOrientationChanged(int paddingTop, int paddingBottom) {
+        // Empty
     }
 
     @SuppressLint("NewApi")
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
             super.onWindowFocusChanged(hasFocus);
-        if (Build.VERSION.SDK_INT >= 19 && hasFocus && mainView != null) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT &&
+                hasFocus && mainView != null) {
             mainView.setSystemUiVisibility(
                     View.SYSTEM_UI_FLAG_LAYOUT_STABLE
                     | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
@@ -237,29 +51,17 @@ public class GalleryActivity extends AbstractActivity {
                     | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);}
     }
 
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-    }
-
-    @SuppressLint("NewApi")
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.gl_root_group);
 
-        mAppContext = (AppContext)getApplication();
-        mEhClient = EhClient.getInstance();
-
-        getActionBar().hide();
-        // For API < 16 Fullscreen
-        if (Build.VERSION.SDK_INT < 19) {
+        // FullScreen
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
             getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                     WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        }
-        mainView = (RelativeLayout)findViewById(R.id.main);
-        // For fullscreen
-        if (Build.VERSION.SDK_INT >= 19) {
+        } else {
+            mainView = (RelativeLayout)findViewById(R.id.main);
             mainView.setSystemUiVisibility(
                     View.SYSTEM_UI_FLAG_LAYOUT_STABLE
                     | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
@@ -268,83 +70,5 @@ public class GalleryActivity extends AbstractActivity {
                     | View.SYSTEM_UI_FLAG_FULLSCREEN
                     | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
         }
-
-        Intent intent = getIntent();
-        firstPage = intent.getIntExtra("firstPage", 0);
-        lastPage = firstPage;
-        gid = intent.getIntExtra("gid", 0);
-        title = intent.getStringExtra("title");
-        mFolder = new File(Config.getDownloadPath(), Utils.standardizeFilename(title));
-        if (mFolder.isFile())
-            mFolder.delete();
-        mFolder.mkdirs();
-        pageSum = intent.getIntExtra("pageSum", 0);
-
-        mImageSet = new ImageSet(this, gid, mFolder, pageSum, firstPage, lastPage, null);
-        GalleryView isv = new GalleryView(getApplicationContext(), mImageSet, firstPage);
-        isv.setOnTapTextListener(new GalleryView.OnTapTextListener() {
-            @Override
-            public void onTapText(int index) {
-                if (mStop && index == lastPage) {
-                    mStop = false;
-                    MangaUrlGetListener listener = new MangaUrlGetListener();
-                    mEhClient.getMangaUrl(allNextPageUrl, lastPage, listener);
-                    mImageSet.changeState(lastPage, ImageSet.STATE_LOADING);
-                }
-            }
-
-            @Override
-            public void onTapDoubleText(int index) {
-                // TODO Auto-generated method stub
-
-            }
-        });
-        isv.setOnScrollPageListener(new GalleryView.OnScrollPageListener() {
-            @Override
-            public void onScrollPage(int index) {
-                if (mStop && index == lastPage) {
-                    mStop = false;
-                    mEhClient.getMangaUrl(allNextPageUrl, lastPage, new MangaUrlGetListener());
-                    mImageSet.changeState(lastPage, ImageSet.STATE_LOADING);
-                }
-
-                if (!getPrePage && allPrePageUrl != null
-                        && !allPrePageUrl.equals("first")
-                        && index == firstPage - 1) {
-                    getPrePage = true;
-                    mEhClient.getMangaUrl(allPrePageUrl, firstPage - 1, new MangaUrlGetListener());
-                    mImageSet.changeState(firstPage - 1, ImageSet.STATE_LOADING);
-                }
-            }
-        });
-        GLRootView glrv= (GLRootView)findViewById(R.id.gl_root_view);
-        glrv.setContentPane(isv);
-
-        String url = intent.getStringExtra("url");
-        allNextPageUrl = url;
-        allPrePageUrl = null;
-
-        if (firstPage == 0)
-            allPrePageUrl = "first";
-        if (firstPage == pageSum - 1)
-            allNextPageUrl = "last";
-
-        imagesUrl = new ArrayList<String[]>(Collections.nCopies(pageSum, (String[])null));
-        imagesUrl.set(lastPage, new String[]{url, null});
-
-        // Get image and next page
-        mEhClient.getMangaUrl(url, lastPage, new MangaUrlGetListener());
-        mImageSet.changeState(lastPage, ImageSet.STATE_LOADING);
-    }
-
-    @Override
-    protected void onDestroy () {
-        stopFlag = true;
-        super.onDestroy();
-    }
-
-    @Override
-    public void onOrientationChanged(int paddingTop, int paddingBottom) {
-        // Empty
     }
 }
diff --git a/src/com/hippo/ehviewer/ui/GalleryDetailActivity.java b/src/com/hippo/ehviewer/ui/GalleryDetailActivity.java
index f38fa63ce..9d70d5ad0 100644
--- a/src/com/hippo/ehviewer/ui/GalleryDetailActivity.java
+++ b/src/com/hippo/ehviewer/ui/GalleryDetailActivity.java
@@ -977,6 +977,7 @@ public class GalleryDetailActivity extends AbstractActivity
             int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
         if (v == mMoreDetailScroll) {
             mMoreDetailScroll.scrollTo(0, 0);
+            System.out.print("sssss");
         } else if (v == mCommentList) {
             mCommentList.setSelection(0);
         } else if (v == mDetailScroll) {
diff --git a/src/com/hippo/ehviewer/ui/GalleryDownloadActivity.java b/src/com/hippo/ehviewer/ui/GalleryDownloadActivity.java
deleted file mode 100644
index 76eb3ef34..000000000
--- a/src/com/hippo/ehviewer/ui/GalleryDownloadActivity.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2014 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.ui;
-
-import java.io.File;
-
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.RelativeLayout;
-
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.gallery.GalleryView;
-import com.hippo.ehviewer.gallery.data.DownloadImageSet;
-import com.hippo.ehviewer.gallery.ui.GLRootView;
-import com.hippo.ehviewer.util.Config;
-import com.hippo.ehviewer.util.Utils;
-
-public class GalleryDownloadActivity extends AbstractActivity {
-    private static final String TAG = "MangaDownloadActivity";
-
-    public static final String KEY_TITLE = "title";
-    public static final String KEY_GID= "gid";
-    public static final String KEY_SIZE = "size";
-    public static final String KEY_END_INDEX = "endIndex";
-
-    private RelativeLayout mainView;
-    private DownloadImageSet mDownloadImageSet;
-
-    @SuppressLint("NewApi")
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.gl_root_group);
-
-        getActionBar().hide();
-        // For API < 16 Fullscreen
-        if (Build.VERSION.SDK_INT < 19) {
-            getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                    WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        }
-        mainView = (RelativeLayout)findViewById(R.id.main);
-        // For fullscreen
-        if (Build.VERSION.SDK_INT >= 19) {
-            mainView.setSystemUiVisibility(
-                    View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                    | View.SYSTEM_UI_FLAG_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
-        }
-
-        Intent intent = getIntent();
-        String title = intent.getStringExtra(KEY_TITLE);
-        int gid = intent.getIntExtra(KEY_GID, 0);
-        int size = intent.getIntExtra(KEY_SIZE, 1);
-        int endIndex = intent.getIntExtra(KEY_END_INDEX, 0);
-        GLRootView glrv= (GLRootView)findViewById(R.id.gl_root_view);
-
-        File folder = new File(Config.getDownloadPath(), Utils.standardizeFilename(title));
-        folder.mkdirs();
-        mDownloadImageSet = new DownloadImageSet(this, gid, folder, size, 0, endIndex, null);
-        GalleryView isv = new GalleryView(getApplicationContext(), mDownloadImageSet, 0);
-        glrv.setContentPane(isv);
-
-        // Avoid error when use Movie
-        //glrv.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
-    }
-
-    @SuppressLint("NewApi")
-    @Override
-    public void onWindowFocusChanged(boolean hasFocus) {
-            super.onWindowFocusChanged(hasFocus);
-        if (Build.VERSION.SDK_INT >= 19 && hasFocus && mainView != null) {
-            mainView.setSystemUiVisibility(
-                    View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                    | View.SYSTEM_UI_FLAG_FULLSCREEN
-                    | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);}
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        mDownloadImageSet.unregisterReceiver();
-    }
-
-    @Override
-    public void onOrientationChanged(int paddingTop, int paddingBottom) {
-        // Empty
-    }
-}
diff --git a/src/com/hippo/ehviewer/ui/GalleryListActivity.java b/src/com/hippo/ehviewer/ui/GalleryListActivity.java
index 527c09e37..af798e284 100644
--- a/src/com/hippo/ehviewer/ui/GalleryListActivity.java
+++ b/src/com/hippo/ehviewer/ui/GalleryListActivity.java
@@ -1009,7 +1009,6 @@ public class GalleryListActivity extends AbstractGalleryActivity
                 TextView tv;
                 if (convertView == null) {
                     tv = (TextView)LayoutInflater.from(GalleryListActivity.this).inflate(R.layout.menu_item, parent, false);
-                    mWindowsAnimate.addRippleEffect(tv, true);
                 } else {
                     tv = (TextView)convertView;
                 }
@@ -1059,9 +1058,10 @@ public class GalleryListActivity extends AbstractGalleryActivity
                     break;
 
                 case 5: // Download
-                    intent = new Intent(GalleryListActivity.this,
-                            DownloadActivity.class);
-                    startActivity(intent);
+                    // TODO Download Activity
+                    //intent = new Intent(GalleryListActivity.this,
+                            //DownloadActivity.class);
+                    //startActivity(intent);
                     break;
 
                 case 6: // Settings
diff --git a/src/com/hippo/ehviewer/ui/SettingsActivity.java b/src/com/hippo/ehviewer/ui/SettingsActivity.java
index df705471d..b313f032c 100644
--- a/src/com/hippo/ehviewer/ui/SettingsActivity.java
+++ b/src/com/hippo/ehviewer/ui/SettingsActivity.java
@@ -32,7 +32,6 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
@@ -54,7 +53,10 @@ import android.widget.TextView;
 import com.hippo.ehviewer.AppContext;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.UpdateHelper;
+import com.hippo.ehviewer.ehclient.EhClient;
 import com.hippo.ehviewer.ehclient.EhInfo;
+import com.hippo.ehviewer.ehclient.ExDownloadManager;
+import com.hippo.ehviewer.ehclient.ExDownloader;
 import com.hippo.ehviewer.network.Downloader;
 import com.hippo.ehviewer.preference.AutoListPreference;
 import com.hippo.ehviewer.util.Config;
@@ -112,6 +114,13 @@ public class SettingsActivity extends AbstractPreferenceActivity {
 
         mListView = getListView();
         mListView.setClipToPadding(false);
+
+
+        // Test here
+
+        ExDownloadManager edm = ExDownloadManager.getInstance();
+        ExDownloader ed = edm.getExDownloader(728773, "1f90a6e00c", "[BaseSon] Shiki to Hitsuji to Urau Tsuki", EhClient.MODE_EX);
+        ed.setStartIndex(0);
     }
 
     @Override
@@ -443,8 +452,6 @@ public class SettingsActivity extends AbstractPreferenceActivity {
 
         private AlertDialog mDirSelectDialog;
 
-        private EditTextPreference mCacheSize;
-        private Preference mClearCache;
         private Preference mDownloadPath;
         private CheckBoxPreference mMediaScan;
         private ListPreference mDefaultFavorite;
@@ -454,18 +461,12 @@ public class SettingsActivity extends AbstractPreferenceActivity {
             super.onCreate(savedInstanceState);
             addPreferencesFromResource(R.xml.data_settings);
 
-            mCacheSize = (EditTextPreference)findPreference(KEY_CACHE_SIZE);
-            mCacheSize.setOnPreferenceChangeListener(this);
-            mClearCache = findPreference(KEY_CLEAR_CACHE);
-            mClearCache.setOnPreferenceClickListener(this);
             mDownloadPath = findPreference(KEY_DOWNLOAD_PATH);
             mDownloadPath.setOnPreferenceClickListener(this);
             mMediaScan = (CheckBoxPreference)findPreference(KEY_MEDIA_SCAN);
             mMediaScan.setOnPreferenceChangeListener(this);
             mDefaultFavorite = (ListPreference)findPreference(KEY_DEFAULT_FAVORITE);
 
-            // Set summary
-            updateClearCacheSummary();
             mDownloadPath.setSummary(Config.getDownloadPath());
 
             int i = 0;
@@ -476,55 +477,10 @@ public class SettingsActivity extends AbstractPreferenceActivity {
             mDefaultFavorite.setEntries(entrise);
         }
 
-        private void updateClearCacheSummary() {
-            /*
-            if (Cache.diskCache != null) {
-                mClearCache.setSummary(String.format(
-                        getString(R.string.clear_cache_summary_on),
-                        Cache.diskCache.size() / 1024 / 1024f,
-                        Cache.diskCache.maxSize() / 1024 / 1024));
-                mClearCache.setEnabled(true);
-            } else {
-                mClearCache
-                        .setSummary(getString(R.string.clear_cache_summary_off));
-                mClearCache.setEnabled(false);
-            }
-            */
-        }
-
         @Override
         public boolean onPreferenceChange(Preference preference, Object objValue) {
             final String key = preference.getKey();
-            if (KEY_CACHE_SIZE.equals(key)) {
-                /*
-
-                long cacheSize = 0;
-                try {
-                    cacheSize = Integer.parseInt((String) objValue) * 1024 * 1024;
-                } catch (Exception e) {
-                    new SuperToast(mActivity).setIcon(R.drawable.ic_warning)
-                            .setMessage(R.string.input_error).show();
-                    return false;
-                }
-
-                if (cacheSize <= 0 && Cache.diskCache != null) {
-                    Cache.diskCache.clear();
-                    Cache.diskCache.close();
-                    Cache.diskCache = null;
-                } else if (Cache.diskCache == null) {
-                    try {
-                        Cache.diskCache = new DiskCache(mActivity,
-                                Cache.cpCachePath, cacheSize);
-                    } catch (Exception e) {
-                        new SuperToast(mActivity).setIcon(R.drawable.ic_warning)
-                                .setMessage(R.string.create_cache_error).show();
-                        e.printStackTrace();
-                    }
-                } else
-                    Cache.diskCache.setMaxSize(cacheSize);
-                updateClearCacheSummary();
-                */
-            } else if (KEY_MEDIA_SCAN.equals(key)) {
+            if (KEY_MEDIA_SCAN.equals(key)) {
                 boolean value = (Boolean)objValue;
                 File nomedia = new File(Config.getDownloadPath(), ".nomedia");
                 if (value) {
@@ -543,12 +499,7 @@ public class SettingsActivity extends AbstractPreferenceActivity {
         @Override
         public boolean onPreferenceClick(Preference preference) {
             final String key = preference.getKey();
-            if (KEY_CLEAR_CACHE.equals(key)) {
-                /*
-                Cache.diskCache.clear();
-                updateClearCacheSummary();
-                */
-            } else if (KEY_DOWNLOAD_PATH.equals(key)) {
+            if (KEY_DOWNLOAD_PATH.equals(key)) {
                 View view = LayoutInflater.from(mActivity)
                         .inflate(R.layout.dir_selection, null);
                 final FileExplorerView fileExplorerView =
diff --git a/src/com/hippo/ehviewer/util/AutoExpandArray.java b/src/com/hippo/ehviewer/util/AutoExpandArray.java
new file mode 100644
index 000000000..af94b829c
--- /dev/null
+++ b/src/com/hippo/ehviewer/util/AutoExpandArray.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2014 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.util;
+
+public class AutoExpandArray<E> {
+
+    private static final String TAG = AutoExpandArray.class.getSimpleName();
+
+    private static final int MIN_CAPACITY_INCREMENT = 12;
+
+    private int maxValidIndex = 0;
+    private transient Object[] array;
+
+    public AutoExpandArray(int capacity) {
+        if (capacity < 0) {
+            throw new IllegalArgumentException("capacity < 0: " + capacity);
+        }
+        array = new Object[capacity];
+    }
+
+    public AutoExpandArray() {
+        array = new Object[MIN_CAPACITY_INCREMENT];
+    }
+
+    private synchronized void ensureCapacity(int index) {
+        if (index < array.length)
+            return;
+
+        Object[] newArray = new Object[(index + 1) << 1];
+        System.arraycopy(array, 0, newArray, 0, array.length);
+        array = newArray;
+    }
+
+    public synchronized void setCapacity(int newCapacity) {
+        if (newCapacity <= array.length)
+            return;
+
+        Object[] newArray = new Object[newCapacity];
+        System.arraycopy(array, 0, newArray, 0, array.length);
+        array = newArray;
+    }
+
+    public synchronized E set(int index, E object) {
+        if (index > maxValidIndex)
+            maxValidIndex = index;
+
+        ensureCapacity(index);
+        @SuppressWarnings("unchecked")
+        E result = (E)array[index];
+        array[index] = object;
+        return result;
+    }
+
+    @SuppressWarnings("unchecked")
+    public synchronized E get(int index) {
+        if (index >= array.length) {
+            return null;
+        }
+        return (E)array[index];
+    }
+
+    public synchronized int length() {
+        return array.length;
+    }
+
+    public synchronized int maxValidIndex() {
+        return maxValidIndex;
+    }
+ }
diff --git a/src/com/hippo/ehviewer/util/Constants.java b/src/com/hippo/ehviewer/util/Constants.java
index b07b05c82..407ef371a 100644
--- a/src/com/hippo/ehviewer/util/Constants.java
+++ b/src/com/hippo/ehviewer/util/Constants.java
@@ -26,7 +26,7 @@ public final class Constants {
     public static final int HTTP_TEMP_REDIRECT = 307;
     public static String defaultUserAgent = "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.76 Safari/537.36";
     public static String userAgent = System.getProperty("http.agent", defaultUserAgent);
-    public static final int DEFAULT_TIMEOUT = 10 * 1000;
+    public static final int DEFAULT_TIMEOUT = 5 * 1000;
     public static final int MAX_REDIRECTS = 5;
 
     public static final int BUFFER_SIZE = 4096;
diff --git a/src/com/hippo/ehviewer/util/Utils.java b/src/com/hippo/ehviewer/util/Utils.java
index fdb8a4e3d..2ba75c1cf 100644
--- a/src/com/hippo/ehviewer/util/Utils.java
+++ b/src/com/hippo/ehviewer/util/Utils.java
@@ -18,6 +18,7 @@ package com.hippo.ehviewer.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
+import java.io.EOFException;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -139,7 +140,7 @@ public final class Utils {
         } catch (IOException e) {
             e.printStackTrace();
         } finally {
-            Utils.closeStreamQuietly(baos);
+            Utils.closeQuietly(baos);
         }
         return str;
     }
@@ -172,7 +173,7 @@ public final class Utils {
         shaper.edit().putString(key, byteArrayToHexString(sb.toString().getBytes())).apply();
     }
 
-    public static void closeStreamQuietly (Closeable is) {
+    public static void closeQuietly (Closeable is) {
         try {
             if (is != null)
                 is.close();
@@ -292,7 +293,7 @@ public final class Utils {
      * @param str
      * @return
      */
-    public static String htmlUnsescape(String str) {
+    public static String unescapeXml(String str) {
         return replaceEach(str, ESCAPE_CHARATER_LIST, UNESCAPE_CHARATER_LIST);
     }
 
@@ -545,7 +546,39 @@ public final class Utils {
         return replaceEach(result, searchList, replacementList, repeat, timeToLive - 1);
     }
 
+    /**
+     * 0 for false, Non 0 for true
+     *
+     * @param integer
+     * @return
+     */
     public static boolean int2boolean(int integer) {
         return integer == 0 ? false : true;
     }
+
+    /**
+     * Returns the ASCII characters up to but not including the next "\r\n", or
+     * "\n".
+     *
+     * @throws java.io.EOFException if the stream is exhausted before the next
+     *             newline character.
+     */
+    public static String readAsciiLine(final InputStream in) throws IOException {
+        final StringBuilder result = new StringBuilder(80);
+        while (true) {
+            final int c = in.read();
+            if (c == -1) {
+                throw new EOFException();
+            } else if (c == '\n') {
+                break;
+            }
+
+            result.append((char)c);
+        }
+        final int length = result.length();
+        if (length > 0 && result.charAt(length - 1) == '\r') {
+            result.setLength(length - 1);
+        }
+        return result.toString();
+    }
 }