summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2018-04-11 12:05:48 +0200
committerŁukasz Paczos <lukas.paczos@gmail.com>2018-04-11 12:05:48 +0200
commit11cf6ba9dcc250394bc6db1948382bfc069a5cc0 (patch)
tree8fd35dcf76ec4ad2445e200b12ecd123bd980fbb
parent1edfa72d431406527e4eb26aad12e4d175cea737 (diff)
downloadqtlocation-mapboxgl-11cf6ba9dcc250394bc6db1948382bfc069a5cc0.tar.gz
[android] - removed AssetManager autoclose for string (reverted)
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java
index ed49a81dcf..cace2083da 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/GeoParseUtil.java
@@ -1,6 +1,7 @@
package com.mapbox.mapboxsdk.testapp.utils;
import android.content.Context;
+import android.content.res.AssetManager;
import android.text.TextUtils;
import com.mapbox.geojson.Feature;
@@ -23,9 +24,11 @@ public class GeoParseUtil {
if (TextUtils.isEmpty(fileName)) {
throw new NullPointerException("No GeoJSON File Name passed in.");
}
- try (InputStream is = context.getAssets().open(fileName)) {
- BufferedReader rd = new BufferedReader(new InputStreamReader(is, Charset.forName("UTF-8")));
- return readAll(rd);
+ try (AssetManager as = context.getAssets()) {
+ try (InputStream is = as.open(fileName)) {
+ BufferedReader rd = new BufferedReader(new InputStreamReader(is, Charset.forName("UTF-8")));
+ return readAll(rd);
+ }
}
}