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

Fix possible npe

Browse source
This commit is contained in:
Chumva 2019-10-22 15:03:32 +03:00
parent c4aafe20cb
commit e35c7f5ead
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
OsmAnd/src/net/osmand/plus/wikivoyage/menu/WikivoyageWptPtMenuBuilder.java
View file

@ -76,20 +76,22 @@ public class WikivoyageWptPtMenuBuilder extends WptPtMenuBuilder {
}
private HashMap<String, String> getDescriptionTokens(String desc, String... allowedKeys) {
String[] tokens = desc.split("\n");
HashMap<String, String> mTokens = new HashMap<>();
for (String token : tokens) {
boolean matched = false;
for (String key : allowedKeys) {
if (token.startsWith(key)) {
matched = true;
String value = token.substring(key.length()).trim();
mTokens.put(key, value);
if (!Algorithms.isEmpty(desc)) {
String[] tokens = desc.split("\n");
for (String token : tokens) {
boolean matched = false;
for (String key : allowedKeys) {
if (token.startsWith(key)) {
matched = true;
String value = token.substring(key.length()).trim();
mTokens.put(key, value);
}
}
if (!matched) {
String s = mTokens.get(KEY_DESCRIPTION);
mTokens.put(KEY_DESCRIPTION, s != null ? s + "\n" + token : token);
}
}
if (!matched) {
String s = mTokens.get(KEY_DESCRIPTION);
mTokens.put(KEY_DESCRIPTION, s != null ? s + "\n" + token : token);
}
}
return mTokens;