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

refactor, fix null items list

Browse source
This commit is contained in:
veliymolfar 2020-02-25 18:19:25 +02:00
parent 1d98082fac
commit 0eecb08a4a
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
OsmAnd/src/net/osmand/plus/SettingsHelper.java
View file

@ -1593,15 +1593,14 @@ public class SettingsHelper {
JSONArray itemsJson = json.getJSONArray("items");
for (int i = 0; i < itemsJson.length(); i++) {
JSONObject itemJson = itemsJson.getJSONObject(i);
SettingsItem item = null;
SettingsItem item;
try {
item = createItem(itemJson);
} catch (IllegalArgumentException e) {
LOG.error("Error creating item from json: " + itemJson, e);
} finally {
if (item != null) {
items.add(item);
}
} catch (IllegalArgumentException e) {
LOG.error("Error creating item from json: " + itemJson, e);
}
}
if (items.size() == 0) {
@ -1864,10 +1863,12 @@ public class SettingsHelper {
}
@Override
protected void onPostExecute(List<SettingsItem> items) {
this.items = items;
protected void onPostExecute(@Nullable List<SettingsItem> items) {
if (items != null) {
this.items = items;
}
if (collectOnly) {
listener.onSettingsImportFinished(true, false, items);
listener.onSettingsImportFinished(true, false, this.items);
} else {
if (items != null && items.size() > 0) {
processNextItem();

6
OsmAnd/src/net/osmand/plus/settings/ExportProfileBottomSheet.java
View file

@ -205,9 +205,9 @@ public class ExportProfileBottomSheet extends BasePreferenceBottomSheet {
}
List<ITileSource> iTileSources = new ArrayList<>();
Set<String> tileSourceKeys = app.getSettings().getTileSourceEntries(true).keySet();
for (String key : tileSourceKeys) {
File f = app.getAppPath(IndexConstants.TILES_INDEX_DIR + key);
Set<String> tileSourceNames = app.getSettings().getTileSourceEntries(true).keySet();
for (String name : tileSourceNames) {
File f = app.getAppPath(IndexConstants.TILES_INDEX_DIR + name);
if (f != null) {
ITileSource template;
if (f.getName().endsWith(SQLiteTileSource.EXT)) {