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

Fix aidl copy file

Browse source
This commit is contained in:
crimean 2019-02-14 18:37:15 +03:00
parent 3d49967332
commit 95d7078fb6
9 changed files with 452 additions and 307 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/src/net/osmand/AndroidUtils.java
View file

@ -524,13 +524,4 @@ public class AndroidUtils {
}
return result;
}
public static void deleteRecursive(File fileOrDir){
if(fileOrDir.isDirectory()) {
for (File child: fileOrDir.listFiles()) {
deleteRecursive(child);
}
}
fileOrDir.delete();
}
}

2
OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl
View file

@ -79,7 +79,7 @@ import net.osmand.aidl.gpx.CreateGpxBitmapParams;
import net.osmand.aidl.tiles.ASqliteDbFile;
import net.osmand.aidl.plugins.PluginParams;
import net.osmand.aidl.tiles.CopyFileParams;
import net.osmand.aidl.copyfile.CopyFileParams;

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

@ -1,6 +1,5 @@
package net.osmand.aidl;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.BroadcastReceiver;
@ -29,6 +28,7 @@ import android.widget.ArrayAdapter;
import net.osmand.CallbackWithObject;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
import net.osmand.aidl.copyfile.CopyFileParams;
import net.osmand.aidl.favorite.AFavorite;
import net.osmand.aidl.favorite.group.AFavoriteGroup;
import net.osmand.aidl.gpx.AGpxBitmap;
@ -45,7 +45,6 @@ import net.osmand.aidl.navdrawer.NavDrawerFooterParams;
import net.osmand.aidl.plugins.PluginParams;
import net.osmand.aidl.search.SearchResult;
import net.osmand.aidl.tiles.ASqliteDbFile;
import net.osmand.aidl.tiles.CopyFileParams;
import net.osmand.data.FavouritePoint;
import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;
@ -100,13 +99,26 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.ref.WeakReference;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import static net.osmand.aidl.OsmandAidlConstants.*;
import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_IO_ERROR;
import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_MAX_LOCK_TIME_MS;
import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_PARAMS_ERROR;
import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_PART_SIZE_LIMIT;
import static net.osmand.aidl.OsmandAidlConstants.COPY_FILE_PART_SIZE_LIMIT_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.OK_RESPONSE;
import static net.osmand.plus.OsmAndCustomizationConstants.DRAWER_ITEM_ID_SCHEME;
public class OsmandAidlApi {
private static final Log LOG = PlatformUtil.getLog(OsmandAidlApi.class);
private static final String AIDL_REFRESH_MAP = "aidl_refresh_map";
@ -1738,7 +1750,7 @@ public class OsmandAidlApi {
private void clearNavDrawerItems(String appPackage) {
try {
JSONObject allItems = new JSONObject(app.getSettings().API_NAV_DRAWER_ITEMS_JSON.get());
allItems.put(appPackage, null);
allItems.put(appPackage, new JSONArray());
app.getSettings().API_NAV_DRAWER_ITEMS_JSON.set(allItems.toString());
} catch (JSONException e) {
e.printStackTrace();
@ -1965,92 +1977,96 @@ public class OsmandAidlApi {
private Map<String, FileCopyInfo> copyFilesCache = new ConcurrentHashMap<>();
private class FileCopyInfo {
long start;
long lastAccess;
FileOutputStream FileOutputStream;
long startTime;
long lastAccessTime;
FileOutputStream fileOutputStream;
FileCopyInfo(long start, long lastAccess, FileOutputStream fileOutputStream) {
this.start = start;
this.lastAccess = lastAccess;
FileOutputStream = fileOutputStream;
FileCopyInfo(long startTime, long lastAccessTime, FileOutputStream fileOutputStream) {
this.startTime = startTime;
this.lastAccessTime = lastAccessTime;
this.fileOutputStream = fileOutputStream;
}
}
int copyFile(final CopyFileParams filePart) {
if (Algorithms.isEmpty(filePart.getFilename()) || filePart.getFilePartData() == null) {
int copyFile(final CopyFileParams params) {
if (Algorithms.isEmpty(params.getFileName()) || params.getFilePartData() == null) {
return COPY_FILE_PARAMS_ERROR;
}
if (filePart.getFilename().endsWith(IndexConstants.SQLITE_EXT)) {
return copyFileImpl(filePart,
IndexConstants.TILES_INDEX_DIR);
if (params.getFilePartData().length > COPY_FILE_PART_SIZE_LIMIT) {
return COPY_FILE_PART_SIZE_LIMIT_ERROR;
}
if (params.getFileName().endsWith(IndexConstants.SQLITE_EXT)) {
return copyFileImpl(params, IndexConstants.TILES_INDEX_DIR);
} else {
return COPY_FILE_UNSUPPORTED_FILE_TYPE_ERROR;
}
}
private int copyFileImpl(CopyFileParams fileParams, String destination){
if (fileParams.getFilePartData().length > 256*1024) {
return COPY_FILE_PART_SIZE_LIMIT_ERROR;
private int copyFileImpl(CopyFileParams params, String destinationDir) {
File file = app.getAppPath(IndexConstants.TEMP_DIR + params.getFileName());
File tempDir = app.getAppPath(IndexConstants.TEMP_DIR);
if (!tempDir.exists()) {
tempDir.mkdirs();
}
File file = app.getAppPath(IndexConstants.TEMP_DIR + fileParams.getFilename());
FileOutputStream fos;
String key = fileParams.getFilename();
String fileName = params.getFileName();
File destFile = app.getAppPath(destinationDir + fileName);
long currentTime = System.currentTimeMillis();
try {
if (!copyFilesCache.containsKey(key)){
if (fileParams.getActionId() == COPY_FILE_START_FLAG) {
file.delete();
file.getParentFile().mkdirs();
fos = new FileOutputStream(file, true);
fos.write(fileParams.getFilePartData());
copyFilesCache.put(
key, new FileCopyInfo(fileParams.getStartTime(), System.currentTimeMillis(),
fos));
return COPY_FILE_OK_RESPONSE;
} else if (fileParams.getActionId() == COPY_FILE_FINISH_FLAG) {
file.delete();
file.getParentFile().mkdirs();
fos = new FileOutputStream(file, true);
fos.write(fileParams.getFilePartData());
file.renameTo(app.getAppPath(destination + fileParams.getFilename()));
return COPY_FILE_OK_RESPONSE;
} else {
return COPY_FILE_PARAMS_ERROR;
FileCopyInfo info = copyFilesCache.get(fileName);
if (info == null) {
FileOutputStream fos = new FileOutputStream(file, true);
copyFilesCache.put(fileName,
new FileCopyInfo(params.getStartTime(), currentTime, fos));
if (params.isDone()) {
if (!finishFileCopy(params, file, fos, fileName, destFile)) {
return COPY_FILE_IO_ERROR;
}
} else if (copyFilesCache.containsKey(key)) {
fos = copyFilesCache.get(key).FileOutputStream;
if (fileParams.getActionId() == COPY_FILE_START_FLAG) {
if (copyFilesCache.get(key).lastAccess - copyFilesCache.get(key).start > COPY_FILE_VALID_PAUSE) {
file.delete();
fos.close();
copyFilesCache.remove(key);
file.getParentFile().mkdirs();
fos = new FileOutputStream(file, true);
fos.write(fileParams.getFilePartData());
copyFilesCache.put(key,
new FileCopyInfo(fileParams.getStartTime(), System.currentTimeMillis(), fos));
return COPY_FILE_OK_RESPONSE;
} else {
fos.write(params.getFilePartData());
}
} else {
if (info.startTime != params.getStartTime()) {
if (currentTime - info.lastAccessTime < COPY_FILE_MAX_LOCK_TIME_MS) {
return COPY_FILE_WRITE_LOCK_ERROR;
}
} else if (fileParams.getActionId() == COPY_FILE_FINISH_FLAG) {
fos.close();
copyFilesCache.remove(key);
file.renameTo(app.getAppPath(destination + fileParams.getFilename()));
return COPY_FILE_OK_RESPONSE;
} else {
copyFilesCache.get(key).lastAccess = System.currentTimeMillis();
fos.write(fileParams.getFilePartData());
return COPY_FILE_OK_RESPONSE;
file.delete();
copyFilesCache.remove(fileName);
return copyFileImpl(params, destinationDir);
}
}
FileOutputStream fos = info.fileOutputStream;
info.lastAccessTime = currentTime;
if (params.isDone()) {
if (!finishFileCopy(params, file, fos, fileName, destFile)) {
return COPY_FILE_IO_ERROR;
}
} else {
fos.write(params.getFilePartData());
}
}
} catch (IOException e) {
LOG.error(e.getMessage(), e);
}
return COPY_FILE_IO_ERROR;
}
return OK_RESPONSE;
}
private boolean finishFileCopy(CopyFileParams params, File file, FileOutputStream fos, String fileName, File destFile) throws IOException {
boolean res = true;
byte[] data = params.getFilePartData();
if (data.length > 0) {
fos.write(data);
}
if (destFile.exists() && !destFile.delete()) {
res = false;
}
if (res && !file.renameTo(destFile)) {
file.delete();
res = false;
}
copyFilesCache.remove(fileName);
return res;
}
private static class GpxAsyncLoaderTask extends AsyncTask<Void, Void, GPXFile> {

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

@ -2,15 +2,20 @@ package net.osmand.aidl;
public interface OsmandAidlConstants {
int OK_RESPONSE = 0;
int MIN_UPDATE_TIME_MS = 1000;
long COPY_FILE_PART_SIZE_LIMIT = 256 * 1024;
long COPY_FILE_MAX_LOCK_TIME_MS = 10000;
int CANNOT_ACCESS_API_ERROR = -5;
int UNKNOWN_API_ERROR = -2;
int MIN_UPDATE_TIME_MS_ERROR = -1;
int COPY_FILE_PARAMS_ERROR = -1001;
int COPY_FILE_PART_SIZE_LIMIT_ERROR = -1002;
int COPY_FILE_WRITE_LOCK_ERROR = -1003;
int COPY_FILE_IO_ERROR = -1004;
int COPY_FILE_UNSUPPORTED_FILE_TYPE_ERROR = -1005;
int COPY_FILE_START_FLAG = 1001;
int COPY_FILE_FINISH_FLAG = 1002;
int COPY_FILE_IN_PROGRESS_FLAG = 1000;
long COPY_FILE_VALID_PAUSE = 10000;
int COPY_FILE_OK_RESPONSE = 0;
}

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

@ -66,7 +66,7 @@ import net.osmand.aidl.plugins.PluginParams;
import net.osmand.aidl.search.SearchParams;
import net.osmand.aidl.search.SearchResult;
import net.osmand.aidl.tiles.ASqliteDbFile;
import net.osmand.aidl.tiles.CopyFileParams;
import net.osmand.aidl.copyfile.CopyFileParams;
import net.osmand.plus.OsmandApplication;
import net.osmand.util.Algorithms;
@ -77,16 +77,17 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import static net.osmand.aidl.OsmandAidlConstants.CANNOT_ACCESS_API_ERROR;
import static net.osmand.aidl.OsmandAidlConstants.MIN_UPDATE_TIME_MS;
import static net.osmand.aidl.OsmandAidlConstants.MIN_UPDATE_TIME_MS_ERROR;
import static net.osmand.aidl.OsmandAidlConstants.UNKNOWN_API_ERROR;
public class OsmandAidlService extends Service {
private static final Log LOG = PlatformUtil.getLog(OsmandAidlService.class);
private static final String DATA_KEY_RESULT_SET = "resultSet";
private static final int MIN_UPDATE_TIME_MS = 1000;
private static final int MIN_UPDATE_TIME_MS_ERROR = -1;
private Map<Long, IOsmAndAidlCallback> callbacks;
private Handler mHandler = null;
HandlerThread mHandlerThread = new HandlerThread("OsmAndAidlServiceThread");
@ -137,7 +138,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean refreshMap() throws RemoteException {
public boolean refreshMap() {
try {
OsmandAidlApi api = getApi("refreshMap");
return api != null && api.reloadMap();
@ -149,7 +150,7 @@ public class OsmandAidlService extends Service {
@Override
public boolean addFavoriteGroup(AddFavoriteGroupParams params) throws RemoteException {
public boolean addFavoriteGroup(AddFavoriteGroupParams params) {
try {
OsmandAidlApi api = getApi("addFavoriteGroup");
return params != null && api != null && api.addFavoriteGroup(params.getFavoriteGroup());
@ -160,7 +161,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean removeFavoriteGroup(RemoveFavoriteGroupParams params) throws RemoteException {
public boolean removeFavoriteGroup(RemoveFavoriteGroupParams params) {
try {
OsmandAidlApi api = getApi("removeFavoriteGroup");
return params != null && api != null && api.removeFavoriteGroup(params.getFavoriteGroup());
@ -171,7 +172,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean updateFavoriteGroup(UpdateFavoriteGroupParams params) throws RemoteException {
public boolean updateFavoriteGroup(UpdateFavoriteGroupParams params) {
try {
OsmandAidlApi api = getApi("updateFavoriteGroup");
return params != null && api != null && api.updateFavoriteGroup(params.getFavoriteGroupPrev(), params.getFavoriteGroupNew());
@ -182,7 +183,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean addFavorite(AddFavoriteParams params) throws RemoteException {
public boolean addFavorite(AddFavoriteParams params) {
try {
OsmandAidlApi api = getApi("addFavorite");
return params != null && api != null && api.addFavorite(params.getFavorite());
@ -193,7 +194,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean removeFavorite(RemoveFavoriteParams params) throws RemoteException {
public boolean removeFavorite(RemoveFavoriteParams params) {
try {
OsmandAidlApi api = getApi("removeFavorite");
return params != null && api != null && api.removeFavorite(params.getFavorite());
@ -204,7 +205,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean updateFavorite(UpdateFavoriteParams params) throws RemoteException {
public boolean updateFavorite(UpdateFavoriteParams params) {
try {
OsmandAidlApi api = getApi("updateFavorite");
return params != null && api != null && api.updateFavorite(params.getFavoritePrev(), params.getFavoriteNew());
@ -215,7 +216,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean addMapMarker(AddMapMarkerParams params) throws RemoteException {
public boolean addMapMarker(AddMapMarkerParams params) {
try {
OsmandAidlApi api = getApi("addMapMarker");
return params != null && api != null && api.addMapMarker(params.getMarker());
@ -225,7 +226,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean removeMapMarker(RemoveMapMarkerParams params) throws RemoteException {
public boolean removeMapMarker(RemoveMapMarkerParams params) {
try {
OsmandAidlApi api = getApi("removeMapMarker");
return params != null && api != null && api.removeMapMarker(params.getMarker());
@ -236,7 +237,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean updateMapMarker(UpdateMapMarkerParams params) throws RemoteException {
public boolean updateMapMarker(UpdateMapMarkerParams params) {
try {
OsmandAidlApi api = getApi("updateMapMarker");
return params != null && api != null && api.updateMapMarker(params.getMarkerPrev(), params.getMarkerNew());
@ -247,7 +248,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean addMapWidget(AddMapWidgetParams params) throws RemoteException {
public boolean addMapWidget(AddMapWidgetParams params) {
try {
OsmandAidlApi api = getApi("addMapWidget");
return params != null && api != null && api.addMapWidget(params.getWidget());
@ -258,7 +259,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean removeMapWidget(RemoveMapWidgetParams params) throws RemoteException {
public boolean removeMapWidget(RemoveMapWidgetParams params) {
try {
OsmandAidlApi api = getApi("removeMapWidget");
return params != null && api != null && api.removeMapWidget(params.getId());
@ -268,7 +269,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean updateMapWidget(UpdateMapWidgetParams params) throws RemoteException {
public boolean updateMapWidget(UpdateMapWidgetParams params) {
try {
OsmandAidlApi api = getApi("updateMapWidget");
return params != null && api != null && api.updateMapWidget(params.getWidget());
@ -279,7 +280,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean showMapPoint(ShowMapPointParams params) throws RemoteException {
public boolean showMapPoint(ShowMapPointParams params) {
try {
OsmandAidlApi api = getApi("showMapPoint");
return params != null && api != null && api.showMapPoint(params.getLayerId(), params.getPoint());
@ -290,7 +291,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean addMapPoint(AddMapPointParams params) throws RemoteException {
public boolean addMapPoint(AddMapPointParams params) {
try {
OsmandAidlApi api = getApi("addMapPoint");
return params != null && api != null && api.putMapPoint(params.getLayerId(), params.getPoint());
@ -301,7 +302,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean removeMapPoint(RemoveMapPointParams params) throws RemoteException {
public boolean removeMapPoint(RemoveMapPointParams params) {
try {
OsmandAidlApi api = getApi("removeMapPoint");
return params != null && api != null && api.removeMapPoint(params.getLayerId(), params.getPointId());
@ -312,7 +313,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean updateMapPoint(UpdateMapPointParams params) throws RemoteException {
public boolean updateMapPoint(UpdateMapPointParams params) {
try {
OsmandAidlApi api = getApi("updateMapPoint");
return params != null && api != null && api.putMapPoint(params.getLayerId(), params.getPoint());
@ -323,7 +324,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean addMapLayer(AddMapLayerParams params) throws RemoteException {
public boolean addMapLayer(AddMapLayerParams params) {
try {
OsmandAidlApi api = getApi("addMapLayer");
return params != null && api != null && api.addMapLayer(params.getLayer());
@ -334,7 +335,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean removeMapLayer(RemoveMapLayerParams params) throws RemoteException {
public boolean removeMapLayer(RemoveMapLayerParams params) {
try {
OsmandAidlApi api = getApi("removeMapLayer");
return params != null && api != null && api.removeMapLayer(params.getId());
@ -345,7 +346,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean updateMapLayer(UpdateMapLayerParams params) throws RemoteException {
public boolean updateMapLayer(UpdateMapLayerParams params) {
try {
OsmandAidlApi api = getApi("updateMapLayer");
return params != null && api != null && api.updateMapLayer(params.getLayer());
@ -356,7 +357,8 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean importGpx(ImportGpxParams params) throws RemoteException {
public boolean importGpx(ImportGpxParams params) {
try {
if (params != null && !Algorithms.isEmpty(params.getDestinationPath())) {
OsmandAidlApi api = getApi("importGpx");
if (api != null) {
@ -373,59 +375,94 @@ public class OsmandAidlService extends Service {
}
}
return false;
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean showGpx(ShowGpxParams params) throws RemoteException {
public boolean showGpx(ShowGpxParams params) {
try {
if (params != null && params.getFileName() != null) {
OsmandAidlApi api = getApi("showGpx");
return api != null && api.showGpx(params.getFileName());
}
return false;
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean hideGpx(HideGpxParams params) throws RemoteException {
public boolean hideGpx(HideGpxParams params) {
try {
if (params != null && params.getFileName() != null) {
OsmandAidlApi api = getApi("hideGpx");
return api != null && api.hideGpx(params.getFileName());
}
return false;
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean getActiveGpx(List<ASelectedGpxFile> files) throws RemoteException {
public boolean getActiveGpx(List<ASelectedGpxFile> files) {
try {
OsmandAidlApi api = getApi("getActiveGpx");
return api != null && api.getActiveGpx(files);
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean getImportedGpx(List<AGpxFile> files) throws RemoteException {
public boolean getImportedGpx(List<AGpxFile> files) {
try {
OsmandAidlApi api = getApi("getImportedGpx");
return api != null && api.getImportedGpx(files);
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean removeGpx(RemoveGpxParams params) throws RemoteException {
public boolean removeGpx(RemoveGpxParams params) {
try {
if (params != null && params.getFileName() != null) {
OsmandAidlApi api = getApi("removeGpx");
return api != null && api.removeGpx(params.getFileName());
}
return false;
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean setMapLocation(SetMapLocationParams params) throws RemoteException {
public boolean setMapLocation(SetMapLocationParams params) {
try {
if (params != null) {
OsmandAidlApi api = getApi("setMapLocation");
return api != null && api.setMapLocation(params.getLatitude(), params.getLongitude(),
params.getZoom(), params.isAnimated());
}
return false;
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean calculateRoute(CalculateRouteParams params) throws RemoteException {
public boolean calculateRoute(CalculateRouteParams params) {
try {
if (params == null || params.getEndPoint() == null) {
return false;
} else {
@ -473,10 +510,14 @@ public class OsmandAidlService extends Service {
*/
return true;
}
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean startGpxRecording(StartGpxRecordingParams params) throws RemoteException {
public boolean startGpxRecording(StartGpxRecordingParams params) {
try {
OsmandAidlApi api = getApi("startGpxRecording");
return api != null && api.startGpxRecording(params);
@ -487,7 +528,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean stopGpxRecording(StopGpxRecordingParams params) throws RemoteException {
public boolean stopGpxRecording(StopGpxRecordingParams params) {
try {
OsmandAidlApi api = getApi("stopGpxRecording");
return api != null && api.stopGpxRecording(params);
@ -498,7 +539,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean takePhotoNote(TakePhotoNoteParams params) throws RemoteException {
public boolean takePhotoNote(TakePhotoNoteParams params) {
try {
OsmandAidlApi api = getApi("takePhotoNote");
return params != null && api != null && api.takePhotoNote(params.getLatitude(), params.getLongitude());
@ -509,7 +550,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean startVideoRecording(StartVideoRecordingParams params) throws RemoteException {
public boolean startVideoRecording(StartVideoRecordingParams params) {
try {
OsmandAidlApi api = getApi("startVideoRecording");
return params != null && api != null && api.startVideoRecording(params.getLatitude(), params.getLongitude());
@ -520,7 +561,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean startAudioRecording(StartAudioRecordingParams params) throws RemoteException {
public boolean startAudioRecording(StartAudioRecordingParams params) {
try {
OsmandAidlApi api = getApi("startAudioRecording");
return params != null && api != null && api.startAudioRecording(params.getLatitude(), params.getLongitude());
@ -531,7 +572,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean stopRecording(StopRecordingParams params) throws RemoteException {
public boolean stopRecording(StopRecordingParams params) {
try {
OsmandAidlApi api = getApi("stopRecording");
return api != null && api.stopRecording();
@ -542,7 +583,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean navigate(NavigateParams params) throws RemoteException {
public boolean navigate(NavigateParams params) {
try {
OsmandAidlApi api = getApi("navigate");
return params != null && api != null && api.navigate(
@ -556,7 +597,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean navigateGpx(NavigateGpxParams params) throws RemoteException {
public boolean navigateGpx(NavigateGpxParams params) {
try {
OsmandAidlApi api = getApi("navigateGpx");
return params != null && api != null && api.navigateGpx(params.getData(), params.getUri(), params.isForce());
@ -567,7 +608,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean pauseNavigation(PauseNavigationParams params) throws RemoteException {
public boolean pauseNavigation(PauseNavigationParams params) {
try {
OsmandAidlApi api = getApi("pauseNavigation");
return api != null && api.pauseNavigation();
@ -578,7 +619,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean resumeNavigation(ResumeNavigationParams params) throws RemoteException {
public boolean resumeNavigation(ResumeNavigationParams params) {
try {
OsmandAidlApi api = getApi("resumeNavigation");
return api != null && api.resumeNavigation();
@ -589,7 +630,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean stopNavigation(StopNavigationParams params) throws RemoteException {
public boolean stopNavigation(StopNavigationParams params) {
try {
OsmandAidlApi api = getApi("stopNavigation");
return api != null && api.stopNavigation();
@ -600,7 +641,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean muteNavigation(MuteNavigationParams params) throws RemoteException {
public boolean muteNavigation(MuteNavigationParams params) {
try {
OsmandAidlApi api = getApi("muteNavigation");
return api != null && api.muteNavigation();
@ -611,7 +652,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean unmuteNavigation(UnmuteNavigationParams params) throws RemoteException {
public boolean unmuteNavigation(UnmuteNavigationParams params) {
try {
OsmandAidlApi api = getApi("unmuteNavigation");
return api != null && api.unmuteNavigation();
@ -622,7 +663,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean setNavDrawerItems(SetNavDrawerItemsParams params) throws RemoteException {
public boolean setNavDrawerItems(SetNavDrawerItemsParams params) {
try {
OsmandAidlApi api = getApi("setNavDrawerItems");
return params != null && api != null && api.setNavDrawerItems(params.getAppPackage(), params.getItems());
@ -633,7 +674,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean search(SearchParams params, final IOsmAndAidlCallback callback) throws RemoteException {
public boolean search(SearchParams params, final IOsmAndAidlCallback callback) {
try {
OsmandAidlApi api = getApi("search");
return params != null && api != null && api.search(params.getSearchQuery(), params.getSearchType(),
@ -658,7 +699,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean navigateSearch(NavigateSearchParams params) throws RemoteException {
public boolean navigateSearch(NavigateSearchParams params) {
try {
OsmandAidlApi api = getApi("navigateSearch");
return params != null && api != null && api.navigateSearch(
@ -672,7 +713,8 @@ public class OsmandAidlService extends Service {
}
@Override
public long registerForUpdates(long updateTimeMS, IOsmAndAidlCallback callback) throws RemoteException {
public long registerForUpdates(long updateTimeMS, IOsmAndAidlCallback callback) {
try {
if (updateTimeMS >= MIN_UPDATE_TIME_MS) {
updateCallbackId++;
callbacks.put(updateCallbackId, callback);
@ -681,44 +723,79 @@ public class OsmandAidlService extends Service {
} else {
return MIN_UPDATE_TIME_MS_ERROR;
}
} catch (Exception e) {
handleException(e);
return UNKNOWN_API_ERROR;
}
}
@Override
public boolean unregisterFromUpdates(long callbackId) throws RemoteException {
public boolean unregisterFromUpdates(long callbackId) {
try {
return callbacks.remove(callbackId) != null;
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean setNavDrawerLogo(String imageUri) throws RemoteException {
public boolean setNavDrawerLogo(String imageUri) {
try {
OsmandAidlApi api = getApi("setNavDrawerLogo");
return api != null && api.setNavDrawerLogo(imageUri);
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean setEnabledIds(List<String> ids) throws RemoteException {
public boolean setEnabledIds(List<String> ids) {
try {
OsmandAidlApi api = getApi("setFeaturesEnabledIds");
return api != null && api.setEnabledIds(ids);
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean setDisabledIds(List<String> ids) throws RemoteException {
public boolean setDisabledIds(List<String> ids) {
try {
OsmandAidlApi api = getApi("setFeaturesDisabledIds");
return api != null && api.setDisabledIds(ids);
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean setEnabledPatterns(List<String> patterns) throws RemoteException {
public boolean setEnabledPatterns(List<String> patterns) {
try {
OsmandAidlApi api = getApi("setFeaturesEnabledPatterns");
return api != null && api.setEnabledPatterns(patterns);
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean setDisabledPatterns(List<String> patterns) throws RemoteException {
public boolean setDisabledPatterns(List<String> patterns) {
try {
OsmandAidlApi api = getApi("setFeaturesDisabledPatterns");
return api != null && api.setDisabledPatterns(patterns);
} catch (Exception e) {
handleException(e);
return false;
}
}
void startRemoteUpdates(final long updateTimeMS, final long callbackId, final IOsmAndAidlCallback callback) {
try {
mHandler.postDelayed(new Runnable() {
@Override
public void run() {
@ -735,79 +812,135 @@ public class OsmandAidlService extends Service {
}
}
}, updateTimeMS);
} catch (Exception e) {
handleException(e);
}
}
@Override
public boolean regWidgetVisibility(SetWidgetsParams params) throws RemoteException {
public boolean regWidgetVisibility(SetWidgetsParams params) {
try {
OsmandAidlApi api = getApi("regWidgetVisibility");
return api != null && api.regWidgetVisibility(params.getWidgetKey(), params.getAppModesKeys());
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean regWidgetAvailability(SetWidgetsParams params) throws RemoteException {
public boolean regWidgetAvailability(SetWidgetsParams params) {
try {
OsmandAidlApi api = getApi("regWidgetVisibility");
return api != null && api.regWidgetAvailability(params.getWidgetKey(), params.getAppModesKeys());
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean customizeOsmandSettings(OsmandSettingsParams params) throws RemoteException {
public boolean customizeOsmandSettings(OsmandSettingsParams params) {
try {
OsmandAidlApi api = getApi("customizeOsmandSettings");
return api != null && api.customizeOsmandSettings(params.getSharedPreferencesName(), params.getBundle());
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean getSqliteDbFiles(List<ASqliteDbFile> files) throws RemoteException {
public boolean getSqliteDbFiles(List<ASqliteDbFile> files) {
try {
OsmandAidlApi api = getApi("getSqliteDbFiles");
return api != null && api.getSqliteDbFiles(files);
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean getActiveSqliteDbFiles(List<ASqliteDbFile> files) throws RemoteException {
public boolean getActiveSqliteDbFiles(List<ASqliteDbFile> files) {
try {
OsmandAidlApi api = getApi("getActiveSqliteDbFiles");
return api != null && api.getActiveSqliteDbFiles(files);
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean showSqliteDbFile(String fileName) throws RemoteException {
public boolean showSqliteDbFile(String fileName) {
try {
OsmandAidlApi api = getApi("showSqliteDbFile");
return api != null && api.showSqliteDbFile(fileName);
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean hideSqliteDbFile(String fileName) throws RemoteException {
public boolean hideSqliteDbFile(String fileName) {
try {
OsmandAidlApi api = getApi("hideSqliteDbFile");
return api != null && api.hideSqliteDbFile(fileName);
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean setNavDrawerLogoWithParams(NavDrawerHeaderParams params) throws RemoteException {
public boolean setNavDrawerLogoWithParams(NavDrawerHeaderParams params) {
try {
OsmandAidlApi api = getApi("setNavDrawerLogoWithParams");
return api != null && api.setNavDrawerLogoWithParams(
params.getImageUri(), params.getPackageName(), params.getIntent());
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean setNavDrawerFooterWithParams(NavDrawerFooterParams params)
throws RemoteException {
public boolean setNavDrawerFooterWithParams(NavDrawerFooterParams params) {
try {
OsmandAidlApi api = getApi("setNavDrawerFooterParams");
return api != null && api.setNavDrawerFooterWithParams(params);
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean restoreOsmand() {
try {
OsmandAidlApi api = getApi("restoreOsmand");
return api != null && api.restoreOsmand();
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean changePluginState(PluginParams params) {
try {
OsmandAidlApi api = getApi("changePluginState");
return api != null && api.changePluginState(params);
} catch (Exception e) {
handleException(e);
return false;
}
}
@Override
public boolean registerForOsmandInitListener(final IOsmAndAidlCallback callback)
throws RemoteException {
public boolean registerForOsmandInitListener(final IOsmAndAidlCallback callback) {
try {
OsmandAidlApi api = getApi("registerForOsmandInitListener");
return api != null && api.registerForOsmandInitialization(new OsmandAppInitCallback() {
@ -827,7 +960,7 @@ public class OsmandAidlService extends Service {
}
@Override
public boolean getBitmapForGpx(CreateGpxBitmapParams params, final IOsmAndAidlCallback callback) throws RemoteException {
public boolean getBitmapForGpx(CreateGpxBitmapParams params, final IOsmAndAidlCallback callback) {
try {
OsmandAidlApi api = getApi("getBitmapForGpx");
return params != null && api != null && api.getBitmapForGpx(params.getGpxUri(), params.getDensity(), params.getWidthPixels(), params.getHeightPixels(), params.getColor(), new GpxBitmapCreatedCallback() {
@ -848,11 +981,16 @@ public class OsmandAidlService extends Service {
@Override
public int copyFile(CopyFileParams copyFileParams) {
try {
OsmandAidlApi api = getApi("copyFile");
if (api==null) {
return -5;
if (api == null) {
return CANNOT_ACCESS_API_ERROR;
}
return api.copyFile(copyFileParams);
} catch (Exception e) {
handleException(e);
return UNKNOWN_API_ERROR;
}
}
};
}

3
OsmAnd/src/net/osmand/aidl/copyfile/CopyFileParams.aidl Normal file
View file

@ -0,0 +1,3 @@
package net.osmand.aidl.copyfile;
parcelable CopyFileParams;

44
OsmAnd/src/net/osmand/aidl/tiles/CopyFileParams.java → OsmAnd/src/net/osmand/aidl/copyfile/CopyFileParams.java
View file

@ -1,33 +1,32 @@
package net.osmand.aidl.tiles;
package net.osmand.aidl.copyfile;
import android.os.Parcel;
import android.os.Parcelable;
import java.util.Arrays;
import android.support.annotation.NonNull;
public class CopyFileParams implements Parcelable {
private String filename;
private String fileName;
private byte[] filePartData;
private long startTime;
private int actionId;
private boolean done;
public CopyFileParams(String filename, byte[] filePartData, long startTime, int actionId) {
this.filename = filename;
public CopyFileParams(@NonNull String fileName, @NonNull byte[] filePartData, long startTime, boolean done) {
this.fileName = fileName;
this.filePartData = filePartData;
this.startTime = startTime;
this.actionId = actionId;
this.done = done;
}
public String getFilename() {
return filename;
public String getFileName() {
return fileName;
}
public byte[] getFilePartData() {
return filePartData;
}
public int getActionId() {
return actionId;
public boolean isDone() {
return done;
}
public long getStartTime() {
@ -35,10 +34,10 @@ public class CopyFileParams implements Parcelable {
}
protected CopyFileParams(Parcel in) {
filename = in.readString();
fileName = in.readString();
filePartData = in.createByteArray();
startTime = in.readLong();
actionId = in.readInt();
done = in.readByte() == 0;
}
public static final Creator<CopyFileParams> CREATOR = new Creator<CopyFileParams>() {
@ -61,22 +60,19 @@ public class CopyFileParams implements Parcelable {
@Override
public String toString() {
return "CopyFileParams{" +
"filename='" + filename + '\'' +
", filePartData=" + filePartData +
return "CopyFileParams {" +
" fileName=" + fileName +
", filePartData size=" + filePartData.length +
", startTime=" + startTime +
", actionId=" + actionId +
'}';
", done=" + done +
" }";
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(filename);
dest.writeString(fileName);
dest.writeByteArray(filePartData);
dest.writeLong(startTime);
dest.writeInt(actionId);
dest.writeByte((byte) (done ? 0 : 1));
}
}

3
OsmAnd/src/net/osmand/aidl/tiles/CopyFileParams.aidl
View file

@ -1,3 +0,0 @@
package net.osmand.aidl.tiles;
parcelable CopyFileParams;

3
OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file

@ -26,7 +26,6 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import net.osmand.AndroidUtils;
import net.osmand.CallbackWithObject;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
@ -172,7 +171,7 @@ public class OsmandApplication extends MultiDexApplication {
externalStorageDirectory = osmandSettings.getInternalAppPath();
}
AndroidUtils.deleteRecursive(this.getAppPath(IndexConstants.TEMP_DIR));
Algorithms.removeAllFiles(this.getAppPath(IndexConstants.TEMP_DIR));
checkPreferredLocale();
appInitializer.onCreateApplication();