Skip to content

Commit 4ee3c7f

Browse files
committed
mark core classes with UIThread annotation
1 parent df05b41 commit 4ee3c7f

File tree

13 files changed

+40
-14
lines changed

13 files changed

+40
-14
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Mapbox welcomes participation and contributions from everyone.
55
## Unreleased
66
#### Features
77
#### Bug fixes and improvements
8+
- Marked `ReplayProgressObserver`, `MapboxReplayer`, `ReplayLocationEngine`, `RerouteController#RoutesCallback`, `NavigationRerouteController#RoutesCallback`, `LocationObserver`, `NavigationSessionStateObserver`, `OffRouteObserver`, `RouteProgressObserver`, `TripSessionStateObserver`, `VoiceInstructionsObserver` methods with `@UiThread` annotation. [#6266](https://github.com/mapbox/mapbox-navigation-android/pull/6266)
89

910
## Mapbox Navigation SDK 2.9.0-alpha.3 - 23 September, 2022
1011
### Changelog
@@ -65,7 +66,6 @@ This release depends on, and has been tested with, the following Mapbox dependen
6566
- Mapbox Android Core `v5.0.2` ([release notes](https://github.com/mapbox/mapbox-events-android/releases/tag/core-5.0.2))
6667
- Mapbox Android Telemetry `v8.1.5` ([release notes](https://github.com/mapbox/mapbox-events-android/releases/tag/telem-8.1.5-core-5.0.2))
6768

68-
6969
## Mapbox Navigation SDK 2.9.0-alpha.2 - 16 September, 2022
7070
### Changelog
7171
[Changes between v2.9.0-alpha.1 and v2.9.0-alpha.2](https://github.com/mapbox/mapbox-navigation-android/compare/v2.9.0-alpha.1...v2.9.0-alpha.2)

libnavigation-core/api/current.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ package com.mapbox.navigation.core.navigator {
374374

375375
package com.mapbox.navigation.core.replay {
376376

377-
public final class MapboxReplayer {
377+
@UiThread public final class MapboxReplayer {
378378
ctor public MapboxReplayer();
379379
method public void clearEvents();
380380
method public double durationSeconds();
@@ -394,7 +394,7 @@ package com.mapbox.navigation.core.replay {
394394
method public void unregisterObservers();
395395
}
396396

397-
public final class ReplayLocationEngine implements com.mapbox.android.core.location.LocationEngine com.mapbox.navigation.core.replay.history.ReplayEventsObserver {
397+
@UiThread public final class ReplayLocationEngine implements com.mapbox.android.core.location.LocationEngine com.mapbox.navigation.core.replay.history.ReplayEventsObserver {
398398
ctor public ReplayLocationEngine(com.mapbox.navigation.core.replay.MapboxReplayer mapboxReplayer);
399399
method public void getLastLocation(com.mapbox.android.core.location.LocationEngineCallback<com.mapbox.android.core.location.LocationEngineResult> callback);
400400
method public void removeLocationUpdates(com.mapbox.android.core.location.LocationEngineCallback<com.mapbox.android.core.location.LocationEngineResult> callback);
@@ -527,7 +527,7 @@ package com.mapbox.navigation.core.replay.route {
527527
ctor public ReplayProgressObserver(com.mapbox.navigation.core.replay.MapboxReplayer mapboxReplayer, com.mapbox.navigation.core.replay.route.ReplayRouteMapper replayRouteMapper = com.mapbox.navigation.core.replay.route.ReplayRouteMapper());
528528
ctor public ReplayProgressObserver(com.mapbox.navigation.core.replay.MapboxReplayer mapboxReplayer);
529529
method public void onRouteProgressChanged(com.mapbox.navigation.base.trip.model.RouteProgress routeProgress);
530-
method public com.mapbox.navigation.core.replay.route.ReplayProgressObserver updateOptions(com.mapbox.navigation.core.replay.route.ReplayRouteOptions options);
530+
method @UiThread public com.mapbox.navigation.core.replay.route.ReplayProgressObserver updateOptions(com.mapbox.navigation.core.replay.route.ReplayRouteOptions options);
531531
}
532532

533533
public final class ReplayRouteMapper {
@@ -583,15 +583,15 @@ package com.mapbox.navigation.core.replay.route {
583583

584584
package com.mapbox.navigation.core.reroute {
585585

586-
public interface NavigationRerouteController extends com.mapbox.navigation.core.reroute.RerouteController {
586+
@UiThread public interface NavigationRerouteController extends com.mapbox.navigation.core.reroute.RerouteController {
587587
method public void reroute(com.mapbox.navigation.core.reroute.NavigationRerouteController.RoutesCallback callback);
588588
}
589589

590-
public static fun interface NavigationRerouteController.RoutesCallback {
590+
@UiThread public static fun interface NavigationRerouteController.RoutesCallback {
591591
method public void onNewRoutes(java.util.List<com.mapbox.navigation.base.route.NavigationRoute> routes, com.mapbox.navigation.base.route.RouterOrigin routerOrigin);
592592
}
593593

594-
public interface RerouteController {
594+
@UiThread public interface RerouteController {
595595
method public com.mapbox.navigation.core.reroute.RerouteState getState();
596596
method public void interrupt();
597597
method public boolean registerRerouteStateObserver(com.mapbox.navigation.core.reroute.RerouteController.RerouteStateObserver rerouteStateObserver);
@@ -604,7 +604,7 @@ package com.mapbox.navigation.core.reroute {
604604
method public void onRerouteStateChanged(com.mapbox.navigation.core.reroute.RerouteState rerouteState);
605605
}
606606

607-
public static fun interface RerouteController.RoutesCallback {
607+
@UiThread public static fun interface RerouteController.RoutesCallback {
608608
method public void onNewRoutes(java.util.List<? extends com.mapbox.api.directions.v5.models.DirectionsRoute> routes);
609609
}
610610

@@ -930,7 +930,7 @@ package com.mapbox.navigation.core.trip.session {
930930
property public final Integer? zLevel;
931931
}
932932

933-
public interface LocationObserver {
933+
@UiThread public interface LocationObserver {
934934
method public void onNewLocationMatcherResult(com.mapbox.navigation.core.trip.session.LocationMatcherResult locationMatcherResult);
935935
method public void onNewRawLocation(android.location.Location rawLocation);
936936
}
@@ -960,19 +960,19 @@ package com.mapbox.navigation.core.trip.session {
960960
field public static final com.mapbox.navigation.core.trip.session.NavigationSessionState.Idle INSTANCE;
961961
}
962962

963-
public fun interface NavigationSessionStateObserver {
963+
@UiThread public fun interface NavigationSessionStateObserver {
964964
method public void onNavigationSessionStateChanged(com.mapbox.navigation.core.trip.session.NavigationSessionState navigationSession);
965965
}
966966

967-
public fun interface OffRouteObserver {
967+
@UiThread public fun interface OffRouteObserver {
968968
method public void onOffRouteStateChanged(boolean offRoute);
969969
}
970970

971971
@Deprecated public fun interface RoadObjectsOnRouteObserver {
972972
method @Deprecated public void onNewRoadObjectsOnTheRoute(java.util.List<com.mapbox.navigation.base.trip.model.roadobject.UpcomingRoadObject> roadObjects);
973973
}
974974

975-
public fun interface RouteProgressObserver {
975+
@UiThread public fun interface RouteProgressObserver {
976976
method public void onRouteProgressChanged(com.mapbox.navigation.base.trip.model.RouteProgress routeProgress);
977977
}
978978

@@ -981,11 +981,11 @@ package com.mapbox.navigation.core.trip.session {
981981
enum_constant public static final com.mapbox.navigation.core.trip.session.TripSessionState STOPPED;
982982
}
983983

984-
public fun interface TripSessionStateObserver {
984+
@UiThread public fun interface TripSessionStateObserver {
985985
method public void onSessionStateChanged(com.mapbox.navigation.core.trip.session.TripSessionState tripSessionState);
986986
}
987987

988-
public fun interface VoiceInstructionsObserver {
988+
@UiThread public fun interface VoiceInstructionsObserver {
989989
method public void onNewVoiceInstructions(com.mapbox.api.directions.v5.models.VoiceInstructions voiceInstructions);
990990
}
991991

libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/MapboxReplayer.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.Manifest.permission.ACCESS_COARSE_LOCATION
44
import android.Manifest.permission.ACCESS_FINE_LOCATION
55
import android.content.Context
66
import androidx.annotation.RequiresPermission
7+
import androidx.annotation.UiThread
78
import com.mapbox.android.core.location.LocationEngine
89
import com.mapbox.android.core.location.LocationEngineCallback
910
import com.mapbox.android.core.location.LocationEngineProvider
@@ -20,6 +21,7 @@ import java.util.Collections.singletonList
2021
/**
2122
* This class is similar to a music player. It will include controls like play, pause, seek.
2223
*/
24+
@UiThread
2325
class MapboxReplayer {
2426

2527
private val replayEvents = ReplayEvents(mutableListOf())

libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/ReplayLocationEngine.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.app.PendingIntent
44
import android.location.Location
55
import android.os.Looper
66
import android.os.SystemClock
7+
import androidx.annotation.UiThread
78
import com.mapbox.android.core.location.LocationEngine
89
import com.mapbox.android.core.location.LocationEngineCallback
910
import com.mapbox.android.core.location.LocationEngineRequest
@@ -19,6 +20,7 @@ private typealias EngineCallback = LocationEngineCallback<LocationEngineResult>
1920
/**
2021
* Location Engine for replaying route history.
2122
*/
23+
@UiThread
2224
class ReplayLocationEngine(
2325
private val mapboxReplayer: MapboxReplayer
2426
) : LocationEngine, ReplayEventsObserver {

libnavigation-core/src/main/java/com/mapbox/navigation/core/replay/route/ReplayProgressObserver.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.mapbox.navigation.core.replay.route
22

3+
import androidx.annotation.UiThread
34
import com.mapbox.api.directions.v5.models.RouteLeg
45
import com.mapbox.geojson.Point
56
import com.mapbox.navigation.base.trip.model.RouteProgress
@@ -31,6 +32,7 @@ class ReplayProgressObserver @JvmOverloads constructor(
3132
* @param options allow you to control the driver and car behavior.
3233
* @return [ReplayProgressObserver]
3334
*/
35+
@UiThread
3436
fun updateOptions(options: ReplayRouteOptions): ReplayProgressObserver {
3537
replayRouteMapper.options = options
3638
return this

libnavigation-core/src/main/java/com/mapbox/navigation/core/reroute/NavigationRerouteController.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.mapbox.navigation.core.reroute
22

3+
import androidx.annotation.UiThread
34
import com.mapbox.navigation.base.route.NavigationRoute
45
import com.mapbox.navigation.base.route.RouterOrigin
56
import com.mapbox.navigation.core.MapboxNavigation
@@ -9,6 +10,7 @@ import com.mapbox.navigation.core.trip.session.OffRouteObserver
910
* Reroute controller allows changing the reroute logic externally. Use [MapboxNavigation.rerouteController]
1011
* to replace it.
1112
*/
13+
@UiThread
1214
interface NavigationRerouteController : RerouteController {
1315

1416
/**
@@ -23,6 +25,7 @@ interface NavigationRerouteController : RerouteController {
2325
* Route Callback is useful to set new route(s) on reroute event. Doing the same as
2426
* [MapboxNavigation.setRoutes].
2527
*/
28+
@UiThread
2629
fun interface RoutesCallback {
2730
/**
2831
* Called whenever new route(s) has been fetched.

libnavigation-core/src/main/java/com/mapbox/navigation/core/reroute/RerouteController.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.mapbox.navigation.core.reroute
22

3+
import androidx.annotation.UiThread
34
import com.mapbox.api.directions.v5.models.DirectionsRoute
45
import com.mapbox.navigation.base.route.RouterFailure
56
import com.mapbox.navigation.base.route.RouterOrigin
@@ -11,6 +12,7 @@ import com.mapbox.navigation.core.trip.session.OffRouteObserver
1112
* Reroute controller allows changing the reroute logic externally. Use [MapboxNavigation.rerouteController]
1213
* to replace it.
1314
*/
15+
@UiThread
1416
interface RerouteController {
1517

1618
/**
@@ -51,6 +53,7 @@ interface RerouteController {
5153
* Route Callback is useful to set new route(s) on reroute event. Doing the same as
5254
* [MapboxNavigation.setRoutes].
5355
*/
56+
@UiThread
5457
fun interface RoutesCallback {
5558
/**
5659
* Called whenever new route(s) has been fetched.

libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/LocationObserver.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package com.mapbox.navigation.core.trip.session
22

33
import android.location.Location
4+
import androidx.annotation.UiThread
45

56
/**
67
* An interface which enables listening to location updates
78
*
89
* @see [LocationMatcherResult]
910
*/
11+
@UiThread
1012
interface LocationObserver {
1113

1214
/**

libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/NavigationSessionStateObserver.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package com.mapbox.navigation.core.trip.session
22

3+
import androidx.annotation.UiThread
4+
35
/**
46
* Callback that provides the various session states that can happen within a navigation session
57
*
68
* @see NavigationSessionState
79
*/
10+
@UiThread
811
fun interface NavigationSessionStateObserver {
912
/**
1013
* Called whenever the navigation session state has changed

libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/OffRouteObserver.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.mapbox.navigation.core.trip.session
22

3+
import androidx.annotation.UiThread
34
import com.mapbox.navigation.core.MapboxNavigation
45

56
/**
67
* This interface is for turn-by-turn route navigation, but not in free-drive mode.
78
* This interface can be registered via a [MapboxNavigation] object.
89
*/
10+
@UiThread
911
fun interface OffRouteObserver {
1012
/**
1113
* Called whenever the user is off route

0 commit comments

Comments
 (0)