Skip to content

Commit 14fdda3

Browse files
fix location engines activation calling on connected method if the location engine was already connected (#587)
1 parent 14852c6 commit 14fdda3

2 files changed

Lines changed: 22 additions & 6 deletions

File tree

mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/GoogleLocationEngine.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ public static synchronized LocationEngine getLocationEngine(Context context) {
4848

4949
@Override
5050
public void activate() {
51-
if (googleApiClient != null && !googleApiClient.isConnected()) {
52-
googleApiClient.connect();
53-
}
51+
connect();
5452
}
5553

5654
@Override
@@ -140,4 +138,14 @@ public void onLocationChanged(Location location) {
140138
listener.onLocationChanged(location);
141139
}
142140
}
141+
142+
private void connect() {
143+
if (googleApiClient != null) {
144+
if (googleApiClient.isConnected()) {
145+
onConnected(null);
146+
} else {
147+
googleApiClient.connect();
148+
}
149+
}
150+
}
143151
}

mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LostLocationEngine.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ public static synchronized LocationEngine getLocationEngine(Context context) {
4747
*/
4848
@Override
4949
public void activate() {
50-
if (lostApiClient != null && !lostApiClient.isConnected()) {
51-
lostApiClient.connect();
52-
}
50+
connect();
5351
}
5452

5553
/**
@@ -167,4 +165,14 @@ public void onLocationChanged(Location location) {
167165
listener.onLocationChanged(location);
168166
}
169167
}
168+
169+
private void connect() {
170+
if (lostApiClient != null) {
171+
if (lostApiClient.isConnected()) {
172+
onConnected();
173+
} else {
174+
lostApiClient.connect();
175+
}
176+
}
177+
}
170178
}

0 commit comments

Comments
 (0)