Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #17526 AIDL remove GPX does not work #17650

Merged
merged 7 commits into from
Aug 1, 2023
Merged

Fix #17526 AIDL remove GPX does not work #17650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b1a8a9a
Move GPX navigation related methods to a separate helper class
nazar-kutz Jul 17, 2023
b473b4f
Add ability to set custom file name of navigation GPX
nazar-kutz Jul 17, 2023
30e2c9d
Add ability to get relative GPX file path
nazar-kutz Jul 17, 2023
465ac80
Improve ability to remove gpx via AIDL
nazar-kutz Jul 17, 2023
968fa66
Merge branch 'r4.5' into FixAidlGpx
Chumva Jul 31, 2023
f7d1d0d
Fix aidl track import
Chumva Aug 1, 2023
ba7f6bb
Remove unnecessary changes
Chumva Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OsmAnd-api/src/net/osmand/aidlapi/IOsmAndAidlInterface.aidl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ interface IOsmAndAidlInterface {
* @param gpxUri (Uri) - URI created by FileProvider.
* @param force (boolean) - ask to stop current navigation if any. False - ask. True - don't ask.
*/
boolean navigateGpx(in NavigateGpxParams params);
boolean navigateGpx(inout NavigateGpxParams params);

/**
* Remove GPX file.
Expand Down
11 changes: 11 additions & 0 deletions OsmAnd-api/src/net/osmand/aidlapi/gpx/AGpxFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
public class AGpxFile extends AidlParams {

private String fileName;
private String relativePath;
private long modifiedTime;
private long fileSize;
private boolean active;
Expand Down Expand Up @@ -46,6 +47,14 @@ public String getFileName() {
return fileName;
}

public String getRelativePath() {
return relativePath;
}

public void setRelativePath(String relativePath) {
this.relativePath = relativePath;
}

public long getModifiedTime() {
return modifiedTime;
}
Expand All @@ -69,6 +78,7 @@ public AGpxFileDetails getDetails() {
@Override
public void writeToBundle(Bundle bundle) {
bundle.putString("fileName", fileName);
bundle.putString("relativePath", relativePath);
bundle.putLong("modifiedTime", modifiedTime);
bundle.putLong("fileSize", fileSize);
bundle.putBoolean("active", active);
Expand All @@ -80,6 +90,7 @@ public void writeToBundle(Bundle bundle) {
protected void readFromBundle(Bundle bundle) {
bundle.setClassLoader(AGpxFileDetails.class.getClassLoader());
fileName = bundle.getString("fileName");
relativePath = bundle.getString("relativePath");
modifiedTime = bundle.getLong("modifiedTime");
fileSize = bundle.getLong("fileSize");
active = bundle.getBoolean("active");
Expand Down
11 changes: 11 additions & 0 deletions OsmAnd-api/src/net/osmand/aidlapi/gpx/RemoveGpxParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
public class RemoveGpxParams extends AidlParams {

private String fileName;
private String relativePath;

public RemoveGpxParams(String fileName) {
this.fileName = fileName;
Expand All @@ -33,13 +34,23 @@ public String getFileName() {
return fileName;
}

public String getRelativePath() {
return relativePath;
}

public void setRelativePath(String relativePath) {
this.relativePath = relativePath;
}

@Override
public void writeToBundle(Bundle bundle) {
bundle.putString("fileName", fileName);
bundle.putString("relativePath", relativePath);
}

@Override
protected void readFromBundle(Bundle bundle) {
fileName = bundle.getString("fileName");
relativePath = bundle.getString("relativePath");
}
}
17 changes: 14 additions & 3 deletions OsmAnd-api/src/net/osmand/aidlapi/navigation/NavigateGpxParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@

public class NavigateGpxParams extends AidlParams {

private String data;
private Uri uri;
private String data;
private String fileName;
private boolean force;
private boolean needLocationPermission;
private boolean passWholeRoute;
Expand Down Expand Up @@ -45,12 +46,20 @@ public NavigateGpxParams[] newArray(int size) {
}
};

public Uri getUri() {
return uri;
}

public String getData() {
return data;
}

public Uri getUri() {
return uri;
public String getFileName() {
return fileName;
}

public void setFileName(String fileName) {
this.fileName = fileName;
}

public boolean isForce() {
Expand Down Expand Up @@ -103,6 +112,7 @@ public void writeToBundle(Bundle bundle) {
bundle.putBoolean("snapToRoad", snapToRoad);
bundle.putString("snapToRoadMode", snapToRoadMode);
bundle.putInt("snapToRoadThreshold", snapToRoadThreshold);
bundle.putString("fileName", fileName);
}

@Override
Expand All @@ -115,5 +125,6 @@ protected void readFromBundle(Bundle bundle) {
snapToRoad = bundle.getBoolean("snapToRoad");
snapToRoadMode = bundle.getString("snapToRoadMode");
snapToRoadThreshold = bundle.getInt("snapToRoadThreshold");
fileName = bundle.getString("fileName");
}
}
127 changes: 30 additions & 97 deletions OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.ParcelFileDescriptor;
import android.view.KeyEvent;
Expand All @@ -43,6 +42,7 @@
import com.google.gson.reflect.TypeToken;

import net.osmand.CallbackWithObject;
import net.osmand.aidlapi.navigation.NavigateGpxParams;
import net.osmand.gpx.GPXUtilities;
import net.osmand.gpx.GPXFile;
import net.osmand.gpx.GPXTrackAnalysis;
Expand Down Expand Up @@ -79,8 +79,8 @@
import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo;
import net.osmand.plus.helpers.ColorDialogs;
import net.osmand.plus.helpers.ExternalApiHelper;
import net.osmand.plus.helpers.GpxNavigationParams;
import net.osmand.plus.helpers.LockHelper;
import net.osmand.plus.helpers.NavigateGpxHelper;
import net.osmand.plus.mapcontextmenu.MapContextMenu;
import net.osmand.plus.mapcontextmenu.other.IContextMenuButtonListener;
import net.osmand.plus.mapmarkers.MapMarker;
Expand Down Expand Up @@ -121,6 +121,7 @@
import net.osmand.plus.track.GpxSelectionParams;
import net.osmand.plus.track.helpers.GPXDatabase.GpxDataItem;
import net.osmand.plus.track.helpers.GpxSelectionHelper;
import net.osmand.plus.track.helpers.GpxUiHelper;
import net.osmand.plus.track.helpers.SelectedGpxFile;
import net.osmand.plus.utils.AndroidUtils;
import net.osmand.plus.utils.FileUtils;
Expand Down Expand Up @@ -199,14 +200,8 @@ public class OsmandAidlApi {
private static final String AIDL_DEST_LAT = "aidl_dest_lat";
private static final String AIDL_DEST_LON = "aidl_dest_lon";
private static final String AIDL_PROFILE = "aidl_profile";
private static final String AIDL_DATA = "aidl_data";
private static final String AIDL_URI = "aidl_uri";
private static final String AIDL_FORCE = "aidl_force";
private static final String AIDL_LOCATION_PERMISSION = "aidl_location_permission";
private static final String AIDL_PASS_WHOLE_ROUTE = "aidl_pass_whole_route";
private static final String AIDL_SNAP_TO_ROAD = "aidl_snap_to_road";
private static final String AIDL_SNAP_TO_ROAD_MODE = "aidl_snap_to_road_mode";
private static final String AIDL_SNAP_TO_ROAD_THRESHOLD = "aidl_snap_to_road_threshold";
private static final String AIDL_SEARCH_QUERY = "aidl_search_query";
private static final String AIDL_SEARCH_LAT = "aidl_search_lat";
private static final String AIDL_SEARCH_LON = "aidl_search_lon";
Expand All @@ -220,7 +215,6 @@ public class OsmandAidlApi {
private static final String AIDL_STOP_RECORDING = "aidl_stop_recording";

private static final String AIDL_NAVIGATE = "aidl_navigate";
private static final String AIDL_NAVIGATE_GPX = "aidl_navigate_gpx";
private static final String AIDL_NAVIGATE_SEARCH = "aidl_navigate_search";
private static final String AIDL_PAUSE_NAVIGATION = "pause_navigation";
private static final String AIDL_RESUME_NAVIGATION = "resume_navigation";
Expand Down Expand Up @@ -280,7 +274,6 @@ public void onCreateMapActivity(@NonNull MapActivity mapActivity) {
registerStartAudioRecordingReceiver(mapActivity);
registerStopRecordingReceiver(mapActivity);
registerNavigateReceiver(mapActivity);
registerNavigateGpxReceiver(mapActivity);
registerNavigateSearchReceiver(mapActivity);
registerPauseNavigationReceiver(mapActivity);
registerResumeNavigationReceiver(mapActivity);
Expand Down Expand Up @@ -668,13 +661,13 @@ public void onReceive(Context context, Intent intent) {
boolean locationPermission = intent.getBooleanExtra(AIDL_LOCATION_PERMISSION, false);
if (routingHelper.isFollowingMode() && !force) {
mapActivity.getMapActions().stopNavigationActionConfirm(dialog -> {
MapActivity mapActivity1 = mapActivityRef.get();
if (mapActivity1 != null && !routingHelper.isFollowingMode()) {
ExternalApiHelper.startNavigation(mapActivity1, start, startDesc, dest, destDesc, profile, locationPermission);
MapActivity activity = mapActivityRef.get();
if (activity != null && !routingHelper.isFollowingMode()) {
NavigateGpxHelper.startNavigation(activity, profile, start, startDesc, dest, destDesc, locationPermission);
}
});
} else {
ExternalApiHelper.startNavigation(mapActivity, start, startDesc, dest, destDesc, profile, locationPermission);
NavigateGpxHelper.startNavigation(mapActivity, profile, start, startDesc, dest, destDesc, locationPermission);
}
}
}
Expand Down Expand Up @@ -748,53 +741,6 @@ public void onReceive(Context context, Intent intent) {
registerReceiver(navigateSearchReceiver, mapActivity, AIDL_NAVIGATE_SEARCH);
}

private void registerNavigateGpxReceiver(@NonNull MapActivity mapActivity) {
WeakReference<MapActivity> mapActivityRef = new WeakReference<>(mapActivity);
BroadcastReceiver navigateGpxReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
MapActivity mapActivity = mapActivityRef.get();
if (mapActivity != null) {
GPXFile gpx = loadGpxFileFromIntent(mapActivity, intent);
if (gpx != null) {
GpxNavigationParams params = new GpxNavigationParams();
params.setForce(intent.getBooleanExtra(AIDL_FORCE, false));
params.setCheckLocationPermission(intent.getBooleanExtra(AIDL_LOCATION_PERMISSION, false));
params.setPassWholeRoute(intent.getBooleanExtra(AIDL_PASS_WHOLE_ROUTE, false));
params.setSnapToRoad(intent.getBooleanExtra(AIDL_SNAP_TO_ROAD, false));
params.setSnapToRoadMode(intent.getStringExtra(AIDL_SNAP_TO_ROAD_MODE));
params.setSnapToRoadThreshold(intent.getIntExtra(AIDL_SNAP_TO_ROAD_THRESHOLD, 50));
ExternalApiHelper.saveAndNavigateGpx(mapActivity, gpx, params);
}
}
}

private GPXFile loadGpxFileFromIntent(@NonNull MapActivity mapActivity, @NonNull Intent intent) {
GPXFile gpx = null;
String gpxStr = intent.getStringExtra(AIDL_DATA);
if (!Algorithms.isEmpty(gpxStr)) {
gpx = GPXUtilities.loadGPXFile(new ByteArrayInputStream(gpxStr.getBytes()));
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
Uri gpxUri = intent.getParcelableExtra(AIDL_URI);
if (gpxUri != null) {
ParcelFileDescriptor gpxParcelDescriptor = null;
try {
gpxParcelDescriptor = mapActivity.getContentResolver().openFileDescriptor(gpxUri, "r");
} catch (FileNotFoundException e) {
e.printStackTrace();
}
if (gpxParcelDescriptor != null) {
FileDescriptor fileDescriptor = gpxParcelDescriptor.getFileDescriptor();
gpx = GPXUtilities.loadGPXFile(new FileInputStream(fileDescriptor));
}
}
}
return gpx;
}
};
registerReceiver(navigateGpxReceiver, mapActivity, AIDL_NAVIGATE_GPX);
}

private void registerPauseNavigationReceiver(@NonNull MapActivity mapActivity) {
WeakReference<MapActivity> mapActivityRef = new WeakReference<>(mapActivity);
BroadcastReceiver pauseNavigationReceiver = new BroadcastReceiver() {
Expand Down Expand Up @@ -1308,11 +1254,12 @@ private void finishGpxImport(boolean destinationExists, File destination, String
app.getRendererRegistry().getCurrentSelectedRenderer(), color);
if (!destinationExists) {
GpxDataItem gpxDataItem = new GpxDataItem(destination, col);
gpxDataItem.setApiImported(true);
gpxDataItem.setImportedByApi(true);
app.getGpxDbHelper().add(gpxDataItem);
} else {
GpxDataItem item = app.getGpxDbHelper().getItem(destination);
if (item != null) {
item.setImportedByApi(true);
app.getGpxDbHelper().updateColor(item, col);
}
}
Expand Down Expand Up @@ -1552,7 +1499,8 @@ boolean getImportedGpxV2(List<net.osmand.aidlapi.gpx.AGpxFile> files) {
File file = dataItem.getFile();
if (file.exists()) {
String fileName = file.getName();
boolean active = app.getSelectedGpxHelper().getSelectedFileByPath(file.getAbsolutePath()) != null;
String absolutePath = file.getAbsolutePath();
boolean active = app.getSelectedGpxHelper().getSelectedFileByPath(absolutePath) != null;
long modifiedTime = dataItem.getFileLastModifiedTime();
long fileSize = file.length();
int color = dataItem.getColor();
Expand All @@ -1565,7 +1513,10 @@ boolean getImportedGpxV2(List<net.osmand.aidlapi.gpx.AGpxFile> files) {
if (analysis != null) {
details = createGpxFileDetailsV2(analysis);
}
files.add(new net.osmand.aidlapi.gpx.AGpxFile(fileName, modifiedTime, fileSize, active, colorName, details));
net.osmand.aidlapi.gpx.AGpxFile gpxFile = new net.osmand.aidlapi.gpx.AGpxFile(fileName, modifiedTime, fileSize, active, colorName, details);
gpxFile.setRelativePath(GpxUiHelper.getGpxFileRelativePath(app, absolutePath));

files.add(gpxFile);
}
}
return true;
Expand Down Expand Up @@ -1607,16 +1558,18 @@ String getGpxColor(String gpxFileName) {
return null;
}

boolean removeGpx(String fileName) {
if (!Algorithms.isEmpty(fileName)) {
File f = app.getAppPath(IndexConstants.GPX_INDEX_DIR + fileName);
if (f.exists()) {
GpxDataItem item = app.getGpxDbHelper().getItem(f);
if (item != null && item.isApiImported()) {
Algorithms.removeAllFiles(f);
app.getGpxDbHelper().remove(f);
return true;
}
boolean removeGpx(@Nullable String fileName, @Nullable String relativePath) {
File file = null;
if (!Algorithms.isEmpty(relativePath)) {
file = app.getAppPath(IndexConstants.GPX_INDEX_DIR + relativePath);
} else if (!Algorithms.isEmpty(fileName)) {
file = app.getAppPath(IndexConstants.GPX_INDEX_DIR + fileName);
}

if (file != null && file.exists()) {
GpxDataItem item = app.getGpxDbHelper().getItem(file);
if (item != null && item.isImportedByApi()) {
return FileUtils.removeGpxFile(app, file);
}
}
return false;
Expand Down Expand Up @@ -1854,31 +1807,11 @@ boolean unmuteNavigation() {
}

boolean navigateGpx(String data, Uri uri, boolean force, boolean requestLocationPermission) {
Intent intent = new Intent();
intent.setAction(AIDL_NAVIGATE_GPX);
intent.putExtra(AIDL_DATA, data);
intent.putExtra(AIDL_URI, uri);
intent.putExtra(AIDL_FORCE, force);
intent.putExtra(AIDL_LOCATION_PERMISSION, requestLocationPermission);
app.sendBroadcast(intent);
return true;
return mapActivity != null && NavigateGpxHelper.saveAndNavigateGpx(mapActivity, data, uri, force, requestLocationPermission);
}

boolean navigateGpxV2(String data, Uri uri, boolean force, boolean requestLocationPermission,
boolean passWholeRoute, boolean snapToRoad, String snapToRoadMode,
int snapToRoadThreshold) {
Intent intent = new Intent();
intent.setAction(AIDL_NAVIGATE_GPX);
intent.putExtra(AIDL_DATA, data);
intent.putExtra(AIDL_URI, uri);
intent.putExtra(AIDL_FORCE, force);
intent.putExtra(AIDL_LOCATION_PERMISSION, requestLocationPermission);
intent.putExtra(AIDL_PASS_WHOLE_ROUTE, passWholeRoute);
intent.putExtra(AIDL_SNAP_TO_ROAD, snapToRoad);
intent.putExtra(AIDL_SNAP_TO_ROAD_MODE, snapToRoadMode);
intent.putExtra(AIDL_SNAP_TO_ROAD_THRESHOLD, snapToRoadThreshold);
app.sendBroadcast(intent);
return true;
boolean navigateGpxV2(@NonNull NavigateGpxParams params) {
return mapActivity != null && NavigateGpxHelper.saveAndNavigateGpx(mapActivity, params);
}

boolean setLockState(boolean lock) {
Expand Down
Loading