From 99d844aea886611c42cd7c7fa8509c516e95cfff Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 17 Jul 2014 14:09:55 +0400
Subject: [PATCH] fix result code not parsed properly when subscribing to feeds

---
 AndroidManifest.xml                            |  2 +-
 src/org/fox/ttrss/share/SubscribeActivity.java | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2441c16f..fcf63db8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
     android:versionCode="236"
-    android:versionName="1.39" >
+    android:versionName="1.40" >
 
     <uses-sdk
         android:minSdkVersion="8"
diff --git a/src/org/fox/ttrss/share/SubscribeActivity.java b/src/org/fox/ttrss/share/SubscribeActivity.java
index e4959de7..bd7e964f 100644
--- a/src/org/fox/ttrss/share/SubscribeActivity.java
+++ b/src/org/fox/ttrss/share/SubscribeActivity.java
@@ -143,11 +143,23 @@ public class SubscribeActivity extends CommonShareActivity {
 				if (m_lastError != ApiError.NO_ERROR) {
 					toast(getErrorMessage());
 				} else {
-					try {					
-						switch (m_apiStatusCode) {
+					try {
+						int rc = -1;
+						
+						try {
+							rc = result.getAsJsonObject().get("status").getAsJsonObject().get("code").getAsInt();
+						} catch (Exception e) {
+							e.printStackTrace();
+						}
+
+						switch (rc) {
+						case -1:
+							toast(R.string.error_api_unknown);
+							//finish();
+							break;
 						case 0:
 							toast(R.string.error_feed_already_exists_);
-							finish();
+							//finish();
 							break;
 						case 1:
 							toast(R.string.subscribed_to_feed);