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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-07-18 10:29:50 +02:00
commit 8cb99f4866
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/AndroidManifest.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto"
android:versionName="@string/app_version"
android:versionCode="190"
android:versionCode="191"
package="net.osmand.plus">
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19"/>

3
OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file

@ -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);

1
OsmAnd/src/net/osmand/plus/osmo/OsMoService.java
View file

@ -248,6 +248,7 @@ public class OsMoService implements OsMoReactor {
try {
// Add your data
List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>(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()));

1
OsmAnd/src/net/osmand/plus/osmo/OsMoThread.java
View file

@ -439,6 +439,7 @@ public class OsMoThread {
}
public void reconnect() {
sessionInfo = null;
reconnect = true;
}
}