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

Fix null pointer

Browse source
This commit is contained in:
Victor Shcherb 2018-05-01 10:30:03 +03:00
parent 74c04cb810
commit 584d7f1102
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -232,18 +232,19 @@ public class TravelDbHelper {
String language = application.getLanguage();
List<PopularArticle> popReadArticles = new ArrayList<>();
SQLiteConnection conn = openConnection();
if (conn != null) {
SQLiteCursor cursor = conn.rawQuery(POP_ARTICLES_TABLE_SELECT, null);
if (cursor.moveToFirst()) {
do {
PopularArticle travelArticle = PopularArticle.readArticle(cursor);
if(language.equals(travelArticle.lang)) {
popReadArticles.add(travelArticle);
}
} while (cursor.moveToNext());
}
cursor.close();
if (conn == null) {
return res;
}
SQLiteCursor cursor = conn.rawQuery(POP_ARTICLES_TABLE_SELECT, null);
if (cursor.moveToFirst()) {
do {
PopularArticle travelArticle = PopularArticle.readArticle(cursor);
if (language.equals(travelArticle.lang)) {
popReadArticles.add(travelArticle);
}
} while (cursor.moveToNext());
}
cursor.close();
sortPopArticlesByDistance(popReadArticles);
StringBuilder bld = new StringBuilder();
bld.append(ARTICLES_TABLE_SELECT).append(" WHERE "+ARTICLES_COL_LANG+" = '"+language+"'"
@ -255,7 +256,7 @@ public class TravelDbHelper {
bld.append(popReadArticles.get(i).cityId);
}
bld.append(")");
SQLiteCursor cursor = conn.rawQuery(bld.toString(), null);
cursor = conn.rawQuery(bld.toString(), null);
if (cursor.moveToFirst()) {
do {
TravelArticle travelArticle = readArticle(cursor);