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

[MAPSME-6541] Added completion handler calls for all cases of ugc upload.

Browse source
This commit is contained in:
Ilya Grechuhin 2018-01-17 18:43:37 +03:00 • committed by Sergey Yershov
parent 7e0e4d98cb
commit a156551ce8
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
map/framework.cpp
View file

@ -3379,11 +3379,14 @@ void Framework::FillLocalExperts(FeatureType const & ft, place_page::Info & info
void Framework::UploadUGC(User::CompleteUploadingHandler const & onCompleteUploading)
{
if (GetPlatform().ConnectionStatus() == Platform::EConnectionType::CONNECTION_NONE)
return;
if (GetPlatform().ConnectionStatus() == Platform::EConnectionType::CONNECTION_NONE ||
!m_user.IsAuthenticated())
{
if (onCompleteUploading != nullptr)
onCompleteUploading(false);
if (!m_user.IsAuthenticated())
return;
}
m_ugcApi->GetUGCToSend([this, onCompleteUploading](string && json)
{
@ -3398,6 +3401,11 @@ void Framework::UploadUGC(User::CompleteUploadingHandler const & onCompleteUploa
m_ugcApi->SendingCompleted();
});
}
else
{
if (onCompleteUploading != nullptr)
onCompleteUploading(true);
}
});
}