From 7d7d9409ef5bab4b85f220888e265e7d66950fdf Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 25 Oct 2017 17:52:58 +0300
Subject: [PATCH] Disable online search without online maps plugin enabled

---
 OsmAnd/res/layout/search_more_list_item.xml   |  4 ++-
 .../search/QuickSearchDialogFragment.java     | 24 ++++++++-------
 .../plus/search/QuickSearchListAdapter.java   | 29 +++++++++++--------
 3 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/OsmAnd/res/layout/search_more_list_item.xml b/OsmAnd/res/layout/search_more_list_item.xml
index 216c558aef..faa6e33c0c 100644
--- a/OsmAnd/res/layout/search_more_list_item.xml
+++ b/OsmAnd/res/layout/search_more_list_item.xml
@@ -102,7 +102,9 @@
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
         android:minHeight="48dp"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="visible">
 
         <View
             android:layout_width="match_parent"
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
index 1091034984..a6db6a435c 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
@@ -64,6 +64,7 @@ import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener;
 import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
@@ -71,6 +72,7 @@ import net.osmand.plus.activities.MapActivity.ShowQuickSearchMode;
 import net.osmand.plus.helpers.SearchHistoryHelper;
 import net.osmand.plus.helpers.SearchHistoryHelper.HistoryEntry;
 import net.osmand.plus.poi.PoiUIFilter;
+import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
 import net.osmand.plus.resources.RegionAddressRepository;
 import net.osmand.plus.search.QuickSearchHelper.SearchHistoryAPI;
 import net.osmand.plus.search.listitems.QuickSearchButtonListItem;
@@ -1080,16 +1082,18 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 				for (SearchResult sr : res.getCurrentSearchResults()) {
 					rows.add(new QuickSearchListItem(app, sr));
 				}
-				rows.add(new QuickSearchButtonListItem(app, R.drawable.ic_world_globe_dark,
-						app.getString(R.string.search_online_address), new OnClickListener() {
-					@Override
-					public void onClick(View view) {
-						startOnlinePoiSearch();
-						mainSearchFragment.getAdapter().clear();
-						updateTabbarVisibility(false);
-						openKeyboard();
-					}
-				}));
+				if (OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) != null) {
+					rows.add(new QuickSearchButtonListItem(app, R.drawable.ic_world_globe_dark,
+							app.getString(R.string.search_online_address), new OnClickListener() {
+						@Override
+						public void onClick(View view) {
+							startOnlinePoiSearch();
+							mainSearchFragment.getAdapter().clear();
+							updateTabbarVisibility(false);
+							openKeyboard();
+						}
+					}));
+				}
 				rows.add(new QuickSearchButtonListItem(app, R.drawable.ic_action_search_dark,
 						app.getString(R.string.custom_search), new OnClickListener() {
 					@Override
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java
index 6b1922c28f..80705b8cc5 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java
@@ -20,8 +20,10 @@ import net.osmand.access.AccessibilityAssistant;
 import net.osmand.data.Amenity;
 import net.osmand.data.LatLon;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
 import net.osmand.plus.dashboard.DashLocationFragment;
+import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
 import net.osmand.plus.search.listitems.QuickSearchHeaderListItem;
 import net.osmand.plus.search.listitems.QuickSearchListItem;
 import net.osmand.plus.search.listitems.QuickSearchListItemType;
@@ -233,18 +235,21 @@ public class QuickSearchListAdapter extends ArrayAdapter<QuickSearchListItem> {
 				view.findViewById(R.id.empty_search).setVisibility(View.GONE);
 				view.findViewById(R.id.more_divider).setVisibility(View.GONE);
 			}
-			view.findViewById(R.id.increase_radius_row).setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View view) {
-					((QuickSearchMoreListItem) listItem).increaseRadiusOnClick();
-				}
-			});
-			view.findViewById(R.id.online_search_row).setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View view) {
-					((QuickSearchMoreListItem) listItem).onlineSearchOnClick();
-				}
-			});
+			if (OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) != null) {
+				view.findViewById(R.id.online_search_row).setVisibility(View.VISIBLE);
+				view.findViewById(R.id.increase_radius_row).setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View view) {
+						((QuickSearchMoreListItem) listItem).increaseRadiusOnClick();
+					}
+				});
+				view.findViewById(R.id.online_search_row).setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View view) {
+						((QuickSearchMoreListItem) listItem).onlineSearchOnClick();
+					}
+				});
+			}
 		} else if (type == QuickSearchListItemType.BUTTON) {
 			if (convertView == null) {
 				LayoutInflater inflater = (LayoutInflater) app