Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-07-03 16:55:32 +02:00
commit b73517e3ee
3 changed files with 3 additions and 3 deletions

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<resources>
<string name="app_name">OsmAnd~</string>
<string name="app_name_free">OsmAndF~</string>
<string name="app_name_free">OsmAnd Nightly</string>
<!-- string name="app_version_suffix"></string -->
<!-- Not translatable -->

View file

@ -129,7 +129,7 @@ public class OsmandApplication extends MultiDexApplication {
@Override
public void onCreate() {
long timeToStart = System.currentTimeMillis();
if (Version.getAppName(this).equals("OsmAnd~")) {
if (Version.isDeveloperVersion(this)) {
if (android.os.Build.VERSION.SDK_INT >= 9) {
try {
Class.forName("net.osmand.plus.base.EnableStrictMode").newInstance();

View file

@ -113,7 +113,7 @@ public class Version {
}
public static boolean isDeveloperVersion(OsmandApplication ctx){
return getAppName(ctx).contains("~");
return getAppName(ctx).contains("~") || ctx.getPackageName().equals(FREE_DEV_VERSION_NAME);
}
public static String getVersionForTracker(OsmandApplication ctx) {