mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed crash caused with moving data to sd card.

Browse source
This commit is contained in:
Dmitry Yunitsky 2014-07-18 15:21:47 +03:00 • committed by Alex Zolotarev
parent 59695302d8
commit 14f5d0e43a
2 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/src/com/mapswithme/maps/Framework.java
View file

@ -44,11 +44,6 @@ public class Framework
return nativeGetBookmarksExt();
}
static public String[] GetMovableFilesExt()
{
return nativeGetMovablefilesExt();
}
static public void SetWritableDir(String newPath)
{
nativeSetWritableDir(newPath);
@ -180,7 +175,7 @@ public class Framework
public native static void cleanSearchLayerOnMap();
public native static void invalidate();
private native static String[] nativeGetMovablefilesExt();
public native static String[] nativeGetMovableFilesExt();
private native static String nativeGetBookmarksExt();
private native static String nativeGetBookmarkDir();
private native static String nativeGetSettingsDir();

30
android/src/com/mapswithme/util/StoragePathManager.java
View file

@ -1,19 +1,5 @@
package com.mapswithme.util;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.nio.channels.FileChannel;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.AlertDialog;
@ -37,6 +23,20 @@ import android.widget.TextView;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.R;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.nio.channels.FileChannel;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
public class StoragePathManager
{
public static class StorageItem
@ -549,7 +549,7 @@ public class StoragePathManager
assert (newDir.isDirectory());
assert (oldDir.isDirectory());
final String[] extensions = Framework.GetMovableFilesExt();
final String[] extensions = Framework.nativeGetMovableFilesExt();
File[] internalFiles = oldDir.listFiles(new FileFilter()
{