jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/364461 )
Change subject: Update MapBox to 5.1.0
......................................................................
Update MapBox to 5.1.0
Unfortunately, this doesn't fix T164317.
Change-Id: I3eb8b0c9cfb4b611f26d23f982d5716c4ff380b8
---
M app/build.gradle
M app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
2 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/build.gradle b/app/build.gradle
index 7f92afc..76f7ce7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -197,8 +197,7 @@
compile "com.squareup.retrofit2:converter-gson:$retrofitVersion"
compile 'com.github.ryanjohn1:onboarding:1.0.3'
compile "com.jakewharton:butterknife:$butterKnifeVersion"
- // When upgrading the Mapbox version, remove the superfluous ProGuard rule
and delete this comment
- compile('com.mapbox.mapboxsdk:mapbox-android-sdk:5.0.0@aar') {
+ compile('com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.0@aar') {
transitive = true
}
compile 'net.hockeyapp.android:HockeySDK:4.1.3'
diff --git a/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
b/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index eeab7c6..91f2d64 100644
--- a/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -34,6 +34,7 @@
import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
import com.mapbox.mapboxsdk.maps.Projection;
import com.mapbox.services.android.telemetry.MapboxTelemetry;
+import com.mapbox.services.android.telemetry.location.LocationEngine;
import com.mapbox.services.android.telemetry.location.LocationEngineListener;
import org.wikipedia.R;
@@ -84,6 +85,7 @@
@Nullable private MapboxMap mapboxMap;
private Icon markerIconPassive;
+ private LocationEngine locationEngine;
private NearbyClient client;
private NearbyResult lastResult;
@@ -131,7 +133,8 @@
}
}
-
LocationSource.getLocationEngine(getContext()).addLocationEngineListener(locationChangeListener);
+ locationEngine = new LocationSource(getContext());
+ locationEngine.addLocationEngineListener(locationChangeListener);
onLoading();
initializeMap();
@@ -167,7 +170,7 @@
@Override
public void onDestroyView() {
-
LocationSource.getLocationEngine(getContext()).removeLocationEngineListener(locationChangeListener);
+ locationEngine.removeLocationEngineListener(locationChangeListener);
mapView.onDestroy();
mapboxMap = null;
unbinder.unbind();
--
To view, visit https://gerrit.wikimedia.org/r/364461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3eb8b0c9cfb4b611f26d23f982d5716c4ff380b8
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
