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

Implementing map preference folder. (issue 154)

Browse source 
OsmandSettings has now methods for extending the storage folder or
getting the storage folder. It should not be taken from Environment
directly now, but from the settings.
- fixed some warnings
This commit is contained in:
Pavol Zibrita 2011-03-11 04:52:57 +01:00 committed by Victor Shcherb
parent b2bf8fbb46
commit a541591a5f
16 changed files with 111 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
DataExtractionOSM/src/crosby/binary/file/FileBlock.java
View file

@ -5,7 +5,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Arrays;
import java.util.zip.Deflater;
import com.google.protobuf.ByteString;

1
DataExtractionOSM/src/gnu/trove/map/hash/TFloatObjectHashMap.java
View file

@ -29,7 +29,6 @@ import gnu.trove.procedure.TFloatProcedure;
import gnu.trove.procedure.TObjectProcedure;
import gnu.trove.iterator.TFloatIterator;
import gnu.trove.iterator.TFloatObjectIterator;
import gnu.trove.iterator.TPrimitiveIterator;
import gnu.trove.function.TObjectFunction;
import gnu.trove.set.TFloatSet;
import gnu.trove.TFloatCollection;

1
DataExtractionOSM/src/gnu/trove/map/hash/TLongObjectHashMap.java
View file

@ -29,7 +29,6 @@ import gnu.trove.procedure.TLongProcedure;
import gnu.trove.procedure.TObjectProcedure;
import gnu.trove.iterator.TLongIterator;
import gnu.trove.iterator.TLongObjectIterator;
import gnu.trove.iterator.TPrimitiveIterator;
import gnu.trove.function.TObjectFunction;
import gnu.trove.set.TLongSet;
import gnu.trove.TLongCollection;

1
DataExtractionOSM/src/net/osmand/swing/OsmExtractionPreferencesDialog.java
View file

@ -7,7 +7,6 @@ import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
import javax.swing.BorderFactory;
import javax.swing.Box;

2
OsmAnd/res/values/strings.xml
View file

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<resources>
<string name="application_dir">Storage directory</string>
<string name="application_dir_change_warning">Changing storage directory will not move or delete the data. You must do it yourself! Do it at your own risk! Continue anyway?</string>
<string name="gps_status_app_not_found">GPS status application not installed. Search in Market?</string>
<string name="voice_is_not_available_msg">Voice guidance is not available. Please go to settings, choose preferrable voice data or download it.</string>

2
OsmAnd/res/xml/settings_pref.xml
View file

@ -45,7 +45,7 @@
<PreferenceScreen android:title="@string/general_settings" android:summary="@string/general_settings_descr">
<CheckBoxPreference android:key="use_internet_to_download_tiles" android:title="@string/use_internet" android:summary="@string/use_internet_to_download_tile"></CheckBoxPreference>
<EditTextPreference android:title="@string/application_dir" android:key="external_storage_dir"></EditTextPreference>
<ListPreference android:title="@string/max_level_download_tile" android:summary="@string/max_level_download_tile_descr"
android:key="max_level_download_tile"></ListPreference>
<CheckBoxPreference android:title="@string/auto_zoom_map" android:summary="@string/auto_zoom_map_descr" android:key="auto_zoom_map"></CheckBoxPreference>

23
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -450,6 +450,27 @@ public class OsmandSettings {
return prefs.getBoolean(MAP_VECTOR_DATA, false);
}
public static final String EXTERNAL_STORAGE_DIR = "external_storage_dir"; //$NON-NLS-1$
// public static final String MAP_TILE_SOURCES = "map_tile_sources"; //$NON-NLS-1$
public static File getExternalStorageDirectory(SharedPreferences prefs) {
return new File(prefs.getString(EXTERNAL_STORAGE_DIR, Environment.getExternalStorageDirectory().getAbsolutePath()));
}
public static File getExternalStorageDirectory(Context ctx) {
return getExternalStorageDirectory(getPrefs(ctx));
}
public static File extendOsmandPath(SharedPreferences prefs, String path)
{
return new File(getExternalStorageDirectory(prefs), path);
}
public static File extendOsmandPath(Context ctx, String path)
{
return new File(getExternalStorageDirectory(ctx), path);
}
public static ITileSource getMapTileSource(SharedPreferences prefs) {
String tileName = prefs.getString(MAP_TILE_SOURCES, null);
if (tileName != null) {
@ -460,7 +481,7 @@ public class OsmandSettings {
return l;
}
}
File tPath = new File(Environment.getExternalStorageDirectory(), ResourceManager.TILES_PATH);
File tPath = OsmandSettings.extendOsmandPath(prefs, ResourceManager.TILES_PATH);
File dir = new File(tPath, tileName);
if(dir.exists()){
if(tileName.endsWith(SQLiteTileSource.EXT)){

48
OsmAnd/src/net/osmand/plus/ResourceManager.java
View file

@ -35,10 +35,11 @@ import net.osmand.plus.views.POIMapLayer;
import org.apache.commons.logging.Log;
import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.database.sqlite.SQLiteException;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Environment;
/**
* Resource manager is responsible to work with all resources
@ -100,11 +101,22 @@ public class ResourceManager {
this.context = context;
this.renderer = new MapRenderRepositories(context);
asyncLoadingTiles.start();
dirWithTiles = new File(Environment.getExternalStorageDirectory(), TILES_PATH);
if(Environment.getExternalStorageDirectory().canRead()){
dirWithTiles.mkdirs();
}
OsmandSettings.getSharedPreferences(context).registerOnSharedPreferenceChangeListener(new OnSharedPreferenceChangeListener() {
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
String key) {
if (key == OsmandSettings.EXTERNAL_STORAGE_DIR) {
resetStoreDirectory();
}
}
});
resetStoreDirectory();
}
private void resetStoreDirectory()
{
dirWithTiles = OsmandSettings.extendOsmandPath(context, TILES_PATH);
dirWithTiles.mkdirs();
}
public OsmandApplication getContext() {
@ -356,10 +368,8 @@ public class ResourceManager {
}
private void initRenderers(IProgress progress) {
File file = new File(Environment.getExternalStorageDirectory(), APP_DIR + IndexConstants.RENDERERS_DIR);
if(Environment.getExternalStorageDirectory().canRead()){
file.mkdirs();
}
File file = OsmandSettings.extendOsmandPath(context, APP_DIR + IndexConstants.RENDERERS_DIR);
file.mkdirs();
Map<String, File> externalRenderers = new LinkedHashMap<String, File>();
if (file.exists() && file.canRead()) {
for (File f : file.listFiles()) {
@ -380,10 +390,8 @@ public class ResourceManager {
}
public List<String> indexingMaps(final IProgress progress) {
File file = new File(Environment.getExternalStorageDirectory(), MAPS_PATH);
if(Environment.getExternalStorageDirectory().canRead()){
file.mkdirs();
}
File file = OsmandSettings.extendOsmandPath(context, MAPS_PATH);
file.mkdirs();
List<String> warnings = new ArrayList<String>();
renderer.clearAllResources();
if (file.exists() && file.canRead()) {
@ -439,10 +447,8 @@ public class ResourceManager {
// POI INDEX //
public List<String> indexingPoi(final IProgress progress) {
File file = new File(Environment.getExternalStorageDirectory(), POI_PATH);
if(Environment.getExternalStorageDirectory().canRead()){
file.mkdirs();
}
File file = OsmandSettings.extendOsmandPath(context, POI_PATH);
file.mkdirs();
List<String> warnings = new ArrayList<String>();
closeAmenities();
if (file.exists() && file.canRead()) {
@ -481,7 +487,7 @@ public class ResourceManager {
public List<String> indexingAddresses(final IProgress progress){
File file = new File(Environment.getExternalStorageDirectory(), ADDRESS_PATH);
File file = OsmandSettings.extendOsmandPath(context, ADDRESS_PATH);
List<String> warnings = new ArrayList<String>();
closeAddresses();
if (file.exists() && file.canRead()) {
@ -513,7 +519,7 @@ public class ResourceManager {
public List<String> indexingTransport(final IProgress progress){
File file = new File(Environment.getExternalStorageDirectory(), TRANSPORT_PATH);
File file = OsmandSettings.extendOsmandPath(context, TRANSPORT_PATH);
List<String> warnings = new ArrayList<String>();
closeTransport();
if (file.exists() && file.canRead()) {
@ -747,7 +753,7 @@ public class ResourceManager {
String tileId, ITileSource source, int tileX, int tileY, int zoom) {
super(url, fileToSave, tileX, tileY, zoom);
this.dirWithTiles = dirWithTiles;
tileSource = source;
this.tileSource = source;
this.tileId = tileId;
}
}

10
OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java
View file

@ -39,8 +39,10 @@ import java.util.zip.ZipInputStream;
import net.osmand.IProgress;
import net.osmand.LogUtil;
import net.osmand.data.index.DownloaderIndexFromGoogleCode;
import net.osmand.data.index.IndexConstants;
import net.osmand.plus.DownloadOsmandIndexesHelper;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.ProgressDialogImplementation;
import net.osmand.plus.R;
import net.osmand.plus.ResourceManager;
@ -55,7 +57,6 @@ import android.app.AlertDialog.Builder;
import android.content.DialogInterface;
import android.graphics.Color;
import android.os.Bundle;
import android.os.Environment;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater;
@ -315,7 +316,7 @@ public class DownloadIndexActivity extends ListActivity {
private List<String> listAlreadyDownloadedWithAlternatives()
{
List<String> files = new ArrayList<String>();
File externalStorageDirectory = Environment.getExternalStorageDirectory();
File externalStorageDirectory = OsmandSettings.getExternalStorageDirectory(getApplicationContext());
files.addAll(listWithAlternatives(new File(externalStorageDirectory, ResourceManager.ADDRESS_PATH),ADDRESS_INDEX_EXT,ADDRESS_INDEX_EXT_ZIP,ADDRESS_TABLE_VERSION));
files.addAll(listWithAlternatives(new File(externalStorageDirectory, ResourceManager.POI_PATH),POI_INDEX_EXT,POI_INDEX_EXT_ZIP,POI_TABLE_VERSION));
files.addAll(listWithAlternatives(new File(externalStorageDirectory, ResourceManager.TRANSPORT_PATH),TRANSPORT_INDEX_EXT,TRANSPORT_INDEX_EXT_ZIP,TRANSPORT_TABLE_VERSION));
@ -351,8 +352,9 @@ public class DownloadIndexActivity extends ListActivity {
String toSavePostfix = null;
String toCheckPostfix = null;
boolean unzipDir = false;
File externalStorageDirectory = Environment.getExternalStorageDirectory();
if(fileName.endsWith(ADDRESS_INDEX_EXT)){
File externalStorageDirectory = OsmandSettings.getExternalStorageDirectory(getApplicationContext());
if(fileName.endsWith(ADDRESS_INDEX_EXT)){
parent = new File(externalStorageDirectory, ResourceManager.ADDRESS_PATH);
toSavePostfix = ADDRESS_INDEX_EXT;
toCheckPostfix = ADDRESS_INDEX_EXT;

5
OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java
View file

@ -28,7 +28,6 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
import android.os.Environment;
import android.view.ContextMenu;
import android.view.LayoutInflater;
import android.view.Menu;
@ -193,7 +192,7 @@ public class FavouritesActivity extends ListActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if(item.getItemId() == EXPORT_ID){
File appDir = new File(Environment.getExternalStorageDirectory(), ResourceManager.APP_DIR);
File appDir = OsmandSettings.extendOsmandPath(getApplicationContext(), ResourceManager.APP_DIR);
if(favouritesAdapter.isEmpty()){
Toast.makeText(this, R.string.no_fav_to_save, Toast.LENGTH_LONG).show();
} else if(!appDir.exists()){
@ -215,7 +214,7 @@ public class FavouritesActivity extends ListActivity {
}
}
} else if(item.getItemId() == IMPORT_ID){
File appDir = new File(Environment.getExternalStorageDirectory(), ResourceManager.APP_DIR);
File appDir = OsmandSettings.extendOsmandPath(getApplicationContext(), ResourceManager.APP_DIR);
File f = new File(appDir, FILE_TO_SAVE);
if(!f.exists()){
Toast.makeText(this, MessageFormat.format(getString(R.string.fav_file_to_load_not_found), f.getAbsolutePath()), Toast.LENGTH_LONG).show();

4
OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
View file

@ -4,6 +4,7 @@ import java.io.File;
import java.text.MessageFormat;
import net.osmand.Version;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.ResourceManager;
import net.osmand.plus.activities.search.SearchActivity;
@ -18,7 +19,6 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.view.KeyEvent;
import android.view.View;
import android.view.Window;
@ -44,7 +44,7 @@ public class MainMenuActivity extends Activity {
public void checkPreviousRunsForExceptions() {
long size = getPreferences(MODE_WORLD_READABLE).getLong(EXCEPTION_FILE_SIZE, 0);
final File file = new File(Environment.getExternalStorageDirectory(), OsmandApplication.EXCEPTION_PATH);
final File file = OsmandSettings.extendOsmandPath(getApplicationContext(), OsmandApplication.EXCEPTION_PATH);
if (file.exists() && file.length() > 0) {
if (size != file.length()) {
String msg = MessageFormat.format(getString(R.string.previous_run_crashed), OsmandApplication.EXCEPTION_PATH);

2
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -1369,7 +1369,7 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
private void useGPXFileLayer(final boolean useRouting, final LatLon endForRouting) {
final List<String> list = new ArrayList<String>();
final File dir = new File(Environment.getExternalStorageDirectory(), ResourceManager.APP_DIR + SavingTrackHelper.TRACKS_PATH);
final File dir = OsmandSettings.extendOsmandPath(getApplicationContext(), ResourceManager.APP_DIR + SavingTrackHelper.TRACKS_PATH);
if (dir != null && dir.canRead()) {
File[] files = dir.listFiles();
if (files != null) {

5
OsmAnd/src/net/osmand/plus/activities/OsmandApplication.java
View file

@ -24,7 +24,6 @@ import android.app.AlertDialog.Builder;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Environment;
import android.os.Handler;
import android.text.format.DateFormat;
import android.util.Log;
@ -234,7 +233,7 @@ public class OsmandApplication extends Application {
@Override
public void uncaughtException(final Thread thread, final Throwable ex) {
File file = new File(Environment.getExternalStorageDirectory(), EXCEPTION_PATH);
File file = OsmandSettings.extendOsmandPath(getApplicationContext(), EXCEPTION_PATH);
try {
ByteArrayOutputStream out = new ByteArrayOutputStream();
PrintStream printStream = new PrintStream(out);
@ -244,7 +243,7 @@ public class OsmandApplication extends Application {
append(DateFormat.format("MMMM dd, yyyy h:mm:ss", System.currentTimeMillis())).append("\n"). //$NON-NLS-1$//$NON-NLS-2$
append(new String(out.toByteArray()));
if (Environment.getExternalStorageDirectory().canRead()) {
if (file.getParentFile().canWrite()) {
BufferedWriter writer = new BufferedWriter(new FileWriter(file, true));
writer.write(msg.toString());
writer.close();

3
OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
View file

@ -19,7 +19,6 @@ import android.content.SharedPreferences;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.os.Environment;
import android.text.format.DateFormat;
public class SavingTrackHelper extends SQLiteOpenHelper {
@ -79,7 +78,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
public List<String> saveDataToGpx(){
SQLiteDatabase db = getReadableDatabase();
List<String> warnings = new ArrayList<String>();
File file = Environment.getExternalStorageDirectory();
File file = OsmandSettings.getExternalStorageDirectory(ctx);
if(db != null && file.canWrite()){
file = new File(file, ResourceManager.APP_DIR + TRACKS_PATH);
file.mkdirs();

46
OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
View file

@ -24,19 +24,22 @@ import net.osmand.plus.OsmandSettings.DayNightMode;
import net.osmand.plus.activities.RouteProvider.RouteService;
import net.osmand.plus.render.BaseOsmandRender;
import net.osmand.plus.render.RendererRegistry;
import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.app.AlertDialog.Builder;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.DialogInterface.OnClickListener;
import android.content.SharedPreferences.Editor;
import android.content.pm.ActivityInfo;
import android.content.res.Resources;
import android.location.LocationManager;
import android.os.Bundle;
import android.os.Environment;
import android.preference.CheckBoxPreference;
import android.preference.EditTextPreference;
import android.preference.ListPreference;
@ -78,6 +81,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
private EditTextPreference userPassword;
private EditTextPreference userName;
private EditTextPreference applicationDir;
private Preference saveCurrentTrack;
private Preference reloadIndexes;
@ -144,6 +148,9 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
userName.setOnPreferenceChangeListener(this);
userPassword = (EditTextPreference) screen.findPreference(OsmandSettings.USER_PASSWORD);
userPassword.setOnPreferenceChangeListener(this);
applicationDir = (EditTextPreference) screen.findPreference(OsmandSettings.EXTERNAL_STORAGE_DIR);
applicationDir.setOnPreferenceChangeListener(this);
updateApplicationDirSummary();
applicationMode =(ListPreference) screen.findPreference(OsmandSettings.APPLICATION_MODE);
applicationMode.setOnPreferenceChangeListener(this);
@ -187,6 +194,10 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
};
registerReceiver(broadcastReceiver, new IntentFilter(NavigationService.OSMAND_STOP_SERVICE_ACTION));
}
private void updateApplicationDirSummary() {
applicationDir.setSummary(OsmandSettings.getExternalStorageDirectory(getApplicationContext()).getAbsolutePath());
}
@Override
protected void onResume() {
@ -207,6 +218,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
}
userName.setText(OsmandSettings.getUserName(prefs));
userPassword.setText(OsmandSettings.getUserPassword(prefs));
applicationDir.setText(OsmandSettings.getExternalStorageDirectory(prefs).getAbsolutePath());
useInternetToDownload.setChecked(OsmandSettings.isUsingInternetToDownloadTiles(prefs));
Resources resources = this.getResources();
@ -289,7 +301,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
fill(routerPreference, entries, entries, entry);
// read available voice data
File extStorage = new File(Environment.getExternalStorageDirectory(), ResourceManager.VOICE_PATH);
File extStorage = OsmandSettings.extendOsmandPath(getApplicationContext(), ResourceManager.VOICE_PATH);
Set<String> setFiles = new LinkedHashSet<String>();
if (extStorage.exists()) {
for (File f : extStorage.listFiles()) {
@ -363,7 +375,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
public static Map<String, String> getTileSourceEntries(Context ctx){
Map<String, String> map = new LinkedHashMap<String, String>();
File dir = new File(Environment.getExternalStorageDirectory(), ResourceManager.TILES_PATH);
File dir = OsmandSettings.extendOsmandPath(ctx, ResourceManager.TILES_PATH);
if (dir != null && dir.canRead()) {
File[] files = dir.listFiles();
Arrays.sort(files, new Comparator<File>(){
@ -442,6 +454,8 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
} else if(preference == userName){
edit.putString(OsmandSettings.USER_NAME, (String) newValue);
edit.commit();
} else if(preference == applicationDir){
warnAboutChangingStorage(edit, (String) newValue);
} else if(preference == positionOnMap){
edit.putInt(OsmandSettings.POSITION_ON_MAP, positionOnMap.findIndexOfValue((String) newValue));
edit.commit();
@ -524,6 +538,23 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
return true;
}
private void warnAboutChangingStorage(final Editor edit, final String newValue) {
Builder builder = new AlertDialog.Builder(this);
builder.setMessage(getString(R.string.application_dir_change_warning));
builder.setPositiveButton(R.string.default_buttons_yes, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
//edit the preference
edit.putString(OsmandSettings.EXTERNAL_STORAGE_DIR, newValue);
edit.commit();
updateApplicationDirSummary();
reloadIndexes();
}
});
builder.setNegativeButton(R.string.default_buttons_cancel, null);
builder.show();
}
public void reloadIndexes(){
progressDlg = ProgressDialog.show(this, getString(R.string.loading_data), getString(R.string.reading_indexes), true);
final ProgressDialogImplementation impl = new ProgressDialogImplementation(progressDlg);
@ -652,6 +683,15 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
application.getResourceManager().getRenderer().clearCache();
}
}
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
Preference preference) {
if (preference == applicationDir) {
return true;
}
return super.onPreferenceTreeClick(preferenceScreen, preference);
}
@Override
public boolean onPreferenceClick(Preference preference) {

4
OsmAnd/src/net/osmand/plus/voice/CommandPlayer.java
View file

@ -13,6 +13,7 @@ import java.util.List;
import net.osmand.LogUtil;
import net.osmand.data.index.IndexConstants;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.ResourceManager;
@ -30,7 +31,6 @@ import alice.tuprolog.Theory;
import alice.tuprolog.Var;
import android.content.Context;
import android.media.MediaPlayer;
import android.os.Environment;
/**
* That class represents command player.
@ -83,7 +83,7 @@ public class CommandPlayer {
prologSystem.clearTheory();
voiceDir = null;
if(voiceProvider != null){
File parent = new File(Environment.getExternalStorageDirectory(), ResourceManager.VOICE_PATH);
File parent = OsmandSettings.extendOsmandPath(ctx, ResourceManager.VOICE_PATH);
voiceDir = new File(parent, voiceProvider);
if(!voiceDir.exists()){
voiceDir = null;