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

Fix #1852

Browse source
This commit is contained in:
Victor Shcherb 2015-11-01 22:55:07 +01:00
parent 0e6a01fd75
commit dc307e4b5f
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java
View file

@ -290,6 +290,7 @@ public class MapPoiTypes {
for(String lng : MapRenderingTypes.langs) {
parsePoiAdditional(parser, lastCategory, lastFilter, lastType, lng);
}
parsePoiAdditional(parser, lastCategory, lastFilter, lastType, "en");
}
parsePoiAdditional(parser, lastCategory, lastFilter, lastType, null);
} else if (name.equals("poi_type")) {

4
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -1,6 +1,7 @@
package net.osmand.plus;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.res.Configuration;
@ -11,7 +12,6 @@ import android.net.NetworkInfo;
import android.os.Build;
import android.os.Environment;
import android.support.annotation.Nullable;
import net.osmand.IndexConstants;
import net.osmand.StateChangedListener;
import net.osmand.ValueHolder;
@ -29,7 +29,6 @@ import net.osmand.plus.helpers.SearchHistoryHelper;
import net.osmand.plus.render.RendererRegistry;
import net.osmand.plus.routing.RouteProvider.RouteService;
import net.osmand.render.RenderingRulesStorage;
import java.io.File;
import java.io.IOException;
import java.lang.ref.WeakReference;
@ -1313,6 +1312,7 @@ public class OsmandSettings {
putString(EXTERNAL_STORAGE_DIR_V19, externalStorageDir).commit();
}
@SuppressLint("NewApi")
@Nullable
public File getSecondaryStorage() {
if(Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {