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

Fix bookmarks

Browse source
This commit is contained in:
Dima-1 2021-02-12 13:07:15 +02:00
parent 3cf65218b2
commit 06a85035cc
4 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -605,6 +605,12 @@ public class TravelDbHelper implements TravelHelper {
return res;
}
@Override
public TravelArticle checkExistedArticle(@Nullable TravelArticle article, @Nullable TravelArticleIdentifier articleId,
@Nullable String lang, boolean readGpx, @Nullable GpxReadCallback callback) {
return article;
}
@Nullable
@Override
public TravelArticleIdentifier getArticleId(@NonNull String title, @NonNull String lang) {

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

@ -41,6 +41,9 @@ public interface TravelHelper {
@Nullable
TravelArticle getArticleById(@NonNull TravelArticleIdentifier articleId, @Nullable String lang, boolean readGpx, @Nullable GpxReadCallback callback);
@Nullable
TravelArticle checkExistedArticle(@Nullable TravelArticle article,@Nullable TravelArticleIdentifier articleId, @Nullable String lang, boolean readGpx, @Nullable GpxReadCallback callback);
@Nullable
TravelArticle getArticleByTitle(@NonNull String title, @NonNull String lang, boolean readGpx, @Nullable GpxReadCallback callback);

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

@ -1,9 +1,5 @@
package net.osmand.plus.wikivoyage.data;
import android.database.DatabaseUtils;
import android.database.sqlite.SQLiteDatabase;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -428,7 +424,9 @@ public class TravelLocalDataHelper {
if (cursor.moveToFirst()) {
do {
TravelArticle dbArticle = readSavedArticle(cursor);
TravelArticle article = context.getTravelHelper().getArticleById(dbArticle.generateIdentifier(), dbArticle.lang, false, null);
dbArticle.generateIdentifier();
TravelArticle article = context.getTravelHelper().checkExistedArticle(dbArticle,
null,null, false, null);
if (article != null && article.getLastModified() > dbArticle.getLastModified()) {
updateSavedArticle(dbArticle, article);
res.add(article);

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

@ -698,15 +698,32 @@ public class TravelObfHelper implements TravelHelper {
}
}
private synchronized TravelArticle findArticleById(@NonNull final TravelArticleIdentifier articleId,
final String lang, boolean readGpx, @Nullable GpxReadCallback callback) {
private synchronized TravelArticle findArticleById(@NonNull TravelArticleIdentifier articleId,
String lang, boolean readGpx, @Nullable GpxReadCallback callback) {
return checkExistedArticle(null, articleId, lang, readGpx, callback);
}
@Override
public synchronized TravelArticle checkExistedArticle(@Nullable TravelArticle checkedArticle,
@Nullable TravelArticleIdentifier articleId,
@Nullable String lang, boolean readGpx, @Nullable GpxReadCallback callback) {
final List<Pair<File, Amenity>> amenities = new ArrayList<>();
TravelArticle article = null;
long lastModified;
if (checkedArticle != null) {
articleId = checkedArticle.generateIdentifier();
lang = checkedArticle.getLang();
lastModified = checkedArticle.getLastModified();
} else {
lastModified = articleId.file.lastModified();
}
final TravelArticleIdentifier finalArticleId = articleId;
SearchRequest<Amenity> req = null;
for (final BinaryMapIndexReader reader : getReaders()) {
try {
if (articleId.file != null && articleId.file.equals(reader.getFile())) {
if (articleId.file.lastModified() == reader.getFile().lastModified()) {
if (lastModified == reader.getFile().lastModified()) {
req = BinaryMapIndexReader.buildSearchPoiRequest(0, 0,
Algorithms.emptyIfNull(articleId.title), 0, Integer.MAX_VALUE, 0, Integer.MAX_VALUE,
getSubcategoriesSearchFilter(ROUTE_ARTICLE, ROUTE_TRACK), new ResultMatcher<Amenity>() {
@ -714,7 +731,7 @@ public class TravelObfHelper implements TravelHelper {
@Override
public boolean publish(Amenity amenity) {
if (Algorithms.stringsEqual(articleId.routeId,
if (Algorithms.stringsEqual(finalArticleId.routeId,
Algorithms.emptyIfNull(amenity.getTagContent(Amenity.ROUTE_ID)))) {
amenities.add(new Pair<>(reader.getFile(), amenity));
done = true;
@ -778,9 +795,9 @@ public class TravelObfHelper implements TravelHelper {
@Override
public boolean publish(Amenity amenity) {
if (Algorithms.stringsEqual(articleId.routeId,
if (Algorithms.stringsEqual(finalArticleId.routeId,
Algorithms.emptyIfNull(amenity.getTagContent(Amenity.ROUTE_ID)))
&& Algorithms.stringsEqual(articleId.routeSource,
&& Algorithms.stringsEqual(finalArticleId.routeSource,
Algorithms.emptyIfNull(amenity.getTagContent(Amenity.ROUTE_SOURCE)))) {
amenities.add(new Pair<>(reader.getFile(), amenity));
done = true;