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

Fix #5473

Browse source
This commit is contained in:
Vitaliy 2021-04-13 01:38:50 +03:00
parent 08e2c4ed26
commit f17cfdf426
8 changed files with 115 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
View file

@ -246,24 +246,15 @@ public class WikivoyageArticleDialogFragment extends WikiArticleBaseDialogFragme
private void updateSaveButton() {
if (article != null) {
final TravelLocalDataHelper helper = getMyApplication().getTravelHelper().getBookmarksHelper();
final boolean saved = helper.isArticleSaved(article);
final TravelHelper helper = getMyApplication().getTravelHelper();
final boolean saved = helper.getBookmarksHelper().isArticleSaved(article);
Drawable icon = getActiveIcon(saved ? R.drawable.ic_action_read_later_fill : R.drawable.ic_action_read_later);
saveBtn.setText(getString(saved ? R.string.shared_string_remove : R.string.shared_string_bookmark));
saveBtn.setCompoundDrawablesWithIntrinsicBounds(null, null, icon, null);
saveBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
getMyApplication().getTravelHelper().createGpxFile(article);
GPXFile gpxFile = article.getGpxFile();
if (saved) {
if (gpxFile != null) {
getMyApplication().getSelectedGpxHelper().selectGpxFile(gpxFile, false, true);
}
helper.removeArticleFromSaved(article);
} else {
helper.addArticleToSaved(article);
}
helper.saveOrRemoveArticle(article, !saved);
updateSaveButton();
}
});

9
OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelDbHelper.java
View file

@ -193,6 +193,15 @@ public class TravelDbHelper implements TravelHelper {
return WORLD_WIKIVOYAGE_FILE_NAME;
}
@Override
public void saveOrRemoveArticle(@NonNull TravelArticle article, boolean save) {
if (save) {
localDataHelper.addArticleToSaved(article);
} else {
localDataHelper.removeArticleFromSaved(article);
}
}
public List<File> getExistingTravelBooks() {
return existingTravelBooks;
}

2
OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelHelper.java
View file

@ -70,4 +70,6 @@ public interface TravelHelper {
String getSelectedTravelBookName();
String getWikivoyageFileName();
void saveOrRemoveArticle(@NonNull TravelArticle article, boolean save);
}

141
OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelLocalDataHelper.java
View file

@ -4,11 +4,13 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import net.osmand.GPXUtilities;
import net.osmand.GPXUtilities.GPXFile;
import net.osmand.IndexConstants;
import net.osmand.PlatformUtil;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.api.SQLiteAPI.SQLiteConnection;
import net.osmand.plus.api.SQLiteAPI.SQLiteCursor;
import net.osmand.plus.wikivoyage.data.TravelHelper.GpxReadCallback;
import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log;
@ -124,14 +126,6 @@ public class TravelLocalDataHelper {
}
}
public void restoreSavedArticle(@NonNull TravelArticle article) {
if (!isArticleSaved(article)) {
savedArticles.add(article);
dbHelper.addSavedArticle(article);
notifySavedUpdated();
}
}
public void removeArticleFromSaved(@NonNull TravelArticle article) {
TravelArticle savedArticle = getArticle(article.title, article.lang);
if (savedArticle != null) {
@ -305,7 +299,7 @@ public class TravelLocalDataHelper {
conn.execSQL("ALTER TABLE " + BOOKMARKS_TABLE_NAME + " ADD " + BOOKMARKS_COL_TRAVEL_BOOK + " TEXT");
String selectedTravelBookName = context.getTravelHelper().getSelectedTravelBookName();
if (selectedTravelBookName != null) {
Object[] args = new Object[]{selectedTravelBookName};
Object[] args = new Object[] {selectedTravelBookName};
conn.execSQL("UPDATE " + HISTORY_TABLE_NAME + " SET " + HISTORY_COL_TRAVEL_BOOK + " = ?", args);
conn.execSQL("UPDATE " + BOOKMARKS_TABLE_NAME + " SET " + BOOKMARKS_COL_TRAVEL_BOOK + " = ?", args);
}
@ -368,7 +362,7 @@ public class TravelLocalDataHelper {
conn.execSQL("INSERT INTO " + HISTORY_TABLE_NAME + "(" + HISTORY_COL_ARTICLE_TITLE + ", "
+ HISTORY_COL_LANG + ", " + HISTORY_COL_IS_PART_OF + ", " + HISTORY_COL_LAST_ACCESSED
+ ", " + HISTORY_COL_TRAVEL_BOOK + ") VALUES (?, ?, ?, ?, ?)", new Object[] {
item.articleTitle, item.lang, item.isPartOf, item.lastAccessed, travelBook });
item.articleTitle, item.lang, item.isPartOf, item.lastAccessed, travelBook});
} finally {
conn.close();
}
@ -389,8 +383,8 @@ public class TravelLocalDataHelper {
"WHERE " + HISTORY_COL_ARTICLE_TITLE + " = ? " +
" AND " + HISTORY_COL_LANG + " = ?" +
" AND " + HISTORY_COL_TRAVEL_BOOK + " = ?",
new Object[]{item.isPartOf, item.lastAccessed,
item.articleTitle, item.lang, travelBook});
new Object[] {item.isPartOf, item.lastAccessed,
item.articleTitle, item.lang, travelBook});
} finally {
conn.close();
}
@ -406,10 +400,10 @@ public class TravelLocalDataHelper {
if (conn != null) {
try {
conn.execSQL("DELETE FROM " + HISTORY_TABLE_NAME +
" WHERE " + HISTORY_COL_ARTICLE_TITLE+ " = ?" +
" WHERE " + HISTORY_COL_ARTICLE_TITLE + " = ?" +
" AND " + HISTORY_COL_LANG + " = ?" +
" AND " + HISTORY_COL_TRAVEL_BOOK + " = ?",
new Object[]{item.articleTitle, item.lang, travelBook});
new Object[] {item.articleTitle, item.lang, travelBook});
} finally {
conn.close();
}
@ -480,63 +474,84 @@ public class TravelLocalDataHelper {
if (travelBook == null) {
return;
}
context.getTravelHelper().getArticleById(article.generateIdentifier(), article.lang, true,
new TravelHelper.GpxReadCallback() {
@Override
public void onGpxFileReading() {
final TravelHelper travelHelper = context.getTravelHelper();
travelHelper.getArticleById(article.generateIdentifier(), article.lang, true, new GpxReadCallback() {
@Override
public void onGpxFileReading() {
}
}
@Override
public void onGpxFileRead(@Nullable GPXUtilities.GPXFile gpxFile) {
SQLiteConnection conn = openConnection(false);
if (conn != null) {
try {
String query = "INSERT INTO " + BOOKMARKS_TABLE_NAME + " (" +
BOOKMARKS_COL_ARTICLE_TITLE + ", " +
BOOKMARKS_COL_LANG + ", " +
BOOKMARKS_COL_IS_PART_OF + ", " +
BOOKMARKS_COL_IMAGE_TITLE + ", " +
BOOKMARKS_COL_TRAVEL_BOOK + ", " +
BOOKMARKS_COL_LAT + ", " +
BOOKMARKS_COL_LON + ", " +
BOOKMARKS_COL_ROUTE_ID + ", " +
BOOKMARKS_COL_CONTENT_JSON + ", " +
BOOKMARKS_COL_CONTENT + ", " +
BOOKMARKS_COL_LAST_MODIFIED + ", " +
BOOKMARKS_COL_GPX_GZ +
") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
conn.execSQL(query, new Object[]{article.title, article.lang,
article.aggregatedPartOf, article.imageTitle,
travelBook, article.lat, article.lon, article.routeId, article.contentsJson,
article.content, article.getFile().lastModified(),
Algorithms.stringToGzip(GPXUtilities.asString(article.gpxFile))});
} finally {
conn.close();
}
}
@Override
public void onGpxFileRead(@Nullable GPXFile gpxFile) {
if (gpxFile != null) {
travelHelper.createGpxFile(article);
}
SQLiteConnection conn = openConnection(false);
if (conn != null) {
try {
String query = "INSERT INTO " + BOOKMARKS_TABLE_NAME + " (" +
BOOKMARKS_COL_ARTICLE_TITLE + ", " +
BOOKMARKS_COL_LANG + ", " +
BOOKMARKS_COL_IS_PART_OF + ", " +
BOOKMARKS_COL_IMAGE_TITLE + ", " +
BOOKMARKS_COL_TRAVEL_BOOK + ", " +
BOOKMARKS_COL_LAT + ", " +
BOOKMARKS_COL_LON + ", " +
BOOKMARKS_COL_ROUTE_ID + ", " +
BOOKMARKS_COL_CONTENT_JSON + ", " +
BOOKMARKS_COL_CONTENT + ", " +
BOOKMARKS_COL_LAST_MODIFIED + ", " +
BOOKMARKS_COL_GPX_GZ +
") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
conn.execSQL(query, new Object[] {article.title, article.lang,
article.aggregatedPartOf, article.imageTitle,
travelBook, article.lat, article.lon, article.routeId, article.contentsJson,
article.content, article.getFile().lastModified(),
Algorithms.stringToGzip(GPXUtilities.asString(article.gpxFile))});
} finally {
conn.close();
}
});
}
}
});
}
void removeSavedArticle(@NonNull TravelArticle article) {
String travelBook = article.getTravelBook(context);
void removeSavedArticle(@NonNull final TravelArticle article) {
final String travelBook = article.getTravelBook(context);
if (travelBook == null) {
return;
}
SQLiteConnection conn = openConnection(false);
if (conn != null) {
try {
String query = "DELETE FROM " + BOOKMARKS_TABLE_NAME +
" WHERE " + BOOKMARKS_COL_ARTICLE_TITLE + " = ?" +
" AND " + BOOKMARKS_COL_ROUTE_ID + " = ?" +
" AND " + BOOKMARKS_COL_LANG + ((article.lang != null) ? " = '" + article.lang + "'" : " IS NULL") +
" AND " + BOOKMARKS_COL_TRAVEL_BOOK + " = ?";
conn.execSQL(query, new Object[]{article.title, article.routeId, travelBook});
} finally {
conn.close();
final TravelHelper travelHelper = context.getTravelHelper();
travelHelper.getArticleById(article.generateIdentifier(), article.lang, true, new GpxReadCallback() {
@Override
public void onGpxFileReading() {
}
}
@Override
public void onGpxFileRead(@Nullable GPXFile gpxFile) {
if (gpxFile != null) {
String name = travelHelper.getGPXName(article);
gpxFile.path = context.getAppPath(IndexConstants.GPX_TRAVEL_DIR + name).getAbsolutePath();
context.getSelectedGpxHelper().selectGpxFile(gpxFile, false, true);
}
SQLiteConnection conn = openConnection(false);
if (conn != null) {
try {
String query = "DELETE FROM " + BOOKMARKS_TABLE_NAME +
" WHERE " + BOOKMARKS_COL_ARTICLE_TITLE + " = ?" +
" AND " + BOOKMARKS_COL_ROUTE_ID + " = ?" +
" AND " + BOOKMARKS_COL_LANG + ((article.lang != null) ? " = '" + article.lang + "'" : " IS NULL") +
" AND " + BOOKMARKS_COL_TRAVEL_BOOK + " = ?";
conn.execSQL(query, new Object[] {article.title, article.routeId, travelBook});
} finally {
conn.close();
}
}
}
});
}
void updateSavedArticle(@NonNull TravelArticle odlArticle, @NonNull TravelArticle newArticle) {
@ -563,7 +578,7 @@ public class TravelLocalDataHelper {
" AND " + BOOKMARKS_COL_ROUTE_ID + " = ?" +
" AND " + BOOKMARKS_COL_LANG + " = ?" +
" AND " + BOOKMARKS_COL_TRAVEL_BOOK + " = ?",
new Object[]{newArticle.title, newArticle.lang, newArticle.aggregatedPartOf,
new Object[] {newArticle.title, newArticle.lang, newArticle.aggregatedPartOf,
newArticle.imageTitle, newArticle.getTravelBook(context), newArticle.lat,
newArticle.lon, newArticle.routeId, newArticle.contentsJson, newArticle.content,
newArticle.getLastModified(),

11
OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java
View file

@ -56,10 +56,10 @@ import static net.osmand.GPXUtilities.WptPt;
import static net.osmand.GPXUtilities.writeGpxFile;
import static net.osmand.plus.helpers.GpxUiHelper.getGpxTitle;
import static net.osmand.plus.wikivoyage.data.PopularArticles.ARTICLES_PER_PAGE;
import static net.osmand.plus.wikivoyage.data.TravelGpx.ACTIVITY_TYPE;
import static net.osmand.plus.wikivoyage.data.TravelGpx.DIFF_ELE_DOWN;
import static net.osmand.plus.wikivoyage.data.TravelGpx.DIFF_ELE_UP;
import static net.osmand.plus.wikivoyage.data.TravelGpx.DISTANCE;
import static net.osmand.plus.wikivoyage.data.TravelGpx.ACTIVITY_TYPE;
import static net.osmand.plus.wikivoyage.data.TravelGpx.USER;
import static net.osmand.util.Algorithms.capitalizeFirstLetter;
@ -1029,6 +1029,15 @@ public class TravelObfHelper implements TravelHelper {
return WORLD_WIKIVOYAGE_FILE_NAME;
}
@Override
public void saveOrRemoveArticle(@NonNull TravelArticle article, boolean save) {
if (save) {
localDataHelper.addArticleToSaved(article);
} else {
localDataHelper.removeArticleFromSaved(article);
}
}
private class GpxFileReader extends AsyncTask<Void, Void, GPXFile> {
private final TravelArticle article;

21
OsmAnd/src/net/osmand/plus/wikivoyage/explore/SavedArticlesRvAdapter.java
View file

@ -31,13 +31,13 @@ import net.osmand.plus.wikipedia.WikiArticleHelper;
import net.osmand.plus.wikivoyage.WikivoyageUtils;
import net.osmand.plus.wikivoyage.data.TravelArticle;
import net.osmand.plus.wikivoyage.data.TravelGpx;
import net.osmand.plus.wikivoyage.data.TravelLocalDataHelper;
import net.osmand.plus.wikivoyage.data.TravelHelper;
import net.osmand.util.Algorithms;
import java.util.ArrayList;
import java.util.List;
import static net.osmand.plus.wikivoyage.explore.travelcards.TravelGpxCard.*;
import static net.osmand.plus.wikivoyage.explore.travelcards.TravelGpxCard.TravelGpxVH;
import static net.osmand.util.Algorithms.capitalizeFirstLetterAndLowercase;
public class SavedArticlesRvAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
@ -182,20 +182,15 @@ public class SavedArticlesRvAdapter extends RecyclerView.Adapter<RecyclerView.Vi
private void updateSaveButton(final TravelGpxVH holder, final TravelGpx article) {
if (article != null) {
final TravelLocalDataHelper helper = app.getTravelHelper().getBookmarksHelper();
final boolean saved = helper.isArticleSaved(article);
final TravelHelper helper = app.getTravelHelper();
final boolean saved = helper.getBookmarksHelper().isArticleSaved(article);
Drawable icon = getActiveIcon(saved ? R.drawable.ic_action_read_later_fill : R.drawable.ic_action_read_later);
holder.rightButton.setText(saved ? R.string.shared_string_remove : R.string.shared_string_save);
holder.rightButton.setCompoundDrawablesWithIntrinsicBounds(null, null, icon, null);
holder.rightButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (saved) {
helper.removeArticleFromSaved(article);
} else {
app.getTravelHelper().createGpxFile(article);
helper.addArticleToSaved(article);
}
helper.saveOrRemoveArticle(article, !saved);
updateSaveButton(holder, article);
}
});
@ -286,13 +281,13 @@ public class SavedArticlesRvAdapter extends RecyclerView.Adapter<RecyclerView.Vi
Object item = getItemByPosition();
if (item instanceof TravelArticle) {
final TravelArticle article = (TravelArticle) item;
final TravelLocalDataHelper ldh = app.getTravelHelper().getBookmarksHelper();
ldh.removeArticleFromSaved(article);
final TravelHelper helper = app.getTravelHelper();
helper.saveOrRemoveArticle(article, false);
Snackbar snackbar = Snackbar.make(itemView, R.string.article_removed, Snackbar.LENGTH_LONG)
.setAction(R.string.shared_string_undo, new View.OnClickListener() {
@Override
public void onClick(View view) {
ldh.restoreSavedArticle(article);
helper.saveOrRemoveArticle(article, true);
}
});
boolean nightMode = !settings.isLightContent();

15
OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/ArticleTravelCard.java
View file

@ -23,8 +23,6 @@ import net.osmand.plus.wikivoyage.article.WikivoyageArticleDialogFragment;
import net.osmand.plus.wikivoyage.data.TravelArticle;
import net.osmand.plus.wikivoyage.data.TravelLocalDataHelper;
import static net.osmand.GPXUtilities.GPXFile;
public class ArticleTravelCard extends BaseTravelCard {
public static final int TYPE = 2;
@ -94,8 +92,6 @@ public class ArticleTravelCard extends BaseTravelCard {
private void updateSaveButton(final ArticleTravelVH holder) {
if (article != null) {
article = app.getTravelHelper().getArticleById(article.generateIdentifier(), article.getLang(), true,
null);
final TravelLocalDataHelper helper = app.getTravelHelper().getBookmarksHelper();
final boolean saved = helper.isArticleSaved(article);
Drawable icon = getActiveIcon(saved ? R.drawable.ic_action_read_later_fill : R.drawable.ic_action_read_later);
@ -104,16 +100,7 @@ public class ArticleTravelCard extends BaseTravelCard {
holder.rightButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
app.getTravelHelper().createGpxFile(article);
GPXFile gpxFile = article.getGpxFile();
if (saved) {
if (gpxFile != null) {
app.getSelectedGpxHelper().selectGpxFile(gpxFile, false, true);
}
helper.removeArticleFromSaved(article);
} else {
helper.addArticleToSaved(article);
}
app.getTravelHelper().saveOrRemoveArticle(article, !saved);
updateSaveButton(holder);
}
});

13
OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelGpxCard.java
View file

@ -20,7 +20,6 @@ import net.osmand.plus.R;
import net.osmand.plus.track.TrackMenuFragment;
import net.osmand.plus.wikivoyage.data.TravelGpx;
import net.osmand.plus.wikivoyage.data.TravelHelper;
import net.osmand.plus.wikivoyage.data.TravelLocalDataHelper;
import net.osmand.util.Algorithms;
import java.io.File;
@ -37,7 +36,7 @@ public class TravelGpxCard extends BaseTravelCard {
private boolean isLastItem;
public TravelGpxCard(@NonNull OsmandApplication app, boolean nightMode, @NonNull TravelGpx article,
@NonNull FragmentActivity activity) {
@NonNull FragmentActivity activity) {
super(app, nightMode);
this.article = article;
readIcon = getActiveIcon(R.drawable.ic_action_read_article);
@ -104,19 +103,15 @@ public class TravelGpxCard extends BaseTravelCard {
private void updateSaveButton(final TravelGpxVH holder) {
if (article != null) {
final TravelLocalDataHelper helper = app.getTravelHelper().getBookmarksHelper();
final boolean saved = helper.isArticleSaved(article);
final TravelHelper helper = app.getTravelHelper();
final boolean saved = helper.getBookmarksHelper().isArticleSaved(article);
Drawable icon = getActiveIcon(saved ? R.drawable.ic_action_read_later_fill : R.drawable.ic_action_read_later);
holder.rightButton.setText(saved ? R.string.shared_string_remove : R.string.shared_string_save);
holder.rightButton.setCompoundDrawablesWithIntrinsicBounds(null, null, icon, null);
holder.rightButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (saved) {
helper.removeArticleFromSaved(article);
} else {
helper.addArticleToSaved(article);
}
helper.saveOrRemoveArticle(article, !saved);
updateSaveButton(holder);
}
});