Merge remote-tracking branch 'origin/master'

OsmAnd/AndroidManifest-free.xml

@@ -14,16 +14,6 @@
             android:name="com.facebook.FacebookActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
             android:label="@string/app_name_free"/>
-        <activity
-            android:name="com.facebook.CustomTabActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:scheme="@string/fb_login_protocol_scheme"/>
-            </intent-filter>
-        </activity>
 
         <activity
             android:name="net.osmand.plus.activities.MapActivity"

OsmAnd/no_translate.xml

@@ -6,7 +6,6 @@
 
     <!-- Not translatable -->
     <string name="facebook_app_id">2057524931189530</string>
-    <string name="fb_login_protocol_scheme">fb2057524931189530</string>
     <string name="full_version_price">€7,99</string>
     <string name="osm_live">OsmAnd Live</string>
     <string name="ga_api_key">UA-28342846-2</string>

OsmAnd/res/layout/search_more_list_item.xml

@@ -39,12 +39,12 @@
                 android:orientation="vertical">
 
                 <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/empty_search_title"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:text="@string/nothing_found"
                     android:textColor="?android:attr/textColorPrimary"
                     android:textSize="@dimen/default_list_text_size"
-                    osmand:typeface="@string/font_roboto_medium"/>
+                    tools:text="@string/nothing_found_in_radius" />
 
                 <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/empty_search_description"

OsmAnd/res/values-ru/strings.xml

@@ -2480,7 +2480,7 @@
     <string name="distance_moving">Откорректированное расстояние</string>
     <string name="improve_coverage_install_mapillary_desc">Вы можете взять ваши собственные фотографии или серии фотографий и прикрепить их к этому месту на карте.
 \n
-\nДля этого Вам необходимо установить с Goggle Play маркета приложение Mapillary.</string>
+\nДля этого Вам необходимо установить с Google Play маркета приложение Mapillary.</string>
     <string name="route_altitude">Высота маршрута</string>
     <string name="enter_gpx_name">Имя GPX файла:</string>
     <string name="show_on_map_after_saving">Показать на карте после сохранения</string>

OsmAnd/res/values/strings.xml

@@ -9,6 +9,7 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="nothing_found_in_radius">We did not find anything in the radius:</string>
     <string name="select_waypoints_category_description">You can add all of the track\'s waypoints, or select separate categories.</string>
     <string name="shared_string_total">Total</string>
     <string name="clear_all_intermediates">Clear all intermediate points</string>

OsmAnd/src/net/osmand/plus/AppInitializer.java

@@ -13,7 +13,6 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
 import android.support.v7.app.AlertDialog;
-import android.util.DisplayMetrics;
 
 import net.osmand.IProgress;
 import net.osmand.IndexConstants;
@@ -606,6 +605,7 @@ public class AppInitializer implements IProgress {
 			// restore backuped favorites to normal file
 			restoreBackupForFavoritesFiles();
 			notifyEvent(InitEvents.RESTORE_BACKUPS);
+			app.mapMarkersHelper.syncAllGroupsAsync();
 			app.searchUICore.initSearchUICore();
 			checkLiveUpdatesAlerts();
 			

OsmAnd/src/net/osmand/plus/MapMarkersHelper.java

@@ -157,11 +157,9 @@ public class MapMarkersHelper {
 		for (MapMarkersGroup group : mapMarkersGroups) {
 			updateGroup(group);
 		}
-
-		syncAllGroupsAsync();
 	}
 
-	private void syncAllGroupsAsync() {
+	public void syncAllGroupsAsync() {
 		for (MapMarkersGroup gr : mapMarkersGroups) {
 			if (gr.getId() != null && gr.getName() != null) {
 				runSynchronization(gr);
@@ -312,8 +310,6 @@ public class MapMarkersHelper {
 			markersDbHelper.addGroup(group);
 			addHistoryMarkersToGroup(group);
 			addToGroupsList(group);
-		} else if (group.wptCategories != null) {
-			markersDbHelper.updateGroupCategories(group.getId(), group.getWptCategoriesString());
 		}
 		runSynchronization(group);
 	}
@@ -343,6 +339,16 @@ public class MapMarkersHelper {
 		}
 	}
 
+	public void updateGroupWptCategories(@NonNull MapMarkersGroup group, Set<String> wptCategories) {
+		String id = group.getId();
+		if (id != null) {
+			group.wptCategories = wptCategories;
+			if (wptCategories != null && isGroupSynced(id)) {
+				markersDbHelper.updateGroupCategories(id, group.getWptCategoriesString());
+			}
+		}
+	}
+
 	private void removeGroupActiveMarkers(MapMarkersGroup group, boolean updateGroup) {
 		if (group != null) {
 			markersDbHelper.removeActiveMarkersFromGroup(group.getId());

OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java

@@ -123,7 +123,7 @@ public class SelectWptCategoriesBottomSheetDialogFragment extends MenuBottomShee
 		}
 
 		MapMarkersGroup markersGr = mapMarkersHelper.getOrCreateGroup(new File(gpxFile.path));
-		markersGr.setWptCategories(selectedCategories);
+		mapMarkersHelper.updateGroupWptCategories(markersGr, selectedCategories);
 
 		mapMarkersHelper.syncWithMarkers(markersGr);
 

OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java

@@ -21,6 +21,7 @@ import net.osmand.access.AccessibilityAssistant;
 import net.osmand.data.Amenity;
 import net.osmand.data.LatLon;
 import net.osmand.osm.AbstractPoiType;
+import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.dashboard.DashLocationFragment;
@@ -235,7 +236,10 @@ public class QuickSearchListAdapter extends ArrayAdapter<QuickSearchListItem> {
 			boolean moreDividerVisible = emptySearchVisible && searchMoreItem.isSearchMoreAvailable();
 			view.findViewById(R.id.empty_search).setVisibility(emptySearchVisible ? View.VISIBLE : View.GONE);
 			view.findViewById(R.id.more_divider).setVisibility(moreDividerVisible ? View.VISIBLE : View.GONE);
-
+			SearchUICore searchUICore = app.getSearchUICore().getCore();
+			String textTitle = app.getString(R.string.nothing_found_in_radius) + " "
+					+ OsmAndFormatter.getFormattedDistance(searchUICore.getMinimalSearchRadius(searchUICore.getPhrase()), app);
+			((TextView) view.findViewById(R.id.empty_search_title)).setText(textTitle);
 			View increaseRadiusRow = view.findViewById(R.id.increase_radius_row);
 			increaseRadiusRow.setVisibility(searchMoreItem.isSearchMoreAvailable() ? View.VISIBLE : View.GONE);
 			increaseRadiusRow.setOnClickListener(new View.OnClickListener() {