From 626def198ce8bfc11b97e75f0f3e5a3d1486aeb2 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Tue, 10 Jun 2014 08:31:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BB=A5=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=9A=84=20json=20=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/hippo/ehviewer/UpdateHelper.java | 27 ++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/com/hippo/ehviewer/UpdateHelper.java b/src/com/hippo/ehviewer/UpdateHelper.java
index ede506964..8da7b21dc 100644
--- a/src/com/hippo/ehviewer/UpdateHelper.java
+++ b/src/com/hippo/ehviewer/UpdateHelper.java
@@ -173,21 +173,22 @@ public class UpdateHelper {
                         JSONObject jo = new JSONObject(pageContext);
                         JSONObject updateJO = jo.getJSONObject("update");
                         
-                        String version = updateJO.getString("version");
-                        
-                        if (version.equals("error")) {
+                        if (updateJO.has("error")) {
                             if (listener != null)
-                                listener.onFailure(appContext.getString(R.string.em_invalid_request));
-                        } else if (version.equals("none")) {
-                            if (listener != null)
-                                listener.onNoUpdate();
+                                listener.onFailure(updateJO.getString("error"));
                         } else {
-                            long size = updateJO.getLong("size");
-                            String url = updateJO.getString("url");
-                            String info = updateJO.getString("info");
-                            
-                            if (listener != null)
-                                listener.onSuccess(version, size, url, HEADER + version + FOOTER, info);
+                            String version = updateJO.getString("version");
+                            if (version.equals("none")) {
+                                if (listener != null)
+                                    listener.onNoUpdate();
+                            } else {
+                                long size = updateJO.getLong("size");
+                                String url = updateJO.getString("url");
+                                String info = updateJO.getString("info");
+                                
+                                if (listener != null)
+                                    listener.onSuccess(version, size, url, HEADER + version + FOOTER, info);
+                            }
                         }
                     } catch (JSONException e) {
                         e.printStackTrace();