Update version

OsmAnd/proguard-project.txt

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

OsmAnd/src/net/osmand/plus/Version.java

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

OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java

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