1 files changed, 65 insertions, 47 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java
index 6906e90f6e..d2a46c63ae 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/StyleFileActivity.java
@@ -1,35 +1,28 @@
 package com.mapbox.mapboxsdk.testapp.activity.style;
 
+import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.RawRes;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
-import android.view.View;
 import android.widget.Toast;
 
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.testapp.R;
+import com.mapbox.mapboxsdk.testapp.utils.ResourceUtils;
 
-import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.io.Writer;
+import java.lang.ref.WeakReference;
 
 import timber.log.Timber;
 
 /**
- * Test activity showcasing how to use a file:// resource for the style.json
+ * Test activity showcasing how to use a file:// resource for the style.json and how to use MapboxMap#setStyleJson.
  */
 public class StyleFileActivity extends AppCompatActivity {
 
@@ -43,63 +36,88 @@ public class StyleFileActivity extends AppCompatActivity {
 
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
-    mapView.getMapAsync(new OnMapReadyCallback() {
-      @Override
-      public void onMapReady(@NonNull final MapboxMap map) {
-        mapboxMap = map;
-
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setColorFilter(ContextCompat.getColor(StyleFileActivity.this, R.color.primary));
-        fab.setOnClickListener(new View.OnClickListener() {
-          @Override
-          public void onClick(View view) {
-            Timber.i("Loading style file");
-            new CreateStyleFileTask().execute();
-          }
-        });
-      }
+    mapView.getMapAsync(map -> {
+      mapboxMap = map;
+
+      FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab_file);
+      fab.setColorFilter(ContextCompat.getColor(StyleFileActivity.this, R.color.primary));
+      fab.setOnClickListener(view -> new CreateStyleFileTask(view.getContext(), mapboxMap).execute());
+
+      FloatingActionButton fabStyleJson = (FloatingActionButton) findViewById(R.id.fab_style_json);
+      fabStyleJson.setColorFilter(ContextCompat.getColor(StyleFileActivity.this, R.color.primary));
+      fabStyleJson.setOnClickListener(view -> new LoadStyleFileTask(view.getContext(), mapboxMap).execute());
     });
   }
 
   /**
+   * Task to read a style file from the raw folder
+   */
+  private static class LoadStyleFileTask extends AsyncTask<Void, Void, String> {
+    private WeakReference<Context> context;
+    private WeakReference<MapboxMap> mapboxMap;
+
+    LoadStyleFileTask(Context context, MapboxMap mapboxMap) {
+      this.context = new WeakReference<>(context);
+      this.mapboxMap = new WeakReference<>(mapboxMap);
+    }
+
+    @Override
+    protected String doInBackground(Void... voids) {
+      String styleJson = "";
+      try {
+        styleJson = ResourceUtils.readRawResource(context.get(), R.raw.sat_style);
+      } catch (Exception exception) {
+        Timber.e(exception, "Can't load local file style");
+      }
+      return styleJson;
+    }
+
+    @Override
+    protected void onPostExecute(String json) {
+      super.onPostExecute(json);
+      Timber.d("Read json, %s", json);
+      MapboxMap mapboxMap = this.mapboxMap.get();
+      if (mapboxMap != null) {
+        mapboxMap.setStyleJson(json);
+      }
+    }
+  }
+
+  /**
    * Task to write a style file to local disk and load it in the map view
    */
-  private class CreateStyleFileTask extends AsyncTask<Void, Integer, Long> {
+  private static class CreateStyleFileTask extends AsyncTask<Void, Integer, Long> {
     private File cacheStyleFile;
+    private WeakReference<Context> context;
+    private WeakReference<MapboxMap> mapboxMap;
+
+    CreateStyleFileTask(Context context, MapboxMap mapboxMap) {
+      this.context = new WeakReference<>(context);
+      this.mapboxMap = new WeakReference<>(mapboxMap);
+    }
 
     @Override
     protected Long doInBackground(Void... params) {
       try {
         cacheStyleFile = File.createTempFile("my-", ".style.json");
         cacheStyleFile.createNewFile();
-        Timber.i("Writing style file to: " + cacheStyleFile.getAbsolutePath());
-        writeToFile(cacheStyleFile, readRawResource(R.raw.local_style));
+        Timber.i("Writing style file to: %s", cacheStyleFile.getAbsolutePath());
+        Context context = this.context.get();
+        if (context != null) {
+          writeToFile(cacheStyleFile, ResourceUtils.readRawResource(context, R.raw.local_style));
+        }
       } catch (Exception exception) {
-        Toast.makeText(StyleFileActivity.this, "Could not create style file in cache dir", Toast.LENGTH_SHORT).show();
+        Toast.makeText(context.get(), "Could not create style file in cache dir", Toast.LENGTH_SHORT).show();
       }
       return 1L;
     }
 
     protected void onPostExecute(Long result) {
       // Actual file:// usage
-      mapboxMap.setStyleUrl("file://" + cacheStyleFile.getAbsolutePath());
-    }
-
-    private String readRawResource(@RawRes int rawResource) throws IOException {
-      InputStream is = getResources().openRawResource(rawResource);
-      Writer writer = new StringWriter();
-      char[] buffer = new char[1024];
-      try {
-        Reader reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
-        int numRead;
-        while ((numRead = reader.read(buffer)) != -1) {
-          writer.write(buffer, 0, numRead);
-        }
-      } finally {
-        is.close();
+      MapboxMap mapboxMap = this.mapboxMap.get();
+      if (mapboxMap != null) {
+        mapboxMap.setStyleUrl("file://" + cacheStyleFile.getAbsolutePath());
       }
-
-      return writer.toString();
     }
 
     private void writeToFile(File file, String contents) throws IOException {