From b5c68b6a93b555093463a389a75a251651d8c50d Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 13 Aug 2014 02:49:23 +0200
Subject: [PATCH] Update

---
 OsmAnd/res/values/sherpafy.xml                             | 2 +-
 .../net/osmand/plus/sherpafy/SherpafyCustomization.java    | 3 +--
 .../osmand/plus/sherpafy/SherpafySelectToursFragment.java  | 7 +------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/res/values/sherpafy.xml b/OsmAnd/res/values/sherpafy.xml
index 27958d514f..d52a9f6b75 100644
--- a/OsmAnd/res/values/sherpafy.xml
+++ b/OsmAnd/res/values/sherpafy.xml
@@ -2,7 +2,7 @@
 <resources>
     <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="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_target">Target</string>
     <string name="sherpafy_stage_tab_route">Route</string>
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
index 779e5e07da..84ac8014b7 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
@@ -10,7 +10,6 @@ import java.util.Map;
 import java.util.TreeSet;
 
 import net.osmand.IProgress;
-import net.osmand.IndexConstants;
 import net.osmand.data.FavouritePoint;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.GPXUtilities;
@@ -318,7 +317,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 	
 	@Override
 	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())) {
 			s += "&code="+accessCodePref.get();
 		}
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafySelectToursFragment.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafySelectToursFragment.java
index a19f6471a8..b27b55f957 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafySelectToursFragment.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafySelectToursFragment.java
@@ -2,18 +2,13 @@ package net.osmand.plus.sherpafy;
 
 import java.util.List;
 
-import net.osmand.IProgress;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
-import net.osmand.plus.activities.DownloadIndexActivity;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
-import android.app.ProgressDialog;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.graphics.Typeface;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
@@ -103,7 +98,7 @@ public class SherpafySelectToursFragment extends SherlockListFragment {
 				((TourViewActivity) getActivity()).startDownloadActivity();
 			}
 		});
-		builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
+		builder.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				String acCode = editText.getText().toString();