[storage] MapFilesDownloader hierarchy is refactored. Server list and network logic are moved from Storage into MapFilesDownloader. Review fixes.

1 files changed, 13 insertions, 0 deletions

diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj
index c9643d0cdd..3eb37bdae0 100644
--- a/xcode/storage/storage.xcodeproj/project.pbxproj
+++ b/xcode/storage/storage.xcodeproj/project.pbxproj
@@ -22,6 +22,9 @@
 		3971140A229D7C6D003915E5 /* helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 678338D31C723B1A00FD6263 /* helpers.hpp */; };
 		3971141C229D8983003915E5 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3971141B229D8983003915E5 /* CoreLocation.framework */; };
 		3971141E229D89F4003915E5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3971141D229D89F4003915E5 /* Security.framework */; };
+		3D497EA123292706000FB57D /* map_files_downloader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D497E9E23292706000FB57D /* map_files_downloader.cpp */; };
+		3D497EA223292706000FB57D /* map_files_downloader_with_ping.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D497E9F23292706000FB57D /* map_files_downloader_with_ping.hpp */; };
+		3D497EA323292706000FB57D /* map_files_downloader_with_ping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D497EA023292706000FB57D /* map_files_downloader_with_ping.cpp */; };
 		3DCD414620D80C0900143533 /* country_info_reader_light.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DCD414420D80C0800143533 /* country_info_reader_light.hpp */; };
 		3DCD414720D80C0900143533 /* country_info_reader_light.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DCD414520D80C0900143533 /* country_info_reader_light.cpp */; };
 		3DCD414920D80C1B00143533 /* lightweight_matching_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DCD414820D80C1B00143533 /* lightweight_matching_tests.cpp */; };
@@ -209,6 +212,9 @@
 		39711419229D7F75003915E5 /* libMopub.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libMopub.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		3971141B229D8983003915E5 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
 		3971141D229D89F4003915E5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
+		3D497E9E23292706000FB57D /* map_files_downloader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_files_downloader.cpp; sourceTree = "<group>"; };
+		3D497E9F23292706000FB57D /* map_files_downloader_with_ping.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = map_files_downloader_with_ping.hpp; sourceTree = "<group>"; };
+		3D497EA023292706000FB57D /* map_files_downloader_with_ping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_files_downloader_with_ping.cpp; sourceTree = "<group>"; };
 		3DCD414420D80C0800143533 /* country_info_reader_light.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country_info_reader_light.hpp; sourceTree = "<group>"; };
 		3DCD414520D80C0900143533 /* country_info_reader_light.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_info_reader_light.cpp; sourceTree = "<group>"; };
 		3DCD414820D80C1B00143533 /* lightweight_matching_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lightweight_matching_tests.cpp; sourceTree = "<group>"; };
@@ -576,6 +582,9 @@
 		675342E21A3F59EF00A0A8C3 /* storage */ = {
 			isa = PBXGroup;
 			children = (
+				3D497EA023292706000FB57D /* map_files_downloader_with_ping.cpp */,
+				3D497E9F23292706000FB57D /* map_files_downloader_with_ping.hpp */,
+				3D497E9E23292706000FB57D /* map_files_downloader.cpp */,
 				402873402295A91F0036AA1C /* country_tree.cpp */,
 				4028733F2295A91E0036AA1C /* country_tree.hpp */,
 				402873412295A91F0036AA1C /* downloader_search_params.hpp */,
@@ -670,6 +679,7 @@
 				6753430F1A3F5A2600A0A8C3 /* country.hpp in Headers */,
 				F6BC312B2034366100F677FE /* pinger.hpp in Headers */,
 				3DCD414620D80C0900143533 /* country_info_reader_light.hpp in Headers */,
+				3D497EA223292706000FB57D /* map_files_downloader_with_ping.hpp in Headers */,
 				6753430A1A3F5A2600A0A8C3 /* country_decl.hpp in Headers */,
 				67247FCF1C60BA8A00EDE56A /* fake_map_files_downloader.hpp in Headers */,
 				67AF4A011BC579DD0048B1ED /* country_info_getter.hpp in Headers */,
@@ -763,6 +773,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -844,8 +855,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				56D8CB991CAC17A80003F420 /* test_defines.cpp in Sources */,
+				3D497EA323292706000FB57D /* map_files_downloader_with_ping.cpp in Sources */,
 				401ECED41F56C50900DFDF76 /* country_parent_getter.cpp in Sources */,
 				56D0E4811F8E40340084B18C /* routing_helpers.cpp in Sources */,
+				3D497EA123292706000FB57D /* map_files_downloader.cpp in Sources */,
 				67AF4A001BC579DD0048B1ED /* country_info_getter.cpp in Sources */,
 				34B093221C61F9BA0066F4C3 /* storage_helpers.cpp in Sources */,
 				4586D0C71F48126A00DF9CE5 /* diff_manager.cpp in Sources */,