summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Stefani <luca.stefani.ge1@gmail.com>2017-12-09 19:20:22 +0100
committerLuca Stefani <luca.stefani.ge1@gmail.com>2017-12-10 17:03:07 +0000
commitc4a6bf84e938fc3db4e12d50fe1126d67ac1ad8b (patch)
treeff612c492192f2b83579dbf41cb0766f09ebc5f0
parent6904728d822b135507ca4253960828110cd78726 (diff)
downloadandroid_packages_apps_Jelly-c4a6bf84e938fc3db4e12d50fe1126d67ac1ad8b.tar.gz
android_packages_apps_Jelly-c4a6bf84e938fc3db4e12d50fe1126d67ac1ad8b.tar.bz2
android_packages_apps_Jelly-c4a6bf84e938fc3db4e12d50fe1126d67ac1ad8b.zip
Jelly: Use try-with-resources in downloadSuggestionsForQuery
Change-Id: Idd9b72582bdc676007f6c2b54879791182a07f6a
-rw-r--r--app/src/main/java/org/lineageos/jelly/suggestions/SuggestionProvider.java15
1 files changed, 3 insertions, 12 deletions
diff --git a/app/src/main/java/org/lineageos/jelly/suggestions/SuggestionProvider.java b/app/src/main/java/org/lineageos/jelly/suggestions/SuggestionProvider.java
index e59f2d2..0d592d9 100644
--- a/app/src/main/java/org/lineageos/jelly/suggestions/SuggestionProvider.java
+++ b/app/src/main/java/org/lineageos/jelly/suggestions/SuggestionProvider.java
@@ -78,8 +78,8 @@ abstract class SuggestionProvider {
/**
* Parse the results of an input stream into a list of {@link String}.
*
- * @param content the raw input to parse.
- * @param callback the callback to invoke for each received suggestion
+ * @param content the raw input to parse.
+ * @param callback the callback to invoke for each received suggestion
* @throws Exception throw an exception if anything goes wrong.
*/
void parseResults(@NonNull String content,
@@ -142,24 +142,15 @@ abstract class SuggestionProvider {
@NonNull String language) {
try {
URL url = new URL(createQueryUrl(query, language));
- InputStream in = null;
HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
urlConnection.addRequestProperty("Cache-Control",
"max-age=" + INTERVAL_DAY + ", max-stale=" + INTERVAL_DAY);
urlConnection.addRequestProperty("Accept-Charset", mEncoding);
- try {
- in = new BufferedInputStream(urlConnection.getInputStream());
+ try (InputStream in = new BufferedInputStream(urlConnection.getInputStream())) {
return FileUtils.readStringFromStream(in, getEncoding(urlConnection));
} finally {
urlConnection.disconnect();
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- // ignored
- }
- }
}
} catch (IOException e) {
Log.e(TAG, "Problem getting search suggestions", e);