add srtm map download option, refactoring p1

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

@@ -331,15 +331,16 @@ public class LocalIndexHelper {
 		if (mapPath.canRead()) {
 			for (File mapFile : listFilesSorted(mapPath)) {
 				if (mapFile.isFile() && mapFile.getName().endsWith(IndexConstants.BINARY_MAP_INDEX_EXT)) {
+					String fileName = mapFile.getName();
 					LocalIndexType lt = LocalIndexType.MAP_DATA;
-					if (mapFile.getName().endsWith(IndexConstants.BINARY_SRTM_MAP_INDEX_EXT)
+					if (fileName.endsWith(IndexConstants.BINARY_SRTM_MAP_INDEX_EXT)
-							|| mapFile.getName().endsWith(IndexConstants.BINARY_SRTM_FEET_MAP_INDEX_EXT)) {
+							|| fileName.endsWith(IndexConstants.BINARY_SRTM_FEET_MAP_INDEX_EXT)) {
 						lt = LocalIndexType.SRTM_DATA;
-					} else if (mapFile.getName().endsWith(IndexConstants.BINARY_WIKI_MAP_INDEX_EXT)) {
+					} else if (fileName.endsWith(IndexConstants.BINARY_WIKI_MAP_INDEX_EXT)) {
 						lt = LocalIndexType.WIKI_DATA;
 					}
 					LocalIndexInfo info = new LocalIndexInfo(lt, mapFile, backup, app);
-					if (loadedMaps.containsKey(mapFile.getName()) && !backup) {
+					if (loadedMaps.containsKey(fileName) && !backup) {
 						info.setLoaded(true);
 					}
 					updateDescription(info);

OsmAnd/src/net/osmand/plus/base/SelectMultipleItemsBottomSheet.java

@@ -70,42 +70,6 @@ public class SelectMultipleItemsBottomSheet extends MenuBottomSheetDialogFragmen
 	private OnRadioButtonSelectListener onRadioButtonSelectListener;
 	private SelectedItemsListener selectedItemsListener;
 
-	public static SelectMultipleItemsBottomSheet showInstance(@NonNull AppCompatActivity activity,
-															  @NonNull List<SelectableItem> items,
-															  @Nullable List<SelectableItem> selected,
-															  boolean usedOnMap) {
-		SelectMultipleItemsBottomSheet fragment = new SelectMultipleItemsBottomSheet();
-		fragment.setUsedOnMap(usedOnMap);
-		fragment.setItems(items);
-		fragment.setSelectedItems(selected);
-		FragmentManager fm = activity.getSupportFragmentManager();
-		fragment.show(fm, TAG);
-		return fragment;
-	}
-
-	public static SelectMultipleItemsBottomSheet showInstance(@NonNull AppCompatActivity activity,
-															  @NonNull List<SelectableItem> items,
-															  @Nullable List<SelectableItem> selected,
-															  boolean usedOnMap,
-															  String addDescription,
-															  boolean customOptionsVisible,
-															  boolean leftButtonSelected,
-															  String leftRadioButtonText,
-															  String rightRadioButtonText) {
-		SelectMultipleItemsBottomSheet fragment = new SelectMultipleItemsBottomSheet();
-		fragment.setUsedOnMap(usedOnMap);
-		fragment.setItems(items);
-		fragment.setSelectedItems(selected);
-		fragment.setAddDescriptionText(addDescription);
-		fragment.setCustomOptionsVisible(customOptionsVisible);
-		fragment.setLeftButtonSelected(leftButtonSelected);
-		fragment.setLeftRadioButtonText(leftRadioButtonText);
-		fragment.setRightRadioButtonText(rightRadioButtonText);
-		FragmentManager fm = activity.getSupportFragmentManager();
-		fragment.show(fm, TAG);
-		return fragment;
-	}
-
 	@Nullable
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
@@ -392,6 +356,66 @@ public class SelectMultipleItemsBottomSheet extends MenuBottomSheetDialogFragmen
 		this.selectedItemsListener = selectedItemsListener;
 	}
 
+	@Override
+	protected void setupRightButton() {
+		super.setupRightButton();
+		applyButtonTitle = rightButton.findViewById(R.id.button_text);
+	}
+
+	@Override
+	protected void onRightBottomButtonClick() {
+		if (onApplySelectionListener != null) {
+			onApplySelectionListener.onSelectionApplied(selectedItems);
+		}
+		dismiss();
+	}
+
+	@Override
+	protected int getRightBottomButtonTextId() {
+		return R.string.shared_string_apply;
+	}
+
+	@Override
+	protected boolean useVerticalButtons() {
+		return true;
+	}
+
+	public static SelectMultipleItemsBottomSheet showInstance(@NonNull AppCompatActivity activity,
+	                                                          @NonNull List<SelectableItem> items,
+	                                                          @Nullable List<SelectableItem> selected,
+	                                                          boolean usedOnMap) {
+		SelectMultipleItemsBottomSheet fragment = new SelectMultipleItemsBottomSheet();
+		fragment.setUsedOnMap(usedOnMap);
+		fragment.setItems(items);
+		fragment.setSelectedItems(selected);
+		FragmentManager fm = activity.getSupportFragmentManager();
+		fragment.show(fm, TAG);
+		return fragment;
+	}
+
+	public static SelectMultipleItemsBottomSheet showInstance(@NonNull AppCompatActivity activity,
+	                                                          @NonNull List<SelectableItem> items,
+	                                                          @Nullable List<SelectableItem> selected,
+	                                                          boolean usedOnMap,
+	                                                          String addDescription,
+	                                                          boolean customOptionsVisible,
+	                                                          boolean leftButtonSelected,
+	                                                          String leftRadioButtonText,
+	                                                          String rightRadioButtonText) {
+		SelectMultipleItemsBottomSheet fragment = new SelectMultipleItemsBottomSheet();
+		fragment.setUsedOnMap(usedOnMap);
+		fragment.setItems(items);
+		fragment.setSelectedItems(selected);
+		fragment.setAddDescriptionText(addDescription);
+		fragment.setCustomOptionsVisible(customOptionsVisible);
+		fragment.setLeftButtonSelected(leftButtonSelected);
+		fragment.setLeftRadioButtonText(leftRadioButtonText);
+		fragment.setRightRadioButtonText(rightRadioButtonText);
+		FragmentManager fm = activity.getSupportFragmentManager();
+		fragment.show(fm, TAG);
+		return fragment;
+	}
+
 	public interface SelectionUpdateListener {
 		void onSelectionUpdate();
 	}
@@ -435,27 +459,4 @@ public class SelectMultipleItemsBottomSheet extends MenuBottomSheetDialogFragmen
 		}
 	}
 
-	@Override
-	protected void setupRightButton() {
-		super.setupRightButton();
-		applyButtonTitle = rightButton.findViewById(R.id.button_text);
-	}
-
-	@Override
-	protected void onRightBottomButtonClick() {
-		if (onApplySelectionListener != null) {
-			onApplySelectionListener.onSelectionApplied(selectedItems);
-		}
-		dismiss();
-	}
-
-	@Override
-	protected int getRightBottomButtonTextId() {
-		return R.string.shared_string_apply;
-	}
-
-	@Override
-	protected boolean useVerticalButtons() {
-		return true;
-	}
 }

OsmAnd/src/net/osmand/plus/download/DownloadOsmandIndexesHelper.java

@@ -142,7 +142,7 @@ public class DownloadOsmandIndexesHelper {
 	}
 
 	private static void listVoiceAssets(IndexFileList result, AssetManager amanager, PackageManager pm,
-										OsmandSettings settings) {
+	                                    OsmandSettings settings) {
 		try {
 			File voicePath = settings.getContext().getAppPath(IndexConstants.VOICE_INDEX_DIR);
 			// list = amanager.list("voice");
@@ -207,9 +207,6 @@ public class DownloadOsmandIndexesHelper {
 					if (next == XmlPullParser.START_TAG) {
 						DownloadActivityType tp = DownloadActivityType.getIndexType(parser.getAttributeValue(null, "type"));
 						if (tp != null) {
-							if (tp == DownloadActivityType.SRTM_COUNTRY_FILE) {
-								log.debug("strUrl = " + strUrl);
-							}
 							IndexItem it = tp.parseIndexItem(ctx, parser);
 							if (it != null) {
 								result.add(it);
@@ -249,7 +246,7 @@ public class DownloadOsmandIndexesHelper {
 		private final long dateModified;
 
 		public AssetIndexItem(String fileName, String description, String date,
-							  long dateModified, String size, long sizeL, String assetName, String destFile, DownloadActivityType type) {
+		                      long dateModified, String size, long sizeL, String assetName, String destFile, DownloadActivityType type) {
 			super(fileName, description, dateModified, size, sizeL, sizeL, type);
 			this.dateModified = dateModified;
 			this.assetName = assetName;

OsmAnd/src/net/osmand/plus/download/DownloadResources.java

@@ -264,7 +264,7 @@ public class DownloadResources extends DownloadResourceGroup {
 	}
 
 	private Map<String, String> listWithAlternatives(final java.text.DateFormat dateFormat, File file,
-													 final String ext, final Map<String, String> files) {
+	                                                 final String ext, final Map<String, String> files) {
 		if (file.isDirectory()) {
 			file.list(new FilenameFilter() {
 				@Override
@@ -518,7 +518,7 @@ public class DownloadResources extends DownloadResourceGroup {
 
 	@Nullable
 	private List<IndexItem> collectIndexesOfType(@NonNull List<WorldRegion> regions,
-												 @NonNull DownloadActivityType type) {
+	                                             @NonNull DownloadActivityType type) {
 		List<IndexItem> collectedIndexes = new ArrayList<>();
 		for (WorldRegion region : regions) {
 			List<IndexItem> regionIndexes = getIndexItems(region);
@@ -645,10 +645,10 @@ public class DownloadResources extends DownloadResourceGroup {
 	}
 
 	public static List<IndexItem> findIndexItemsAt(OsmandApplication app,
-												   List<String> names,
+	                                               List<String> names,
-												   DownloadActivityType type,
+	                                               DownloadActivityType type,
-												   boolean includeDownloaded,
+	                                               boolean includeDownloaded,
-												   int limit) {
+	                                               int limit) {
 		List<IndexItem> res = new ArrayList<>();
 		OsmandRegions regions = app.getRegions();
 		DownloadIndexesThread downloadThread = app.getDownloadThread();
@@ -665,9 +665,9 @@ public class DownloadResources extends DownloadResourceGroup {
 	}
 
 	private static boolean isIndexItemDownloaded(DownloadIndexesThread downloadThread,
-												 DownloadActivityType type,
+	                                             DownloadActivityType type,
-												 WorldRegion downloadRegion,
+	                                             WorldRegion downloadRegion,
-												 List<IndexItem> res) {
+	                                             List<IndexItem> res) {
 		List<IndexItem> otherIndexItems =
 				new ArrayList<>(downloadThread.getIndexes().getIndexItems(downloadRegion));
 		for (IndexItem indexItem : otherIndexItems) {
@@ -680,7 +680,7 @@ public class DownloadResources extends DownloadResourceGroup {
 	}
 
 	private boolean doesListContainIndexWithType(List<IndexItem> indexItems,
-												 DownloadActivityType type) {
+	                                             DownloadActivityType type) {
 		if (indexItems != null) {
 			for (IndexItem indexItem : indexItems) {
 				if (indexItem.getType() == type) {
@@ -692,9 +692,9 @@ public class DownloadResources extends DownloadResourceGroup {
 	}
 
 	private static boolean addIndexItem(DownloadIndexesThread downloadThread,
-										DownloadActivityType type,
+	                                    DownloadActivityType type,
-										WorldRegion downloadRegion,
+	                                    WorldRegion downloadRegion,
-										List<IndexItem> res) {
+	                                    List<IndexItem> res) {
 		List<IndexItem> otherIndexItems =
 				new ArrayList<>(downloadThread.getIndexes().getIndexItems(downloadRegion));
 		for (IndexItem indexItem : otherIndexItems) {

OsmAnd/src/net/osmand/plus/download/MultipleIndexItem.java

@@ -19,8 +19,8 @@ public class MultipleIndexItem extends DownloadItem {
 	private final List<IndexItem> items;
 
 	public MultipleIndexItem(@NonNull WorldRegion region,
-							 @NonNull List<IndexItem> items,
+	                         @NonNull List<IndexItem> items,
-							 @NonNull DownloadActivityType type) {
+	                         @NonNull DownloadActivityType type) {
 		super(type);
 		this.items = items;
 	}
@@ -139,4 +139,5 @@ public class MultipleIndexItem extends DownloadItem {
 		}
 		return result;
 	}
+
 }

OsmAnd/src/net/osmand/plus/download/MultipleIndexesUiHelper.java

@@ -29,11 +29,11 @@ import static net.osmand.plus.download.DownloadActivityType.SRTM_COUNTRY_FILE;
 public class MultipleIndexesUiHelper {
 
 	public static void showDialog(@NonNull DownloadItem item,
-								  @NonNull AppCompatActivity activity,
+	                              @NonNull AppCompatActivity activity,
-								  @NonNull final OsmandApplication app,
+	                              @NonNull final OsmandApplication app,
-								  @NonNull DateFormat dateFormat,
+	                              @NonNull DateFormat dateFormat,
-								  boolean showRemoteDate,
+	                              boolean showRemoteDate,
-								  @NonNull final SelectItemsToDownloadListener listener) {
+	                              @NonNull final SelectItemsToDownloadListener listener) {
 		if (item.getType() == SRTM_COUNTRY_FILE) {
 			showSRTMDialog(item, activity, app, dateFormat, showRemoteDate, listener);
 		} else if (item instanceof MultipleIndexItem) {
@@ -42,11 +42,11 @@ public class MultipleIndexesUiHelper {
 	}
 
 	public static void showBaseDialog(@NonNull MultipleIndexItem multipleIndexItem,
-									  @NonNull AppCompatActivity activity,
+	                                  @NonNull AppCompatActivity activity,
-									  @NonNull final OsmandApplication app,
+	                                  @NonNull final OsmandApplication app,
-									  @NonNull DateFormat dateFormat,
+	                                  @NonNull DateFormat dateFormat,
-									  boolean showRemoteDate,
+	                                  boolean showRemoteDate,
-									  @NonNull final SelectItemsToDownloadListener listener) {
+	                                  @NonNull final SelectItemsToDownloadListener listener) {
 		List<IndexItem> indexesToDownload = getIndexesToDownload(multipleIndexItem);
 		List<SelectableItem> allItems = new ArrayList<>();
 		List<SelectableItem> selectedItems = new ArrayList<>();
@@ -80,11 +80,11 @@ public class MultipleIndexesUiHelper {
 	}
 
 	public static void showSRTMDialog(@NonNull final DownloadItem downloadItem,
-									  @NonNull AppCompatActivity activity,
+	                                  @NonNull AppCompatActivity activity,
-									  @NonNull final OsmandApplication app,
+	                                  @NonNull final OsmandApplication app,
-									  @NonNull final DateFormat dateFormat,
+	                                  @NonNull final DateFormat dateFormat,
-									  final boolean showRemoteDate,
+	                                  final boolean showRemoteDate,
-									  @NonNull final SelectItemsToDownloadListener listener) {
+	                                  @NonNull final SelectItemsToDownloadListener listener) {
 		List<SelectableItem> selectedItems = new ArrayList<>();
 		final List<SelectableItem> leftItems = new ArrayList<>();
 		final List<SelectableItem> rightItems = new ArrayList<>();
@@ -201,7 +201,7 @@ public class MultipleIndexesUiHelper {
 	}
 
 	private static boolean isListDialog(OsmandApplication app,
-										List<SelectableItem> leftItems, List<SelectableItem> rightItems) {
+	                                    List<SelectableItem> leftItems, List<SelectableItem> rightItems) {
 		return (isBaseSRTMMetricSystem(app) ? leftItems : rightItems).size() > 1;
 	}
 

OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java

@@ -216,8 +216,8 @@ public class ItemViewHolder {
 				MultipleIndexItem item = (MultipleIndexItem) downloadItem;
 				String allRegionsHeader = context.getString(R.string.shared_strings_all_regions);
 				String regionsHeader = context.getString(R.string.regions);
-				String allRegionsCountStr;
+				String allRegionsCount;
-				String leftToDownloadCountStr;
+				String leftToDownloadCount;
 				if (isSRTMItem(item)) {
 					List<IndexItem> items = new ArrayList<>();
 					for (IndexItem indexItem : item.getAllIndexes()) {
@@ -226,7 +226,7 @@ public class ItemViewHolder {
 							items.add(indexItem);
 						}
 					}
-					allRegionsCountStr = String.valueOf(items.size());
+					allRegionsCount = String.valueOf(items.size());
 					items.clear();
 					for (IndexItem indexItem : item.getIndexesToDownload()) {
 						boolean baseItem = isBaseSRTMItem(indexItem);
@@ -235,27 +235,27 @@ public class ItemViewHolder {
 							items.add(indexItem);
 						}
 					}
-					leftToDownloadCountStr = String.valueOf(items.size());
+					leftToDownloadCount = String.valueOf(items.size());
 				} else {
-					allRegionsCountStr = String.valueOf(item.getAllIndexes().size());
+					allRegionsCount = String.valueOf(item.getAllIndexes().size());
-					leftToDownloadCountStr = String.valueOf(item.getIndexesToDownload().size());
+					leftToDownloadCount = String.valueOf(item.getIndexesToDownload().size());
 				}
 				String header;
 				String count;
 				if (item.hasActualDataToDownload()) {
 					if (!item.isDownloaded()) {
 						header = allRegionsHeader;
-						count = leftToDownloadCountStr;
+						count = leftToDownloadCount;
 					} else {
 						header = regionsHeader;
 						count = String.format(
 								context.getString(R.string.ltr_or_rtl_combine_via_slash),
-								leftToDownloadCountStr,
+								leftToDownloadCount,
-								allRegionsCountStr);
+								allRegionsCount);
 					}
 				} else {
 					header = allRegionsHeader;
-					count = allRegionsCountStr;
+					count = allRegionsCount;
 				}
 				String fullDescription = context.getString(R.string.ltr_or_rtl_combine_via_colon, header, count);
 				if (srtmItem) {

OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java

@@ -511,7 +511,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
 		ItemClickListener listener = new ContextMenuAdapter.ItemClickListener() {
 			@Override
 			public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter,
-											  int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
+			                                  int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
 				localOptionsMenu(itemId);
 				return true;
 			}
@@ -612,7 +612,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
 	}
 
 	private void openSelectionMode(final int actionResId, final int actionIconId,
-								   final DialogInterface.OnClickListener listener) {
+	                               final DialogInterface.OnClickListener listener) {
 		final int colorResId = getMyApplication().getSettings().isLightContent() ? R.color.active_buttons_and_links_text_light : R.color.active_buttons_and_links_text_dark;
 		String value = getString(actionResId);
 		if (value.endsWith("...")) {
@@ -713,7 +713,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
 	}
 
 	public void openSelectionMode(int stringRes, int darkIcon, DialogInterface.OnClickListener listener,
-								  EnumSet<LocalIndexType> filter) {
+	                              EnumSet<LocalIndexType> filter) {
 		if (filter != null) {
 			listAdapter.filterCategories(filter);
 		}
@@ -864,7 +864,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
 
 		@Override
 		public View getChildView(final int groupPosition, final int childPosition,
-								 boolean isLastChild, View convertView, ViewGroup parent) {
+		                         boolean isLastChild, View convertView, ViewGroup parent) {
 			LocalIndexInfoViewHolder viewHolder;
 			if (convertView == null) {
 				LayoutInflater inflater = LayoutInflater.from(ctx);

OsmAnd/src/net/osmand/plus/resources/ResourceManager.java

@@ -871,7 +871,7 @@ public class ResourceManager {
 	}
 
 	public List<Amenity> searchAmenities(SearchPoiTypeFilter filter,
-										 double topLatitude, double leftLongitude, double bottomLatitude, double rightLongitude, int zoom, final ResultMatcher<Amenity> matcher) {
+	                                     double topLatitude, double leftLongitude, double bottomLatitude, double rightLongitude, int zoom, final ResultMatcher<Amenity> matcher) {
 		final List<Amenity> amenities = new ArrayList<Amenity>();
 		searchAmenitiesInProgress = true;
 		try {
@@ -901,7 +901,7 @@ public class ResourceManager {
 	}
 
 	public List<Amenity> searchAmenitiesOnThePath(List<Location> locations, double radius, SearchPoiTypeFilter filter,
-												  ResultMatcher<Amenity> matcher) {
+	                                              ResultMatcher<Amenity> matcher) {
 		searchAmenitiesInProgress = true;
 		final List<Amenity> amenities = new ArrayList<Amenity>();
 		try {
@@ -957,8 +957,8 @@ public class ResourceManager {
 	}
 
 	public List<Amenity> searchAmenitiesByName(String searchQuery,
-											   double topLatitude, double leftLongitude, double bottomLatitude, double rightLongitude,
+	                                           double topLatitude, double leftLongitude, double bottomLatitude, double rightLongitude,
-											   double lat, double lon, ResultMatcher<Amenity> matcher) {
+	                                           double lat, double lon, ResultMatcher<Amenity> matcher) {
 		List<Amenity> amenities = new ArrayList<Amenity>();
 		List<AmenityIndexRepositoryBinary> list = new ArrayList<AmenityIndexRepositoryBinary>();
 		int left = MapUtils.get31TileNumberX(leftLongitude);
@@ -1056,7 +1056,7 @@ public class ResourceManager {
 
 
 	public List<TransportStop> searchTransportSync(double topLat, double leftLon, double bottomLat, double rightLon,
-												   ResultMatcher<TransportStop> matcher) throws IOException {
+	                                               ResultMatcher<TransportStop> matcher) throws IOException {
 		TransportStopsRouteReader readers =
 				new TransportStopsRouteReader(getTransportRepositories(topLat, leftLon, bottomLat, rightLon));
 		List<TransportStop> stops = new ArrayList<>();

OsmAnd/src/net/osmand/plus/settings/datastorage/DataStorageHelper.java

@@ -302,9 +302,9 @@ public class DataStorageHelper {
 	}
 
 	public DirectoryItem createDirectory(@NonNull String relativePath,
-										 boolean processInternalDirectories,
+	                                     boolean processInternalDirectories,
-										 CheckingType checkingType,
+	                                     CheckingType checkingType,
-										 boolean addUnmatchedToOtherMemory) {
+	                                     boolean addUnmatchedToOtherMemory) {
 		String path = app.getAppPath(relativePath).getAbsolutePath();
 		return new DirectoryItem(path, processInternalDirectories, checkingType, addUnmatchedToOtherMemory);
 	}