Add dynamic offline routing to NavigationView #1829
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| package com.mapbox.services.android.navigation.ui.v5; | ||
|
|
||
| import android.annotation.SuppressLint; | ||
| import android.content.Context; | ||
| import android.net.ConnectivityManager; | ||
| import android.net.NetworkInfo; | ||
| import android.net.wifi.WifiInfo; | ||
| import android.net.wifi.WifiManager; | ||
|
|
||
| import java.util.HashMap; | ||
|
|
||
| class ConnectivityStatusProvider { | ||
|
|
||
| private final Context context; | ||
| private final WifiNetworkChecker wifiNetworkChecker; | ||
| private final MobileNetworkChecker mobileNetworkChecker; | ||
|
|
||
| ConnectivityStatusProvider(Context applicationContext) { | ||
| this.context = applicationContext; | ||
| this.wifiNetworkChecker = new WifiNetworkChecker(new HashMap<Integer, Boolean>()); | ||
| this.mobileNetworkChecker = new MobileNetworkChecker(new HashMap<Integer, Boolean>()); | ||
| } | ||
|
|
||
| boolean isConnected() { | ||
| NetworkInfo info = getNetworkInfo(context); | ||
| return (info != null && info.isConnected()); | ||
| } | ||
|
|
||
| boolean isConnectedFast() { | ||
| NetworkInfo info = getNetworkInfo(context); | ||
| int wifiLevel = getWifiLevel(context); | ||
| return (info != null | ||
| && info.isConnected() | ||
| && isConnectionFast(info.getType(), info.getSubtype(), wifiLevel)); | ||
| } | ||
|
|
||
| @SuppressLint("MissingPermission") | ||
| private NetworkInfo getNetworkInfo(Context context) { | ||
| ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); | ||
| return cm.getActiveNetworkInfo(); | ||
| } | ||
|
|
||
| @SuppressLint({"MissingPermission", "WifiManagerPotentialLeak"}) | ||
| private int getWifiLevel(Context context) { | ||
| WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); | ||
| int numberOfLevels = 5; | ||
| WifiInfo wifiInfo = wifiManager.getConnectionInfo(); | ||
| return WifiManager.calculateSignalLevel(wifiInfo.getRssi(), numberOfLevels); | ||
| } | ||
|
|
||
| private boolean isConnectionFast(int type, int networkType, int wifiLevel) { | ||
| if (type == ConnectivityManager.TYPE_WIFI) { | ||
| return wifiNetworkChecker.isFast(wifiLevel); | ||
| } else if (type == ConnectivityManager.TYPE_MOBILE) { | ||
| return mobileNetworkChecker.isFast(networkType); | ||
| } else { | ||
| return false; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package com.mapbox.services.android.navigation.ui.v5; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package com.mapbox.services.android.navigation.ui.v5; | ||
|
|
||
| import android.support.annotation.NonNull; | ||
| import android.telephony.TelephonyManager; | ||
|
|
||
| import java.util.HashMap; | ||
|
|
||
| class MobileNetworkChecker { | ||
|
|
||
| private final HashMap<Integer, Boolean> statusMap; | ||
|
|
||
| MobileNetworkChecker(HashMap<Integer, Boolean> statusMap) { | ||
| this.statusMap = statusMap; | ||
| initialize(statusMap); | ||
| } | ||
|
|
||
| @NonNull | ||
| Boolean isFast(Integer networkType) { | ||
| Boolean isConnectionFast = statusMap.get(networkType); | ||
| if (isConnectionFast == null) { | ||
| isConnectionFast = false; | ||
| } | ||
| return isConnectionFast; | ||
| } | ||
|
|
||
| private void initialize(HashMap<Integer, Boolean> statusMap) { | ||
| statusMap.put(TelephonyManager.NETWORK_TYPE_1xRTT, false); | ||
| statusMap.put(TelephonyManager.NETWORK_TYPE_GPRS, false); | ||
| statusMap.put(TelephonyManager.NETWORK_TYPE_CDMA, false); | ||
| statusMap.put(TelephonyManager.NETWORK_TYPE_EDGE, false); | ||
| statusMap.put(TelephonyManager.NETWORK_TYPE_IDEN, false); | ||
| statusMap.put(TelephonyManager.NETWORK_TYPE_UNKNOWN, false); | ||
|
|
||
| statusMap.put(TelephonyManager.NETWORK_TYPE_EVDO_0, true); | ||
| statusMap.put(TelephonyManager.NETWORK_TYPE_EVDO_A, true); | ||
| statusMap.put(TelephonyManager.NETWORK_TYPE_HSDPA, true); | ||
| statusMap.put(TelephonyManager.NETWORK_TYPE_HSPA, true); | ||
| statusMap.put(TelephonyManager.NETWORK_TYPE_HSUPA, true); | ||
| statusMap.put(TelephonyManager.NETWORK_TYPE_UMTS, true); | ||
| statusMap.put(TelephonyManager.NETWORK_TYPE_EHRPD, true); | ||
| statusMap.put(TelephonyManager.NETWORK_TYPE_EVDO_B, true); | ||
| statusMap.put(TelephonyManager.NETWORK_TYPE_HSPAP, true); | ||
| statusMap.put(TelephonyManager.NETWORK_TYPE_LTE, true); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| package com.mapbox.services.android.navigation.ui.v5; | ||
|
|
||
| import com.mapbox.services.android.navigation.v5.navigation.MapboxOfflineRouter; | ||
| import com.mapbox.services.android.navigation.v5.navigation.NavigationRoute; | ||
| import com.mapbox.services.android.navigation.v5.navigation.OfflineRoute; | ||
|
|
||
| import timber.log.Timber; | ||
|
|
||
| class NavigationViewOfflineRouter { | ||
|
Contributor
There was a problem hiding this comment. We have a lot of objects called
Contributor
Author
There was a problem hiding this comment. Not sure I completely follow regarding sole responsibility of configuration,
Contributor
There was a problem hiding this comment. Ok I understand what you are saying. Can we call this a |
||
|
|
||
| private final MapboxOfflineRouter offlineRouter; | ||
| private final NavigationViewRouter router; | ||
| private boolean isConfigured; | ||
| private String tileVersion; | ||
|
|
||
| NavigationViewOfflineRouter(MapboxOfflineRouter offlineRouter, NavigationViewRouter router) { | ||
| this.offlineRouter = offlineRouter; | ||
| this.router = router; | ||
| } | ||
|
|
||
| void configure(String tileVersion) { | ||
| if (!isConfigured || isNew(tileVersion)) { | ||
| offlineRouter.configure(tileVersion, new OfflineRouterConfiguredCallback(this)); | ||
| } | ||
| this.tileVersion = tileVersion; | ||
| } | ||
|
|
||
| void setIsConfigured(boolean isConfigured) { | ||
| this.isConfigured = isConfigured; | ||
| } | ||
|
|
||
| boolean isConfigured() { | ||
| return isConfigured; | ||
| } | ||
|
|
||
| void findRouteWith(NavigationRoute.Builder builder) { | ||
| if (!isConfigured) { | ||
| Timber.e("Cannot find route - offline router is not configured"); | ||
| return; | ||
|
Contributor
There was a problem hiding this comment. Should we give an error if not configured?
Contributor
Author
There was a problem hiding this comment. Yeah, good catch
Contributor
There was a problem hiding this comment. Should we throw an exception here? As it is, this would be a somewhat silent failure.
Contributor
Author
There was a problem hiding this comment. We actually won't call this method if this class isn't configured https://github.com/mapbox/mapbox-navigation-android/pull/1829/files#diff-29009b5750e50557cd5e8a7fd79a46f7R80. So we may not need this check at all?
Contributor
There was a problem hiding this comment. Yeah, let's remove it altogether then. |
||
| } | ||
|
|
||
| OfflineRoute offlineRoute = OfflineRoute.builder(builder).build(); | ||
| offlineRouter.findRoute(offlineRoute, new OfflineRouteFoundCallback(router)); | ||
| } | ||
|
|
||
| private boolean isNew(String tileVersion) { | ||
| return !this.tileVersion.equals(tileVersion); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should be careful here because you could be connected to a Wi-Fi but that doesn't mean to have connectivity e.g. you could be connected to a hotspot and don't have connection until you log in.
I believe we should implement something similar as with mobile connectivity. Maybe 👀 Wi-Fi strength?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is good to think about as an improvement but can possibly be deferred.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added a wifi strength "checker" to address this