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

Add language show saved articles

Browse source
This commit is contained in:
Dima-1 2020-12-21 11:02:45 +02:00
parent bab02a6d54
commit a06749b0e3
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -163,9 +163,10 @@ public class TravelLocalDataHelper {
}
@Nullable
public TravelArticle getSavedArticle(String routeId) {
public TravelArticle getSavedArticle(String routeId, String lang) {
for (TravelArticle article : savedArticles) {
if (article.routeId != null && article.routeId.equals(routeId)) {
if (article.routeId != null && article.routeId.equals(routeId)
&& article.lang != null && article.lang.equals(lang)) {
article.content = article.fullContent;
return article;
}

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

@ -174,7 +174,7 @@ public class TravelObfHelper implements TravelHelper {
if (article != null) {
return getArticleByIdFromTravelBooks(routeId, lang);
}
return localDataHelper.getSavedArticle(routeId);
return localDataHelper.getSavedArticle(routeId, lang);
}
public TravelArticle getArticleByIdFromTravelBooks(final String routeId, final String lang) {

2
OsmAnd/src/net/osmand/plus/wikivoyage/explore/SavedArticlesTabFragment.java
View file

@ -161,7 +161,7 @@ public class SavedArticlesTabFragment extends BaseOsmAndFragment implements Trav
}
TravelArticle oldArticle = (TravelArticle) oldItem;
TravelArticle newArticle = (TravelArticle) newItem;
return oldArticle.getRouteId() != null && newArticle.getRouteId() != null &&
return oldArticle.getRouteId() != null && oldArticle.getLang() != null &&
oldArticle.getRouteId().equals(newArticle.getRouteId())
&& oldArticle.getLang().equals(newArticle.getLang());
}