pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Android and iOS build fix after changes in search::SearchParams and in Storage::DownloadNode().

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-02-25 08:17:32 +03:00 • committed by Sergey Yershov
parent 8b881c3865
commit ab603ec81c
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/jni/com/mapswithme/maps/MapManager.cpp
View file

@ -231,11 +231,11 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeIsDownloading(JNIEnv * env,
return GetStorage().IsDownloadInProgress();
}
// static boolean nativeDownload(String root);
JNIEXPORT jboolean JNICALL
// static void nativeDownload(String root);
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_downloader_MapManager_nativeDownload(JNIEnv * env, jclass clazz, jstring root)
{
return GetStorage().DownloadNode(jni::ToNativeString(env, root));
GetStorage().DownloadNode(jni::ToNativeString(env, root));
}
// static boolean nativeRetry(String root);

4
android/jni/com/mapswithme/maps/SearchEngine.cpp
View file

@ -164,7 +164,7 @@ extern "C"
params.SetForceSearch(force);
if (hasPosition)
params.SetPosition(lat, lon);
params.m_callback = bind(&OnResults, _1, timestamp, false, hasPosition, lat, lon);
params.m_onResults = bind(&OnResults, _1, timestamp, false, hasPosition, lat, lon);
bool const searchStarted = g_framework->NativeFramework()->Search(params);
if (searchStarted)
@ -184,7 +184,7 @@ extern "C"
if (isMapAndTable)
{
params.m_callback = bind(&OnResults, _1, timestamp, isMapAndTable,
params.m_onResults = bind(&OnResults, _1, timestamp, isMapAndTable,
false /* hasPosition */, 0, 0);
if (g_framework->NativeFramework()->Search(params))
g_queryTimestamp = timestamp;

2
android/src/com/mapswithme/maps/downloader/MapManager.java
View file

@ -90,7 +90,7 @@ public final class MapManager
/**
* Enqueues given {@code root} node and its children in downloader.
*/
public static native boolean nativeDownload(String root);
public static native void nativeDownload(String root);
/**
* Enqueues failed items under given {@code root} node in downloader.

2
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm
View file

@ -94,7 +94,7 @@ LocationObserver>
- (void)setupSearchParams
{
__weak auto weakSelf = self;
searchParams.m_callback = ^(search::Results const & results)
searchParams.m_onResults = ^(search::Results const & results)
{
__strong auto self = weakSelf;
if (!self)

2
iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.mm
View file

@ -133,7 +133,7 @@ using namespace storage;
{
__weak auto weakSelf = self;
m_searchParams.SetMode(search::Mode::World);
m_searchParams.m_callback = ^(search::Results const & results)
m_searchParams.m_onResults = ^(search::Results const & results)
{
__strong auto self = weakSelf;
if (!self || results.IsEndMarker())