Firebase Test Lab CI integration for app module (#381)

tobrun · zugaldia · commit dc3483249c91 · 2017-03-08T14:07:33.000-08:00
* reformat yaml

* make project compile again

* update bitrise.yml with Firebase Test Lab integration

* fixup project name

* fixup path to apk

* readd initialize method to fix CI issue

* readd initialize method to fix CI issue with non-null value

* download access token before compiling the apk

* fix npe
diff --git a/mapbox/app/src/main/java/com/mapbox/services/android/testapp/distance/DistanceActivity.java b/mapbox/app/src/main/java/com/mapbox/services/android/testapp/distance/DistanceActivity.java
@@ -176,7 +176,7 @@ public void onFailure(Call<DistanceResponse> call, Throwable throwable) {
   private void addMarkers() {
     for (int i = 0; i < restaurants.size(); i++) {
       CircleLayer circleLayer = new CircleLayer(
-              restaurants.get(i).getStringProperty("name") + "-circle-layer",
+        restaurants.get(i).getStringProperty("name") + "-circle-layer",
         restaurants.get(i).getStringProperty("name") + "-source"
       ).withProperties(
         circleColor(Color.parseColor("#e55e5e")),
@@ -207,12 +207,11 @@ private void addMarkers() {
   private void updateLayers() {
 
     for (int i = 0; i < restaurants.size(); i++) {
-
-      if (mapboxMap.getLayer(restaurants.get(i).getStringProperty("name" + "-layer")) != null) {
+      if (restaurants.get(i).hasProperty("name" + "-layer")
+        && mapboxMap.getLayer(restaurants.get(i).getStringProperty("name" + "-layer")) != null) {
         mapboxMap.removeLayer(restaurants.get(i).getStringProperty("name") + "-layer");
       }
 
-
       SymbolLayer marker = new SymbolLayer(
         restaurants.get(i).getStringProperty("name") + "-layer",
         restaurants.get(i).getStringProperty("name") + "-source"
diff --git a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java
@@ -103,6 +103,14 @@ public void initialize(@NonNull Context context, @NonNull String accessToken,
     initialize(context, accessToken, userAgent);
   }
 
+  /*
+   * Temporary: re-added only for CI purposes
+   */
+  public void initialize(@NonNull Context context, @NonNull String accessToken,
+                         @NonNull LocationEngine locationEngine) {
+    initialize(context, accessToken, "userAgent", locationEngine);
+  }
+
   /**
    * Initialize MapboxTelemetry.
    *
diff --git a/scripts/bitrise.yml b/scripts/bitrise.yml

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,14 @@ public void initialize(@NonNull Context context, @NonNull String accessToken,`
`103`	`103`	`initialize(context, accessToken, userAgent);`
`104`	`104`	`}`
`105`	`105`
	`106`	`+ /*`
	`107`	`+ * Temporary: re-added only for CI purposes`
	`108`	`+ */`
	`109`	`+ public void initialize(@NonNull Context context, @NonNull String accessToken,`
	`110`	`+ @NonNull LocationEngine locationEngine) {`
	`111`	`+ initialize(context, accessToken, "userAgent", locationEngine);`
	`112`	`+ }`
	`113`	`+`
`106`	`114`	`/**`
`107`	`115`	`* Initialize MapboxTelemetry.`
`108`	`116`	`*`