From fc33a71cabb7f51c1118263e83573711f2946d02 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 16 Jul 2014 23:04:28 +0200 Subject: [PATCH 1/4] Fix BB release --- OsmAnd/src/net/osmand/plus/OsmandApplication.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java index 2523063e73..dc5c9e01cf 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java +++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java @@ -511,7 +511,8 @@ public class OsmandApplication extends Application { LOG.error("I/O exception", e); warnings.add("Error while reading the special phrases. Restart OsmAnd if possible"); } - if (!Version.isBlackberry(this)) { + + if (!Version.isBlackberry(this) || !"qnx".equals(System.getProperty("os.name"))) { if (osmandSettings.NATIVE_RENDERING_FAILED.get()) { osmandSettings.SAFE_MODE.set(true); osmandSettings.NATIVE_RENDERING_FAILED.set(false); From 786295277151e534896b04b30d08a4a02ee4342b Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Thu, 17 Jul 2014 22:15:28 +0200 Subject: [PATCH 2/4] Osmo service pass a version --- OsmAnd/src/net/osmand/plus/osmo/OsMoService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoService.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoService.java index f650ad28f6..fe9f985670 100644 --- a/OsmAnd/src/net/osmand/plus/osmo/OsMoService.java +++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoService.java @@ -248,6 +248,7 @@ public class OsMoService implements OsMoReactor { try { // Add your data List nameValuePairs = new ArrayList(2); + nameValuePairs.add(new BasicNameValuePair("app", Version.getFullVersion(app))); nameValuePairs.add(new BasicNameValuePair("key", deviceKey)); if(app.getSettings().OSMO_USER_PWD.get() != null) { nameValuePairs.add(new BasicNameValuePair("auth", app.getSettings().OSMO_USER_PWD.get())); From f40c818ca45d72c0efbf1d55f176d4749dcc51ce Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Fri, 18 Jul 2014 10:24:29 +0200 Subject: [PATCH 3/4] Android Manifest --- OsmAnd/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml index 330da244a5..e3cb204729 100644 --- a/OsmAnd/AndroidManifest.xml +++ b/OsmAnd/AndroidManifest.xml @@ -1,7 +1,7 @@ From 1f8c7d91e62c27e50d2bdb5b81aa4f8a1633ceb8 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Fri, 18 Jul 2014 10:27:42 +0200 Subject: [PATCH 4/4] Fix osmo login issue --- OsmAnd/src/net/osmand/plus/osmo/OsMoThread.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoThread.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoThread.java index 73b3d886bb..f638ac093c 100644 --- a/OsmAnd/src/net/osmand/plus/osmo/OsMoThread.java +++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoThread.java @@ -439,6 +439,7 @@ public class OsMoThread { } public void reconnect() { + sessionInfo = null; reconnect = true; } }