diff options
author | vng <viktor.govako@gmail.com> | 2013-02-16 02:50:19 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:50:57 +0300 |
commit | 02627370ff39c13d2857d94267b826775dd5c62a (patch) | |
tree | 43b99afdceb2552f26d976ee5e3de1f9172022cb /android | |
parent | edd251e9f2648c1be91aeeb721a755bbd15cf273 (diff) |
[android] [bookmarks] Fix Lite version for promotion purposes.
Diffstat (limited to 'android')
-rw-r--r-- | android/jni/com/mapswithme/maps/Framework.cpp | 14 | ||||
-rw-r--r-- | android/src/com/mapswithme/maps/MWMActivity.java | 12 |
2 files changed, 18 insertions, 8 deletions
diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 7618503ef4..faeaee3982 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -646,12 +646,16 @@ namespace android { BookmarkBalloon * balloon = GetBookmarkBalloon(); - BookmarkAndCategory bac = m_work.GetBookmark(m_work.GtoP(balloon->glbPivot())); - if (!ValidateBookmarkAndCategory(bac)) + BookmarkAndCategory bac; + if (GetPlatform().IsPro()) { - // add new bookmark - Bookmark bm(balloon->glbPivot(), balloon->bookmarkName(), m_bmType); - bac = AddBookmark(bm); + bac = m_work.GetBookmark(m_work.GtoP(balloon->glbPivot())); + if (!ValidateBookmarkAndCategory(bac)) + { + // add new bookmark + Bookmark bm(balloon->glbPivot(), balloon->bookmarkName(), m_bmType); + bac = AddBookmark(bm); + } } // start edit an existing bookmark diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java index 392203212d..c7a2662340 100644 --- a/android/src/com/mapswithme/maps/MWMActivity.java +++ b/android/src/com/mapswithme/maps/MWMActivity.java @@ -531,12 +531,18 @@ public class MWMActivity extends NvEventQueueActivity implements LocationService setOnPopupClickListener(new OnNativePopupClickListenter() { - @Override public void onClick(int cat, int bmk) { - startActivity(new Intent(MWMActivity.this, BookmarkActivity.class) - .putExtra(BookmarkActivity.PIN, new ParcelablePoint(cat, bmk))); + if (!mApplication.isProVersion()) + { + showProVersionBanner(getString(R.string.bookmarks_in_pro_version)); + } + else + { + startActivity(new Intent(MWMActivity.this, BookmarkActivity.class) + .putExtra(BookmarkActivity.PIN, new ParcelablePoint(cat, bmk))); + } } }); } |