summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/fox/ttrss/ApiRequest.java7
-rw-r--r--src/org/fox/ttrss/FeedsFragment.java5
2 files changed, 8 insertions, 4 deletions
diff --git a/src/org/fox/ttrss/ApiRequest.java b/src/org/fox/ttrss/ApiRequest.java
index 39b5a576..496f3b95 100644
--- a/src/org/fox/ttrss/ApiRequest.java
+++ b/src/org/fox/ttrss/ApiRequest.java
@@ -127,10 +127,12 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
} catch (IllegalArgumentException e) {
m_lastError = ApiError.INVALID_URL;
e.printStackTrace();
+ client.close();
return null;
} catch (Exception e) {
m_lastError = ApiError.OTHER_ERROR;
e.printStackTrace();
+ client.close();
return null;
}
@@ -148,6 +150,7 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
} catch (MalformedURLException e) {
m_lastError = ApiError.INVALID_URL;
e.printStackTrace();
+ client.close();
return null;
}
@@ -213,8 +216,6 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
}
}
- client.close();
-
return null;
case 401:
m_lastError = ApiError.HTTP_UNAUTHORIZED;
@@ -233,6 +234,7 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
break;
}
+ client.close();
return null;
} catch (javax.net.ssl.SSLPeerUnverifiedException e) {
m_lastError = ApiError.SSL_REJECTED;
@@ -248,6 +250,7 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
e.printStackTrace();
}
+ client.close();
return null;
}
}
diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java
index 38e8b48c..92beaf97 100644
--- a/src/org/fox/ttrss/FeedsFragment.java
+++ b/src/org/fox/ttrss/FeedsFragment.java
@@ -508,6 +508,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
targetUrl = new URL(fetchUrl);
} catch (MalformedURLException e) {
e.printStackTrace();
+ client.close();
return;
}
@@ -539,12 +540,12 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
fos.close();
is.close();
-
- client.close();
} catch (Exception e) {
e.printStackTrace();
}
+
+ client.close();
}
protected void onPostExecute(Integer result) {