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

Update

Browse source
This commit is contained in:
Victor Shcherb 2014-08-13 02:49:23 +02:00
parent 4f5bbb8925
commit b5c68b6a93
3 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values/sherpafy.xml
View file

@ -2,7 +2,7 @@
<resources> <resources>
<string name="sherpafy_public_access">Public access</string> <string name="sherpafy_public_access">Public access</string>
<string name="start_new_stage">Do you want to interrupt current stage and start new ?</string> <string name="start_new_stage">Do you want to interrupt current stage and start new ?</string>
<string name="enter_access_code">Enter access code to see if you are entitled for a specific tour (optional)</string> <string name="enter_access_code">Enter access code for a specific tour (optional)</string>
<string name="sherpafy_stage_tab_fav">Fav</string> <string name="sherpafy_stage_tab_fav">Fav</string>
<string name="sherpafy_stage_tab_target">Target</string> <string name="sherpafy_stage_tab_target">Target</string>
<string name="sherpafy_stage_tab_route">Route</string> <string name="sherpafy_stage_tab_route">Route</string>

3
OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
View file

@ -10,7 +10,6 @@ import java.util.Map;
import java.util.TreeSet; import java.util.TreeSet;
import net.osmand.IProgress; import net.osmand.IProgress;
import net.osmand.IndexConstants;
import net.osmand.data.FavouritePoint; import net.osmand.data.FavouritePoint;
import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuAdapter;
import net.osmand.plus.GPXUtilities; import net.osmand.plus.GPXUtilities;
@ -318,7 +317,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
@Override @Override
public String getIndexesUrl() { public String getIndexesUrl() {
String s = "http://"+IndexConstants.INDEX_DOWNLOAD_DOMAIN+"/tours.php?gzip&" + Version.getVersionAsURLParam(app); String s = "http://"+"builder.osmand.net"+"/tours.php?gzip&" + Version.getVersionAsURLParam(app);
if(!Algorithms.isEmpty(accessCodePref.get())) { if(!Algorithms.isEmpty(accessCodePref.get())) {
s += "&code="+accessCodePref.get(); s += "&code="+accessCodePref.get();
} }

7
OsmAnd/src/net/osmand/plus/sherpafy/SherpafySelectToursFragment.java
View file

@ -2,18 +2,13 @@ package net.osmand.plus.sherpafy;
import java.util.List; import java.util.List;
import net.osmand.IProgress;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.DownloadIndexActivity;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.AlertDialog.Builder; import android.app.AlertDialog.Builder;
import android.app.ProgressDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.method.LinkMovementMethod; import android.text.method.LinkMovementMethod;
@ -103,7 +98,7 @@ public class SherpafySelectToursFragment extends SherlockListFragment {
((TourViewActivity) getActivity()).startDownloadActivity(); ((TourViewActivity) getActivity()).startDownloadActivity();
} }
}); });
builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
String acCode = editText.getText().toString(); String acCode = editText.getText().toString();