diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index b61cd2e424..0c3dad131a 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -148,7 +148,8 @@
-
+
+
diff --git a/OsmAnd/OsmAnd.iml b/OsmAnd/OsmAnd.iml
index a55da77b74..3c1f6157ea 100644
--- a/OsmAnd/OsmAnd.iml
+++ b/OsmAnd/OsmAnd.iml
@@ -26,7 +26,7 @@
-
+
diff --git a/OsmAnd/osmand.properties b/OsmAnd/osmand.properties
new file mode 100644
index 0000000000..858a19ae97
--- /dev/null
+++ b/OsmAnd/osmand.properties
@@ -0,0 +1,4 @@
+path.variable.maven_repository=C\:\\Users\\Barsik\\.m2\\repository
+jdk.home.1.6=G\:/glassfish3/jdk
+jdk.home.android_api_19_platform=H\:/Work/Android SDK/adt-bundle-windows-x86_64-20140321/sdk
+javac2.instrumentation.includeJavaRuntime=false
\ No newline at end of file
diff --git a/OsmAnd/osmand.xml b/OsmAnd/osmand.xml
new file mode 100644
index 0000000000..67c4ba9dc9
--- /dev/null
+++ b/OsmAnd/osmand.xml
@@ -0,0 +1,426 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/osmand_Tue_May_27_23-11-45_EEST_2014.properties b/OsmAnd/osmand_Tue_May_27_23-11-45_EEST_2014.properties
new file mode 100644
index 0000000000..858a19ae97
--- /dev/null
+++ b/OsmAnd/osmand_Tue_May_27_23-11-45_EEST_2014.properties
@@ -0,0 +1,4 @@
+path.variable.maven_repository=C\:\\Users\\Barsik\\.m2\\repository
+jdk.home.1.6=G\:/glassfish3/jdk
+jdk.home.android_api_19_platform=H\:/Work/Android SDK/adt-bundle-windows-x86_64-20140321/sdk
+javac2.instrumentation.includeJavaRuntime=false
\ No newline at end of file
diff --git a/OsmAnd/osmand_Tue_May_27_23-11-45_EEST_2014.xml b/OsmAnd/osmand_Tue_May_27_23-11-45_EEST_2014.xml
new file mode 100644
index 0000000000..54b48cc111
--- /dev/null
+++ b/OsmAnd/osmand_Tue_May_27_23-11-45_EEST_2014.xml
@@ -0,0 +1,434 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/osmand_Wed_May_28_00-23-29_EEST_2014.properties b/OsmAnd/osmand_Wed_May_28_00-23-29_EEST_2014.properties
new file mode 100644
index 0000000000..858a19ae97
--- /dev/null
+++ b/OsmAnd/osmand_Wed_May_28_00-23-29_EEST_2014.properties
@@ -0,0 +1,4 @@
+path.variable.maven_repository=C\:\\Users\\Barsik\\.m2\\repository
+jdk.home.1.6=G\:/glassfish3/jdk
+jdk.home.android_api_19_platform=H\:/Work/Android SDK/adt-bundle-windows-x86_64-20140321/sdk
+javac2.instrumentation.includeJavaRuntime=false
\ No newline at end of file
diff --git a/OsmAnd/osmand_Wed_May_28_00-23-29_EEST_2014.xml b/OsmAnd/osmand_Wed_May_28_00-23-29_EEST_2014.xml
new file mode 100644
index 0000000000..67c4ba9dc9
--- /dev/null
+++ b/OsmAnd/osmand_Wed_May_28_00-23-29_EEST_2014.xml
@@ -0,0 +1,426 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/custom_tour_info.xml b/OsmAnd/res/layout/custom_tour_info.xml
new file mode 100644
index 0000000000..1e060d052a
--- /dev/null
+++ b/OsmAnd/res/layout/custom_tour_info.xml
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/sherpafy_start.xml b/OsmAnd/res/layout/sherpafy_start.xml
new file mode 100644
index 0000000000..52b776b577
--- /dev/null
+++ b/OsmAnd/res/layout/sherpafy_start.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index 90aa5b9b36..a6e391a627 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -43,6 +43,7 @@ import android.view.animation.Animation;
import android.view.animation.Transformation;
import android.view.animation.TranslateAnimation;
import android.widget.TextView;
+import net.osmand.plus.sherpafy.SherpafyStartActivity;
public class MainMenuActivity extends Activity {
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
index 3c467133bf..e49a373b0d 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
@@ -63,17 +63,19 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
TextView v = (TextView) window.findViewById(R.id.AppName);
v.setText("Sherpafy");
- TextView toursButtonText = (TextView) window.findViewById(R.id.SettingsButtonText);
- toursButtonText.setText(R.string.tour);
- View toursButton = window.findViewById(R.id.SettingsButton);
- toursButton.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- final Intent search = new Intent(activity, getTourSelectionActivity());
- search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
- activity.startActivity(search);
- }
- });
+// TextView toursButtonText = (TextView) window.findViewById(R.id.SettingsButtonText);
+// toursButtonText.setText(R.string.tour);
+// View toursButton = window.findViewById(R.id.SettingsButton);
+// toursButton.setOnClickListener(new OnClickListener() {
+// @Override
+// public void onClick(View v) {
+// final Intent search = new Intent(activity, getTourSelectionActivity());
+// search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+// activity.startActivity(search);
+// }
+// });
+
+
// the image could be also updated
}
@@ -88,8 +90,8 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
}
public void updatedLoadedFiles(java.util.Map indexFileNames, java.util.Map indexActivatedFileNames) {
-// DownloadIndexActivity.listWithAlternatives(app.getResourceManager().getDateFormat(),
-// toursFolder, "", indexFileNames);
+ DownloadIndexActivity.listWithAlternatives(app.getResourceManager().getDateFormat(),
+ toursFolder, "", indexFileNames);
}
public List onIndexingFiles(IProgress progress, Map indexFileNames) {
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStartActivity.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStartActivity.java
new file mode 100644
index 0000000000..b5dab9cf9a
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyStartActivity.java
@@ -0,0 +1,179 @@
+package net.osmand.plus.sherpafy;
+
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import net.osmand.IProgress;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.activities.DownloadIndexActivity;
+
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Created by Barsik on 30.05.2014.
+ */
+public class SherpafyStartActivity extends SherlockFragmentActivity {
+
+ private ProgressDialog startProgressDialog;
+ private SherpafyCustomization customization;
+
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ ((OsmandApplication) getApplication()).applyTheme(this);
+ super.onCreate(savedInstanceState);
+ getSherlock().setUiOptions(ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ getSupportActionBar().setTitle("Sherpafy");
+
+ if (!(getMyApplication().getAppCustomization() instanceof SherpafyCustomization)) {
+ getMyApplication().setAppCustomization(new SherpafyCustomization());
+ }
+
+ customization = (SherpafyCustomization) getMyApplication().getAppCustomization();
+
+ if (customization.getTourInformations().isEmpty())
+ {
+ customization.onIndexingFiles(new IProgress() {
+ @Override
+ public void startTask(String taskName, int work) {
+
+ }
+
+ @Override
+ public void startWork(int work) {
+
+ }
+
+ @Override
+ public void progress(int deltaWork) {
+
+ }
+
+ @Override
+ public void remaining(int remainingWork) {
+
+ }
+
+ @Override
+ public void finishTask() {
+
+ }
+
+ @Override
+ public boolean isIndeterminate() {
+ return false;
+ }
+
+ @Override
+ public boolean isInterrupted() {
+ return false;
+ }
+ }, new ConcurrentHashMap() );
+ }
+
+ if (customization.getSelectedTour() == null) {
+
+ startProgressDialog = new ProgressDialog(this);
+ getMyApplication().checkApplicationIsBeingInitialized(this, startProgressDialog);
+
+ updateDefaultView();
+ } else {
+ super.setContentView(R.layout.custom_tour_info);
+ updateTourView();
+ }
+
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ if (customization.getSelectedTour() != null)
+ {
+ super.setContentView(R.layout.custom_tour_info);
+ updateTourView();
+ }
+ }
+
+ @Override
+ protected void onPause() {
+ super.onPause();
+ }
+
+ private OsmandApplication getMyApplication() {
+ return (OsmandApplication) getApplication();
+ }
+
+ private void updateDefaultView(){
+ super.setContentView(R.layout.sherpafy_start);
+
+ Button selectTour = (Button) findViewById(R.id.select_tour);
+ selectTour.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ final Intent select = new Intent(v.getContext(), TourCommonActivity.class);
+ select.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+ v.getContext().startActivity(select);
+ }
+ });
+
+
+ Button downloadTour = (Button) findViewById(R.id.download_tour);
+ downloadTour.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ final Intent download = new Intent(v.getContext(), DownloadIndexActivity.class);
+ download.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+ v.getContext().startActivity(download);
+ }
+ });
+ }
+
+ private void updateTourView() {
+ ImageView img = (ImageView) findViewById(R.id.tour_image);
+ TextView description = (TextView) findViewById(R.id.tour_description);
+ TextView fullDescription = (TextView) findViewById(R.id.tour_fulldescription);
+ TextView name = (TextView) findViewById(R.id.tour_name);
+ Button start_tour = (Button) findViewById(R.id.start_tour);
+ Button itenerary = (Button) findViewById(R.id.itenerary);
+ Button settings = (Button) findViewById(R.id.settings);
+
+ settings.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ updateDefaultView();
+ }
+ });
+
+ TourInformation tour = customization.getSelectedTour();
+ List stages = tour.getStageInformation();
+
+ name.setText(tour.getName());
+ description.setText(tour.getShortDescription());
+ description.setVisibility(View.VISIBLE);
+ fullDescription.setText(tour.getFulldescription());
+ fullDescription.setVisibility(View.VISIBLE);
+ final Bitmap imageBitmap = tour.getImageBitmap();
+ if (imageBitmap != null) {
+ img.setImageBitmap(imageBitmap);
+ img.setAdjustViewBounds(true);
+ img.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+ img.setCropToPadding(true);
+ img.setVisibility(View.VISIBLE);
+ } else {
+ img.setVisibility(View.GONE);
+ }
+
+ }
+
+
+}
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/TourCommonActivity.java b/OsmAnd/src/net/osmand/plus/sherpafy/TourCommonActivity.java
index 682d515d41..107ee5c06d 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/TourCommonActivity.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/TourCommonActivity.java
@@ -49,10 +49,10 @@ public class TourCommonActivity extends SherlockFragmentActivity {
ViewPager mViewPager = (ViewPager)findViewById(R.id.pager);
mTabsAdapter = new TabsAdapter(this, tabHost, mViewPager);
- mTabsAdapter.addTab(tabHost.newTabSpec(TOUR_INFO).setIndicator(getString(R.string.tab_current_tour)),
- TourInformationFragment.class, null);
- mTabsAdapter.addTab(tabHost.newTabSpec(TOUR_STAGE).setIndicator(getString(R.string.tab_stages)),
- TourStageFragment.class, null);
+// mTabsAdapter.addTab(tabHost.newTabSpec(TOUR_INFO).setIndicator(getString(R.string.tab_current_tour)),
+// TourInformationFragment.class, null);
+// mTabsAdapter.addTab(tabHost.newTabSpec(TOUR_STAGE).setIndicator(getString(R.string.tab_stages)),
+// TourStageFragment.class, null);
mTabsAdapter.addTab(tabHost.newTabSpec(TOUR_SELECTION).setIndicator(getString(R.string.tab_tours)),
TourSelectionFragment.class, null);
if (savedInstanceState != null) {
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/TourSelectionFragment.java b/OsmAnd/src/net/osmand/plus/sherpafy/TourSelectionFragment.java
index c15a7024cd..df4bc72a63 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/TourSelectionFragment.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/TourSelectionFragment.java
@@ -4,8 +4,13 @@
package net.osmand.plus.sherpafy;
import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import android.app.ProgressDialog;
+import android.widget.*;
+import net.osmand.IProgress;
import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.ProgressDialogImplementation;
import net.osmand.plus.R;
import net.osmand.plus.sherpafy.TourCommonActivity.TourFragment;
import android.content.Intent;
@@ -13,10 +18,6 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
import com.actionbarsherlock.app.SherlockListFragment;
import com.actionbarsherlock.view.Menu;
@@ -30,14 +31,14 @@ public class TourSelectionFragment extends SherlockListFragment implements TourF
private static final int DOWNLOAD_MORE = 0;
private SherpafyCustomization appCtx;
private boolean lightContent;
-
-
+
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
appCtx = (SherpafyCustomization) getApp().getAppCustomization();
lightContent = getApp().getSettings().isLightContent();
setHasOptionsMenu(true);
+
// ListActivity has a ListView, which you can get with:
//ListView lv = getListView();
// Then you can create a listener like so:
@@ -77,8 +78,6 @@ public class TourSelectionFragment extends SherlockListFragment implements TourF
final TourInformation tour = ((LocalAdapter) getListAdapter()).getItem(position);
if(appCtx.getSelectedTour() != tour) {
((TourCommonActivity) getActivity()).selectTour(tour);
- } else {
- ((TourCommonActivity) getActivity()).selectTour(null);
}
}
@@ -118,7 +117,7 @@ public class TourSelectionFragment extends SherlockListFragment implements TourF
@Override
public void refreshTour() {
setListAdapter(new LocalAdapter(appCtx.getTourInformations()));
-
+
}
}
diff --git a/SherlockBar/local.properties b/SherlockBar/local.properties
new file mode 100644
index 0000000000..2254b819ce
--- /dev/null
+++ b/SherlockBar/local.properties
@@ -0,0 +1,10 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked in Version Control Systems,
+# as it contains information specific to your local configuration.
+
+# location of the SDK. This is only used by Ant
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=H:\\Work\\Android SDK\\adt-bundle-windows-x86_64-20140321\\sdk\\
\ No newline at end of file
diff --git a/plugins/Osmand-Sherpafy/Osmand-Sherpafy.iml b/plugins/Osmand-Sherpafy/Osmand-Sherpafy.iml
index fcb91eb6fe..cd4d7005af 100644
--- a/plugins/Osmand-Sherpafy/Osmand-Sherpafy.iml
+++ b/plugins/Osmand-Sherpafy/Osmand-Sherpafy.iml
@@ -19,9 +19,9 @@
-
+
-
+
diff --git a/plugins/Osmand-Sherpafy/src/net/osmand/sherpafy/SherpafyPluginActivity.java b/plugins/Osmand-Sherpafy/src/net/osmand/sherpafy/SherpafyPluginActivity.java
index a35c267b2f..7a1fba930f 100644
--- a/plugins/Osmand-Sherpafy/src/net/osmand/sherpafy/SherpafyPluginActivity.java
+++ b/plugins/Osmand-Sherpafy/src/net/osmand/sherpafy/SherpafyPluginActivity.java
@@ -14,7 +14,7 @@ import android.os.Bundle;
public class SherpafyPluginActivity extends Activity {
private static final String OSMAND_COMPONENT = "net.osmand"; //$NON-NLS-1$
private static final String OSMAND_COMPONENT_PLUS = "net.osmand.plus"; //$NON-NLS-1$
- private static final String OSMAND_ACTIVITY = "net.osmand.plus.activities.MainMenuActivity"; //$NON-NLS-1$
+ private static final String OSMAND_ACTIVITY = "net.osmand.plus.sherpafy.SherpafyStartActivity"; //$NON-NLS-1$
/** Called when the activity is first created. */
@Override
@@ -28,7 +28,6 @@ public class SherpafyPluginActivity extends Activity {
ResolveInfo resolved = getPackageManager().resolveActivity(intentPlus, PackageManager.MATCH_DEFAULT_ONLY);
if(resolved != null) {
stopService(intentPlus);
- intentPlus.putExtra("SHERPAFY", true);
startActivity(intentPlus);
finish();
} else {