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

Update version

Browse source
This commit is contained in:
Victor Shcherb 2015-05-03 01:00:58 +02:00
parent 345d02e061
commit 8c757cf8f3
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
OsmAnd/proguard-project.txt
View file

@ -7,17 +7,29 @@
# Allow obfuscation of android.support.v7.internal.view.menu.** # Allow obfuscation of android.support.v7.internal.view.menu.**
# to avoid problem on Samsung 4.2.2 devices with appcompat v21 # to avoid problem on Samsung 4.2.2 devices with appcompat v21
# see https://code.google.com/p/android/issues/detail?id=78377 # see https://code.google.com/p/android/issues/detail?id=78377
-dontoptimize
-keep class !android.support.v7.internal.view.menu.**,android.support.** {*;} -keep class !android.support.v7.internal.view.menu.**,android.support.** {*;}
-keep class net.osmand.** { *; } -keep class net.osmand.** { *; }
-keep interface net.osmand.** { *; } -keep interface net.osmand.** { *; }
-keep class com.google.** { *; } -keep class com.** { *; }
-keep interface com.google.** { *; } -keep interface com.** { *; }
-keep class com.jwetherell.** { *; }
-keep interface com.jwetherell.** { *; } -keep class net.** { *; }
-keep interface net.** { *; }
-keep class gnu.** { *; }
-keep interface gnu.** { *; }
-keep class org.** { *; }
-keep interface org.** { *; }
-keep class bsh.** { *; }
-keep interface bsh.** { *; }
-keep class btools.** { *; } -keep class btools.** { *; }
-keep interface btools.** { *; } -keep interface btools.** { *; }
-keep class alice.** { *; } -keep class alice.** { *; }
-keep interface alice.** { *; } -keep interface alice.** { *; }
-dontwarn alice.** -dontwarn alice.**

2
OsmAnd/src/net/osmand/plus/Version.java
View file

@ -96,7 +96,7 @@ public class Version {
} }
public static boolean isDeveloperVersion(OsmandApplication ctx){ public static boolean isDeveloperVersion(OsmandApplication ctx){
return "osmand~".equalsIgnoreCase(getAppName(ctx)) ; return "osmand~".equalsIgnoreCase(getAppName(ctx)) || "osmand~f".equalsIgnoreCase(getAppName(ctx)) ;
} }

3
OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
View file

@ -70,8 +70,7 @@ public class SettingsActivity extends SettingsBaseActivity {
startActivity(new Intent(this, SettingsNavigationActivity.class)); startActivity(new Intent(this, SettingsNavigationActivity.class));
} }
} }
if ((Version.getBuildAppEdition(getMyApplication()).length() > 0 if ((Version.isDeveloperVersion(getMyApplication())) &&
|| Version.isDeveloperVersion(getMyApplication())) &&
OsmandPlugin.getEnabledPlugin(OsmandDevelopmentPlugin.class) != null){ OsmandPlugin.getEnabledPlugin(OsmandDevelopmentPlugin.class) != null){
version = new Preference(this); version = new Preference(this);
version.setOnPreferenceClickListener(this); version.setOnPreferenceClickListener(this);