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

Fix possible NPE, remove unnecessary track visibility set

Browse source
This commit is contained in:
androiddevkotlin 2021-04-12 21:37:41 +03:00
parent 3a5e8c6230
commit c3ee44ffac
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -254,17 +254,18 @@ public class WikivoyageArticleDialogFragment extends WikiArticleBaseDialogFragme
saveBtn.setOnClickListener(new View.OnClickListener() { saveBtn.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
getMyApplication().getTravelHelper().createGpxFile(article); getMyApplication().getTravelHelper().createGpxFile(article);
GPXFile gpxFile = article.getGpxFile(); GPXFile gpxFile = article.getGpxFile();
if (saved) { if (saved) {
if (gpxFile != null) {
getMyApplication().getSelectedGpxHelper().selectGpxFile(gpxFile, false, true); getMyApplication().getSelectedGpxHelper().selectGpxFile(gpxFile, false, true);
helper.removeArticleFromSaved(article);
} else {
getMyApplication().getSelectedGpxHelper().selectGpxFile(gpxFile, true, true);
helper.addArticleToSaved(article);
} }
updateSaveButton(); helper.removeArticleFromSaved(article);
} else {
helper.addArticleToSaved(article);
} }
updateSaveButton();
}
}); });
} }
} }

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

@ -107,10 +107,11 @@ public class ArticleTravelCard extends BaseTravelCard {
app.getTravelHelper().createGpxFile(article); app.getTravelHelper().createGpxFile(article);
GPXFile gpxFile = article.getGpxFile(); GPXFile gpxFile = article.getGpxFile();
if (saved) { if (saved) {
app.getSelectedGpxHelper().selectGpxFile(gpxFile, false, true); if (gpxFile != null) {
app.getSelectedGpxHelper().selectGpxFile(gpxFile, false, true);
}
helper.removeArticleFromSaved(article); helper.removeArticleFromSaved(article);
} else { } else {
app.getSelectedGpxHelper().selectGpxFile(gpxFile, true, true);
helper.addArticleToSaved(article); helper.addArticleToSaved(article);
} }
updateSaveButton(holder); updateSaveButton(holder);