Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Navigation Update aidl method refactoring.

Browse source
This commit is contained in:
madwasp79 2019-04-15 09:52:06 +03:00
parent 94f1da830a
commit 575e936d2e
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
View file

@ -45,7 +45,6 @@ import net.osmand.aidl.mapmarker.AMapMarker;
import net.osmand.aidl.mapwidget.AMapWidget; import net.osmand.aidl.mapwidget.AMapWidget;
import net.osmand.aidl.navdrawer.NavDrawerFooterParams; import net.osmand.aidl.navdrawer.NavDrawerFooterParams;
import net.osmand.aidl.navigation.ADirectionInfo; import net.osmand.aidl.navigation.ADirectionInfo;
import net.osmand.aidl.navigation.ANavigationUpdateParams;
import net.osmand.aidl.plugins.PluginParams; import net.osmand.aidl.plugins.PluginParams;
import net.osmand.aidl.search.SearchResult; import net.osmand.aidl.search.SearchResult;
import net.osmand.aidl.tiles.ASqliteDbFile; import net.osmand.aidl.tiles.ASqliteDbFile;
@ -124,6 +123,7 @@ import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_PART_SIZE_LIMIT_ERRO
import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_UNSUPPORTED_FILE_TYPE_ERROR; import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_UNSUPPORTED_FILE_TYPE_ERROR;
import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_WRITE_LOCK_ERROR; import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_WRITE_LOCK_ERROR;
import static net.osmand.aidl.OsmandAidlConstants.OK_RESPONSE; import static net.osmand.aidl.OsmandAidlConstants.OK_RESPONSE;
import static net.osmand.aidl.OsmandAidlService.KEY_ON_NAV_DATA_UPDATE;
import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_ITEM_ID_SCHEME; import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_ITEM_ID_SCHEME;
public class OsmandAidlApi { public class OsmandAidlApi {
@ -198,9 +198,6 @@ public class OsmandAidlApi {
private boolean mapActivityActive = false; private boolean mapActivityActive = false;
private Map<Long, IOsmAndAidlCallback> callbacks = new HashMap<>();
private long updateCallbackId = 0;
public OsmandAidlApi(OsmandApplication app) { public OsmandAidlApi(OsmandApplication app) {
this.app = app; this.app = app;
loadConnectedApps(); loadConnectedApps();
@ -1945,11 +1942,13 @@ public class OsmandAidlApi {
directionInfo.setTurnType(ndi.directionInfo.getTurnType().getValue()); directionInfo.setTurnType(ndi.directionInfo.getTurnType().getValue());
} }
} }
for (Entry<Long, IOsmAndAidlCallback> cb : callbacks.entrySet()) { for (Entry<Long, OsmandAidlService.AidlCallbackParams> cb : OsmandAidlService.getAidlCallbacks().entrySet()) {
try { if (cb.getValue().getKey() == KEY_ON_NAV_DATA_UPDATE) { //add bitwise check instead
cb.getValue().updateNavigationInfo(directionInfo); try {
} catch (Exception e) { cb.getValue().getCallback().updateNavigationInfo(directionInfo);
LOG.debug(e.getMessage(), e); } catch (Exception e) {
LOG.debug(e.getMessage(), e);
}
} }
} }
} }

2
OsmAnd/src/net/osmand/aidl/OsmandAidlService.java
View file

@ -1037,7 +1037,7 @@ public class OsmandAidlService extends Service {
} }
}; };
private static class AidlCallbackParams { public static class AidlCallbackParams {
private IOsmAndAidlCallback callback; private IOsmAndAidlCallback callback;
private long key; private long key;