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

Fix NPE

Browse source
This commit is contained in:
Alex Sytnyk 2018-04-16 02:30:25 +03:00
parent aff0f0302a
commit a18b46278f
1 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -259,11 +259,14 @@ public class TravelLocalDataHelper {
@NonNull @NonNull
TLongObjectHashMap<WikivoyageSearchHistoryItem> getAllHistoryMap() { TLongObjectHashMap<WikivoyageSearchHistoryItem> getAllHistoryMap() {
TLongObjectHashMap<WikivoyageSearchHistoryItem> res = new TLongObjectHashMap<>(); TLongObjectHashMap<WikivoyageSearchHistoryItem> res = new TLongObjectHashMap<>();
String travelBook = getSelectedTravelBookName();
if (travelBook == null) {
return res;
}
SQLiteConnection conn = openConnection(true); SQLiteConnection conn = openConnection(true);
if (conn != null) { if (conn != null) {
try { try {
String query = HISTORY_TABLE_SELECT + " WHERE " + HISTORY_COL_TRAVEL_BOOK + " = ?"; String query = HISTORY_TABLE_SELECT + " WHERE " + HISTORY_COL_TRAVEL_BOOK + " = ?";
String travelBook = context.getTravelDbHelper().getSelectedTravelBook().getName();
SQLiteCursor cursor = conn.rawQuery(query, new String[]{travelBook}); SQLiteCursor cursor = conn.rawQuery(query, new String[]{travelBook});
if (cursor.moveToFirst()) { if (cursor.moveToFirst()) {
do { do {
@ -279,10 +282,13 @@ public class TravelLocalDataHelper {
} }
void addHistoryItem(WikivoyageSearchHistoryItem item) { void addHistoryItem(WikivoyageSearchHistoryItem item) {
String travelBook = getSelectedTravelBookName();
if (travelBook == null) {
return;
}
SQLiteConnection conn = openConnection(false); SQLiteConnection conn = openConnection(false);
if (conn != null) { if (conn != null) {
try { try {
String travelBook = context.getTravelDbHelper().getSelectedTravelBook().getName();
conn.execSQL("INSERT INTO " + HISTORY_TABLE_NAME + " VALUES (?, ?, ?, ?, ?, ?)", conn.execSQL("INSERT INTO " + HISTORY_TABLE_NAME + " VALUES (?, ?, ?, ?, ?, ?)",
new Object[]{item.cityId, item.articleTitle, item.lang, new Object[]{item.cityId, item.articleTitle, item.lang,
item.isPartOf, item.lastAccessed, travelBook}); item.isPartOf, item.lastAccessed, travelBook});
@ -293,10 +299,13 @@ public class TravelLocalDataHelper {
} }
void updateHistoryItem(WikivoyageSearchHistoryItem item) { void updateHistoryItem(WikivoyageSearchHistoryItem item) {
String travelBook = getSelectedTravelBookName();
if (travelBook == null) {
return;
}
SQLiteConnection conn = openConnection(false); SQLiteConnection conn = openConnection(false);
if (conn != null) { if (conn != null) {
try { try {
String travelBook = context.getTravelDbHelper().getSelectedTravelBook().getName();
conn.execSQL("UPDATE " + HISTORY_TABLE_NAME + " SET " + conn.execSQL("UPDATE " + HISTORY_TABLE_NAME + " SET " +
HISTORY_COL_ARTICLE_TITLE + " = ?, " + HISTORY_COL_ARTICLE_TITLE + " = ?, " +
HISTORY_COL_LANG + " = ?, " + HISTORY_COL_LANG + " = ?, " +
@ -313,10 +322,13 @@ public class TravelLocalDataHelper {
} }
void removeHistoryItem(WikivoyageSearchHistoryItem item) { void removeHistoryItem(WikivoyageSearchHistoryItem item) {
String travelBook = getSelectedTravelBookName();
if (travelBook == null) {
return;
}
SQLiteConnection conn = openConnection(false); SQLiteConnection conn = openConnection(false);
if (conn != null) { if (conn != null) {
try { try {
String travelBook = context.getTravelDbHelper().getSelectedTravelBook().getName();
conn.execSQL("DELETE FROM " + HISTORY_TABLE_NAME + conn.execSQL("DELETE FROM " + HISTORY_TABLE_NAME +
" WHERE " + HISTORY_COL_CITY_ID + " = ?" + " WHERE " + HISTORY_COL_CITY_ID + " = ?" +
" AND " + HISTORY_COL_TRAVEL_BOOK + " = ?", " AND " + HISTORY_COL_TRAVEL_BOOK + " = ?",
@ -328,10 +340,13 @@ public class TravelLocalDataHelper {
} }
void clearAllHistory() { void clearAllHistory() {
String travelBook = getSelectedTravelBookName();
if (travelBook == null) {
return;
}
SQLiteConnection conn = openConnection(false); SQLiteConnection conn = openConnection(false);
if (conn != null) { if (conn != null) {
try { try {
String travelBook = context.getTravelDbHelper().getSelectedTravelBook().getName();
conn.execSQL("DELETE FROM " + HISTORY_TABLE_NAME + conn.execSQL("DELETE FROM " + HISTORY_TABLE_NAME +
" WHERE " + HISTORY_COL_TRAVEL_BOOK + " = ?", " WHERE " + HISTORY_COL_TRAVEL_BOOK + " = ?",
new Object[]{travelBook}); new Object[]{travelBook});
@ -344,11 +359,14 @@ public class TravelLocalDataHelper {
@NonNull @NonNull
List<TravelArticle> getSavedArticles() { List<TravelArticle> getSavedArticles() {
List<TravelArticle> res = new ArrayList<>(); List<TravelArticle> res = new ArrayList<>();
String travelBook = getSelectedTravelBookName();
if (travelBook == null) {
return res;
}
SQLiteConnection conn = openConnection(true); SQLiteConnection conn = openConnection(true);
if (conn != null) { if (conn != null) {
try { try {
String query = BOOKMARKS_TABLE_SELECT + " WHERE " + BOOKMARKS_COL_TRAVEL_BOOK + " = ?"; String query = BOOKMARKS_TABLE_SELECT + " WHERE " + BOOKMARKS_COL_TRAVEL_BOOK + " = ?";
String travelBook = context.getTravelDbHelper().getSelectedTravelBook().getName();
SQLiteCursor cursor = conn.rawQuery(query, new String[]{travelBook}); SQLiteCursor cursor = conn.rawQuery(query, new String[]{travelBook});
if (cursor.moveToFirst()) { if (cursor.moveToFirst()) {
do { do {
@ -364,10 +382,13 @@ public class TravelLocalDataHelper {
} }
void addSavedArticle(TravelArticle article) { void addSavedArticle(TravelArticle article) {
String travelBook = getSelectedTravelBookName();
if (travelBook == null) {
return;
}
SQLiteConnection conn = openConnection(false); SQLiteConnection conn = openConnection(false);
if (conn != null) { if (conn != null) {
try { try {
String travelBook = context.getTravelDbHelper().getSelectedTravelBook().getName();
conn.execSQL("INSERT INTO " + BOOKMARKS_TABLE_NAME + " VALUES (?, ?, ?, ?, ?, ?, ?)", conn.execSQL("INSERT INTO " + BOOKMARKS_TABLE_NAME + " VALUES (?, ?, ?, ?, ?, ?, ?)",
new Object[]{article.cityId, article.title, article.lang, new Object[]{article.cityId, article.title, article.lang,
article.aggregatedPartOf, article.imageTitle, article.content, travelBook}); article.aggregatedPartOf, article.imageTitle, article.content, travelBook});
@ -378,10 +399,13 @@ public class TravelLocalDataHelper {
} }
void removeSavedArticle(TravelArticle article) { void removeSavedArticle(TravelArticle article) {
String travelBook = getSelectedTravelBookName();
if (travelBook == null) {
return;
}
SQLiteConnection conn = openConnection(false); SQLiteConnection conn = openConnection(false);
if (conn != null) { if (conn != null) {
try { try {
String travelBook = context.getTravelDbHelper().getSelectedTravelBook().getName();
conn.execSQL("DELETE FROM " + BOOKMARKS_TABLE_NAME + conn.execSQL("DELETE FROM " + BOOKMARKS_TABLE_NAME +
" WHERE " + BOOKMARKS_COL_CITY_ID + " = ?" + " WHERE " + BOOKMARKS_COL_CITY_ID + " = ?" +
" AND " + BOOKMARKS_COL_LANG + " = ?" + " AND " + BOOKMARKS_COL_LANG + " = ?" +
@ -393,6 +417,15 @@ public class TravelLocalDataHelper {
} }
} }
@Nullable
private String getSelectedTravelBookName() {
File selectedTravelBook = context.getTravelDbHelper().getSelectedTravelBook();
if (selectedTravelBook != null) {
return selectedTravelBook.getName();
}
return null;
}
private WikivoyageSearchHistoryItem readHistoryItem(SQLiteCursor cursor) { private WikivoyageSearchHistoryItem readHistoryItem(SQLiteCursor cursor) {
WikivoyageSearchHistoryItem res = new WikivoyageSearchHistoryItem(); WikivoyageSearchHistoryItem res = new WikivoyageSearchHistoryItem();