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

Update free version

Browse source
This commit is contained in:
Victor Shcherb 2012-05-29 18:57:54 +02:00
parent 56aaffd57f
commit 1b8126fdca
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/Version.java
View file

@ -10,6 +10,7 @@ public class Version {
private final String appVersion; private final String appVersion;
private final String appName; private final String appName;
private final static String FREE_VERSION_NAME = "net.osmand";
private Version(Context ctx) { private Version(Context ctx) {
appVersion = ctx.getString(R.string.app_version); appVersion = ctx.getString(R.string.app_version);
@ -52,6 +53,11 @@ public class Version {
} }
} }
public static boolean isFreeVersion(Context ctx){
return ctx.getPackageName().equals(FREE_VERSION_NAME);
}
public static String getVersionForTracker(Context ctx) { public static String getVersionForTracker(Context ctx) {
String v = Version.getAppName(ctx); String v = Version.getAppName(ctx);
if(Version.isProductionVersion(ctx)){ if(Version.isProductionVersion(ctx)){

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

@ -508,7 +508,7 @@ public class ResourceManager {
progress.startTask(context.getString(R.string.indexing_map) + " " + f.getName(), -1); //$NON-NLS-1$ progress.startTask(context.getString(R.string.indexing_map) + " " + f.getName(), -1); //$NON-NLS-1$
try { try {
BinaryMapIndexReader index = renderer.initializeNewResource(progress, f); BinaryMapIndexReader index = renderer.initializeNewResource(progress, f);
if (index == null) { if (index == null || (Version.isFreeVersion(context) && f.getName().contains("_wiki"))) {
warnings.add(MessageFormat.format(context.getString(R.string.version_index_is_not_supported), f.getName())); //$NON-NLS-1$ warnings.add(MessageFormat.format(context.getString(R.string.version_index_is_not_supported), f.getName())); //$NON-NLS-1$
} else { } else {
if(index.isBasemap()) { if(index.isBasemap()) {

6
OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java
View file

@ -24,6 +24,7 @@ import java.util.TreeSet;
import net.osmand.Algoritms; import net.osmand.Algoritms;
import net.osmand.IProgress; import net.osmand.IProgress;
import net.osmand.Version;
import net.osmand.access.AccessibleToast; import net.osmand.access.AccessibleToast;
import net.osmand.data.IndexConstants; import net.osmand.data.IndexConstants;
import net.osmand.plus.DownloadOsmandIndexesHelper; import net.osmand.plus.DownloadOsmandIndexesHelper;
@ -89,7 +90,6 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
private Map<String, String> indexActivatedFileNames = null; private Map<String, String> indexActivatedFileNames = null;
private TreeMap<String, DownloadEntry> entriesToDownload = new TreeMap<String, DownloadEntry>(); private TreeMap<String, DownloadEntry> entriesToDownload = new TreeMap<String, DownloadEntry>();
private String FREE_VERSION_NAME = "net.osmand";
private int MAXIMUM_AVAILABLE_FREE_DOWNLOADS = 8; private int MAXIMUM_AVAILABLE_FREE_DOWNLOADS = 8;
@ -158,7 +158,7 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
} else { } else {
downloadIndexList(); downloadIndexList();
} }
if(getPackageName().equals(FREE_VERSION_NAME) && settings.checkFreeDownloadsNumberZero()){ if(Version.isFreeVersion(this) && settings.checkFreeDownloadsNumberZero()){
Builder msg = new AlertDialog.Builder(this); Builder msg = new AlertDialog.Builder(this);
msg.setTitle(R.string.free_version_title); msg.setTitle(R.string.free_version_title);
msg.setMessage(getString(R.string.free_version_message, MAXIMUM_AVAILABLE_FREE_DOWNLOADS+"", "")); msg.setMessage(getString(R.string.free_version_message, MAXIMUM_AVAILABLE_FREE_DOWNLOADS+"", ""));
@ -449,7 +449,7 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
} }
protected void downloadFilesCheckFreeVersion() { protected void downloadFilesCheckFreeVersion() {
if (getPackageName().equals(FREE_VERSION_NAME)) { if (Version.isFreeVersion(this)) {
int total = settings.NUMBER_OF_FREE_DOWNLOADS.get() + entriesToDownload.size(); int total = settings.NUMBER_OF_FREE_DOWNLOADS.get() + entriesToDownload.size();
boolean wiki = false; boolean wiki = false;
for (DownloadEntry es : entriesToDownload.values()) { for (DownloadEntry es : entriesToDownload.values()) {