Merge remote-tracking branch 'origin/master'

OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java

@@ -42,6 +42,7 @@ public class GeoPointParserUtil {
 				"geo:0,0?m",
 				"geo:0,0?m=",
 				"geo:0,0?m=foo",
+				"geo:0,0?q=%D0%9D%D0",
 				"http://download.osmand.net/go?lat",
 				"http://download.osmand.net/go?lat=",
 				"http://download.osmand.net/go?lat=34.99393",
@@ -786,6 +787,7 @@ public class GeoPointParserUtil {
 	 * @return {@link GeoParsedPoint}
 	 */
 	public static GeoParsedPoint parse(final String uriString) {
+		System.out.println("parse(" + "uriString=" + uriString + ")");
 		URI uri;
 		try {
 			// amap.com uses | in their URLs, which is an illegal character for a URL

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

@@ -51,6 +51,13 @@ public class FavoritesListFragment extends OsmAndListFragment implements SearchA
 	public void onAttach(Activity activity) {
 		super.onAttach(activity);
 		Intent intent = activity.getIntent();
+		settings = getApplication().getSettings();
+		OsmandApplication app = getApplication();
+		favouritesAdapter = new FavouritesAdapter(activity, app.getFavorites().getFavouritePoints(),
+				!selectFavoriteMode);
+		setListAdapter(favouritesAdapter);
+		setHasOptionsMenu(true);
+
 		if (intent != null) {
 			selectFavoriteMode = intent.hasExtra(SELECT_FAVORITE_POINT_INTENT_KEY);
 			if (intent.hasExtra(SearchActivity.SEARCH_LAT) && intent.hasExtra(SearchActivity.SEARCH_LON)) {
@@ -61,12 +68,6 @@ public class FavoritesListFragment extends OsmAndListFragment implements SearchA
 				}
 			}
 		}
-		settings = ((OsmandApplication) getApplication()).getSettings();
-		OsmandApplication app = (OsmandApplication) getApplication();
-		favouritesAdapter = new FavouritesAdapter(activity, app.getFavorites().getFavouritePoints(),
-				!selectFavoriteMode);
-		setListAdapter(favouritesAdapter);
-		setHasOptionsMenu(true);
 	}
 
 	private OsmandApplication getApplication() {