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

Fix review

Browse source
This commit is contained in:
Dima-1 2020-10-06 17:41:59 +03:00
parent ad31b0842a
commit 4ef3667c59
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-api/src/net/osmand/aidlapi/profile/ExportSettingsType.aidl → OsmAnd-api/src/net/osmand/aidlapi/profile/AExportSettingsType.aidl
View file

@ -1,3 +1,3 @@
package net.osmand.aidlapi.profile; package net.osmand.aidlapi.profile;
parcelable ExportSettingsType; parcelable AExportSettingsType;

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

@ -2352,11 +2352,11 @@ public class OsmandAidlApi {
} }
List<SettingsHelper.SettingsItem> settingsItems = new ArrayList<>(); List<SettingsHelper.SettingsItem> settingsItems = new ArrayList<>();
settingsItems.add(new SettingsHelper.ProfileSettingsItem(app, appMode)); settingsItems.add(new SettingsHelper.ProfileSettingsItem(app, appMode));
File tempDir = FileUtils.getTempDir(app); File exportDir = app.getSettings().getExternalStorageDirectory();
String fileName = appMode.toHumanString(); String fileName = appMode.toHumanString();
SettingsHelper settingsHelper = app.getSettingsHelper(); SettingsHelper settingsHelper = app.getSettingsHelper();
settingsItems.addAll(settingsHelper.getFilteredSettingsItems(settingsHelper.getAdditionalData(), settingsTypes)); settingsItems.addAll(settingsHelper.getFilteredSettingsItems(settingsHelper.getAdditionalData(), settingsTypes));
settingsHelper.exportSettings(tempDir, fileName, null, settingsItems, true); settingsHelper.exportSettings(exportDir, fileName, null, settingsItems, true);
return true; return true;
} }
return false; return false;
@ -2403,9 +2403,9 @@ public class OsmandAidlApi {
} else if (fileName.endsWith(IndexConstants.GPX_FILE_EXT)) { } else if (fileName.endsWith(IndexConstants.GPX_FILE_EXT)) {
if (destinationDir.startsWith(IndexConstants.GPX_INDEX_DIR) if (destinationDir.startsWith(IndexConstants.GPX_INDEX_DIR)
&& !FILE_TO_SAVE.equals(fileName)) { && !FILE_TO_SAVE.equals(fileName)) {
showGpx(new File(destinationDir, fileName).getName()); destinationDir = destinationDir.replaceFirst(IndexConstants.GPX_INDEX_DIR, "");
showGpx(new File(destinationDir, fileName).getPath());
} else if (destinationDir.isEmpty() && FILE_TO_SAVE.equals(fileName)) { } else if (destinationDir.isEmpty() && FILE_TO_SAVE.equals(fileName)) {
GPXUtilities.loadGPXFile(new File(destinationDir, fileName));
app.getFavorites().loadFavorites(); app.getFavorites().loadFavorites();
} }
} }