From 472efba59241c70020114bb20861f8b92d3f542f Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 27 May 2013 10:07:15 +0200
Subject: [PATCH] Update strict mode

---
 OsmAnd-java/src/net/osmand/NativeLibrary.java         | 2 +-
 OsmAnd-java/src/net/osmand/router/TestRouting.java    | 6 +++---
 OsmAnd/res/values/no_translate.xml                    | 2 +-
 OsmAnd/src/net/osmand/plus/base/EnableStrictMode.java | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/OsmAnd-java/src/net/osmand/NativeLibrary.java b/OsmAnd-java/src/net/osmand/NativeLibrary.java
index dc433a979c..6116be16c8 100644
--- a/OsmAnd-java/src/net/osmand/NativeLibrary.java
+++ b/OsmAnd-java/src/net/osmand/NativeLibrary.java
@@ -234,7 +234,7 @@ public class NativeLibrary {
 		// look for a pre-installed library
 		if (path != null) {
 			try {
-				System.load(path + libBaseName);
+				System.load(path + "/" + System.mapLibraryName(libBaseName));
 				return true;
 			} catch (UnsatisfiedLinkError e) {
 				log.error(e);
diff --git a/OsmAnd-java/src/net/osmand/router/TestRouting.java b/OsmAnd-java/src/net/osmand/router/TestRouting.java
index 8b5d019518..930113c795 100644
--- a/OsmAnd-java/src/net/osmand/router/TestRouting.java
+++ b/OsmAnd-java/src/net/osmand/router/TestRouting.java
@@ -30,10 +30,10 @@ import com.ibm.icu.text.DateFormat;
 public class TestRouting {
 	
 	public static int MEMORY_TEST_LIMIT = 800;
-	public static boolean TEST_WO_HEURISTIC = true; 
-	public static boolean TEST_BOTH_DIRECTION = true;
+	public static boolean TEST_WO_HEURISTIC = false; 
+	public static boolean TEST_BOTH_DIRECTION = false;
 	public static NativeLibrary lib = null;
-	public static boolean oldRouting = true;
+	public static boolean oldRouting = false;
 	
 	
 	public static Iterator getIterator(Iterable it){
diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml
index 5d4b5502b2..08a96266f8 100644
--- a/OsmAnd/res/values/no_translate.xml
+++ b/OsmAnd/res/values/no_translate.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
     <string name="app_name">OsmAnd~</string>
-    <string name="app_version">1.3 alpha</string>
+    <string name="app_version">1.4 alpha</string>
     <!-- Not translatable -->
     <string name="ga_api_key">UA-28342846-2</string>
     <string name="ga_dispatchPeriod">10</string>
diff --git a/OsmAnd/src/net/osmand/plus/base/EnableStrictMode.java b/OsmAnd/src/net/osmand/plus/base/EnableStrictMode.java
index df1e947c97..ecf9c01acd 100644
--- a/OsmAnd/src/net/osmand/plus/base/EnableStrictMode.java
+++ b/OsmAnd/src/net/osmand/plus/base/EnableStrictMode.java
@@ -5,8 +5,7 @@ import android.os.StrictMode;
 public class EnableStrictMode {
 
 	public EnableStrictMode(){
-		StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder().detectDiskWrites().detectNetwork().detectCustomSlowCalls().
-				detectDiskReads().
+		StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder().detectAll().
 				penaltyLog()./*penaltyDeath().*/build());
 		StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder().detectAll().penaltyLog()./*penaltyDeath().*/build());
 	}