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

Speedup import favorites

Browse source
This commit is contained in:
Victor Shcherb 2014-07-13 21:54:45 +02:00
parent d30db2bfc7
commit c597739b3e
2 changed files with 49 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
View file

@ -113,8 +113,11 @@ public class FavouritesDbHelper {
saveCurrentPointsIntoFile();
}
public boolean deleteFavourite(FavouritePoint p) {
return deleteFavourite(p, true);
}
public boolean deleteFavourite(FavouritePoint p, boolean saveImmediately) {
if (p != null) {
FavoriteGroup group = flatGroups.get(p.getCategory());
if (group != null) {
@ -122,12 +125,17 @@ public class FavouritesDbHelper {
}
cachedFavoritePoints.remove(p);
}
saveCurrentPointsIntoFile();
if (saveImmediately) {
saveCurrentPointsIntoFile();
}
return true;
}
public boolean addFavourite(FavouritePoint p) {
return addFavourite(p, true);
}
public boolean addFavourite(FavouritePoint p, boolean saveImmediately) {
if (p.getName().equals("") && flatGroups.containsKey(p.getCategory())) {
return true;
}
@ -138,7 +146,9 @@ public class FavouritesDbHelper {
group.points.add(p);
cachedFavoritePoints.add(p);
}
saveCurrentPointsIntoFile();
if (saveImmediately) {
saveCurrentPointsIntoFile();
}
return true;
}
@ -171,7 +181,7 @@ public class FavouritesDbHelper {
return true;
}
private void saveCurrentPointsIntoFile() {
public void saveCurrentPointsIntoFile() {
try {
Map<String, FavouritePoint> ex = new LinkedHashMap<String, FavouritePoint>();
loadGPXFile(getInternalFile(), ex);

44
OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java
View file

@ -15,6 +15,7 @@ import net.osmand.access.AccessibleToast;
import net.osmand.data.FavouritePoint;
import net.osmand.plus.FavouritesDbHelper;
import net.osmand.plus.GPXUtilities;
import net.osmand.plus.GPXUtilities.GPXFile;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
@ -158,6 +159,37 @@ public class GpxImportHelper {
}
}.execute();
}
private void importFavoritesImpl(final GPXFile gpxFile) {
new AsyncTask<Void, Void, GPXUtilities.GPXFile>() {
ProgressDialog progress = null;
@Override
protected void onPreExecute() {
progress = ProgressDialog.show(mapActivity, application.getString(R.string.loading_smth, ""), application.getString(R.string.loading_data));
}
@Override
protected GPXUtilities.GPXFile doInBackground(Void... nothing) {
final List<FavouritePoint> favourites = asFavourites(gpxFile.points);
final FavouritesDbHelper favoritesHelper = application.getFavorites();
for (final FavouritePoint favourite : favourites) {
favoritesHelper.deleteFavourite(favourite, false);
favoritesHelper.addFavourite(favourite, false);
}
favoritesHelper.saveCurrentPointsIntoFile();
AccessibleToast.makeText(mapActivity, R.string.fav_imported_sucessfully, Toast.LENGTH_LONG).show();
return null;
}
@Override
protected void onPostExecute(GPXUtilities.GPXFile result) {
progress.dismiss();
final Intent newIntent = new Intent(mapActivity, application.getAppCustomization().getFavoritesActivity());
mapActivity.startActivity(newIntent);
}
}.execute();
}
private void handleKmlImport(final Uri kmlFile, final String name, final boolean save) {
new AsyncTask<Void, Void, GPXUtilities.GPXFile>() {
@ -296,17 +328,7 @@ public class GpxImportHelper {
public void onClick(DialogInterface dialog, int which) {
switch (which) {
case DialogInterface.BUTTON_POSITIVE:
final List<FavouritePoint> favourites = asFavourites(gpxFile.points);
final FavouritesDbHelper favorites = application.getFavorites();
for (final FavouritePoint favourite : favourites) {
favorites.deleteFavourite(favourite);
favorites.addFavourite(favourite);
}
AccessibleToast.makeText(mapActivity, R.string.fav_imported_sucessfully, Toast.LENGTH_LONG).show();
final Intent newIntent = new Intent(mapActivity, application.getAppCustomization().getFavoritesActivity());
mapActivity.startActivity(newIntent);
importFavoritesImpl(gpxFile);
break;
case DialogInterface.BUTTON_NEGATIVE:
handleResult(gpxFile, fileName, save);