kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Merge pull request #2462 from deathbaba/fixes

Browse source 
Fixed invalid unsent edits counter on Android.
This commit is contained in:
Dmitry Yunitsky 2016-03-23 20:25:59 +03:00
commit 7d58016341
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/com/mapswithme/maps/editor/ProfileFragment.java
View file

@ -66,7 +66,7 @@ public class ProfileFragment extends AuthFragment implements View.OnClickListene
UiUtils.hide(mLogout);
}
final long[] stats = Editor.nativeGetStats();
mEditsLocal.setText(getString(R.string.not_sent) + ": " + stats[0]);
mEditsLocal.setText(getString(R.string.not_sent) + ": " + (stats[0] - stats[1]));
mEditsSent.setText(getString(R.string.changes) + ": " + stats[1]);
if (stats[1] == 0)
UiUtils.hide(mEditsSentDate);

2
drape/utils/gpu_mem_tracker.cpp
View file

@ -49,7 +49,7 @@ string GPUMemTracker::Report()
ss << " ===== Mem Report ===== \n";
return move(ss.str());
return ss.str();
}
void GPUMemTracker::AddAllocated(string const & tag, uint32_t id, uint32_t size)