From cbbe1478aef2cb7e74903e07ed4893f0598af7d0 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Tue, 10 Jun 2014 22:52:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E7=95=8C=E9=9D=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=BF=94=E5=9B=9E=E9=94=AE=E9=9A=90=E8=97=8F=20Action?=
 =?UTF-8?q?ableToastBar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/hippo/ehviewer/ui/FavouriteActivity.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/com/hippo/ehviewer/ui/FavouriteActivity.java b/src/com/hippo/ehviewer/ui/FavouriteActivity.java
index cd3844a1a..f30a18d22 100644
--- a/src/com/hippo/ehviewer/ui/FavouriteActivity.java
+++ b/src/com/hippo/ehviewer/ui/FavouriteActivity.java
@@ -51,6 +51,7 @@ import com.hippo.ehviewer.data.GalleryInfo;
 import com.hippo.ehviewer.ehclient.EhClient;
 import com.hippo.ehviewer.service.DownloadService;
 import com.hippo.ehviewer.service.DownloadServiceConnection;
+import com.hippo.ehviewer.util.Log;
 import com.hippo.ehviewer.util.Ui;
 import com.hippo.ehviewer.widget.ActionableToastBar;
 import com.hippo.ehviewer.widget.DialogBuilder;
@@ -87,6 +88,14 @@ public class FavouriteActivity extends AbstractGalleryActivity
         super.onConfigurationChanged(newConfig);
     }
     
+    @Override
+    public void onBackPressed() {
+        if (mActionableToastBar.isShown())
+            mActionableToastBar.hide(true);
+        else
+            super.onBackPressed();
+    }
+    
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -323,7 +332,7 @@ public class FavouriteActivity extends AbstractGalleryActivity
     
     private AlertDialog createMoveDialog(final ActionMode mode) {
         return new DialogBuilder(this).setTitle("移动至何处？") //
-                .setItems(mMenuIndex, new AdapterView.OnItemClickListener() {
+                .setItems(mMenuTitles, new AdapterView.OnItemClickListener() {
                     @Override
                     public void onItemClick(AdapterView<?> parent, View view,
                             int position, long id) {
@@ -354,7 +363,7 @@ public class FavouriteActivity extends AbstractGalleryActivity
                         mMoveDialog = null;
                         mode.finish();
                     }
-                }).create();
+                }).setSimpleNegativeButton().create();
     }
     
     @Override