From 9e33dddf2a67d5ff9ad9c169e7fabd24316f2a42 Mon Sep 17 00:00:00 2001
From: Dmitry Donskoy <donskdmitry@mail.ru>
Date: Thu, 5 Jul 2018 12:30:21 +0300
Subject: [PATCH] [android] Deleted deprecated bookmark ui actions

---
 android/res/menu/menu_bookmarks.xml                | 10 +---------
 android/res/menu/menu_bookmarks_catalog.xml        |  8 --------
 .../maps/bookmarks/BookmarksListFragment.java      | 14 --------------
 .../com/mapswithme/util/sharing/ShareOption.java   |  4 +---
 4 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/android/res/menu/menu_bookmarks.xml b/android/res/menu/menu_bookmarks.xml
index d79c773b87..969c63ad4a 100644
--- a/android/res/menu/menu_bookmarks.xml
+++ b/android/res/menu/menu_bookmarks.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:id="@+id/share_message"
-        android:title="@string/share_by_message"
-        android:icon="@drawable/ic_share_message"/>
-
-  <item android:id="@+id/share_email"
-        android:title="@string/share_by_email"
-        android:icon="@drawable/ic_share_email"/>
-
   <item android:id="@+id/share"
         android:title="@string/share"
         android:icon="@drawable/ic_share"/>
@@ -19,4 +11,4 @@
   <item android:id="@+id/delete"
         android:title="@string/delete"
         android:icon="@drawable/ic_delete"/>
-</menu>
\ No newline at end of file
+</menu>
diff --git a/android/res/menu/menu_bookmarks_catalog.xml b/android/res/menu/menu_bookmarks_catalog.xml
index e56b320df9..796414fcb6 100644
--- a/android/res/menu/menu_bookmarks_catalog.xml
+++ b/android/res/menu/menu_bookmarks_catalog.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:id="@+id/share_message"
-        android:title="@string/share_by_message"
-        android:icon="@drawable/ic_share_message"/>
-
-  <item android:id="@+id/share_email"
-        android:title="@string/share_by_email"
-        android:icon="@drawable/ic_share_email"/>
-
   <item android:id="@+id/share"
         android:title="@string/share"
         android:icon="@drawable/ic_share"/>
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
index 334c5120c4..fb6585e17d 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
@@ -180,12 +180,6 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
         BottomSheetHelper.Builder bs = BottomSheetHelper.create(getActivity(), bookmark.getTitle())
                                                         .sheet(menuResId)
                                                         .listener(this);
-        if (!ShareOption.SMS.isSupported(getActivity()))
-          bs.getMenu().removeItem(R.id.share_message);
-
-        if (!ShareOption.EMAIL.isSupported(getActivity()))
-          bs.getMenu().removeItem(R.id.share_email);
-
         bs.tint().show();
         break;
 
@@ -222,14 +216,6 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
 
     switch (menuItem.getItemId())
     {
-    case R.id.share_message:
-      ShareOption.SMS.shareMapObject(getActivity(), item, Sponsored.nativeGetCurrent());
-      break;
-
-    case R.id.share_email:
-      ShareOption.EMAIL.shareMapObject(getActivity(), item, Sponsored.nativeGetCurrent());
-      break;
-
     case R.id.share:
       ShareOption.ANY.shareMapObject(getActivity(), item, Sponsored.nativeGetCurrent());
       break;
diff --git a/android/src/com/mapswithme/util/sharing/ShareOption.java b/android/src/com/mapswithme/util/sharing/ShareOption.java
index ae34b022a2..9924fe9ef9 100644
--- a/android/src/com/mapswithme/util/sharing/ShareOption.java
+++ b/android/src/com/mapswithme/util/sharing/ShareOption.java
@@ -16,8 +16,6 @@ import com.mapswithme.util.statistics.Statistics;
 
 public abstract class ShareOption
 {
-  public static final SmsShareOption SMS = new SmsShareOption();
-  public static final EmailShareOption EMAIL = new EmailShareOption();
   public static final AnyShareOption ANY = new AnyShareOption();
 
   @StringRes
@@ -93,4 +91,4 @@ public abstract class ShareOption
       SharingHelper.shareOutside(new TextShareable(activity, body), titleRes);
     }
   }
-}
\ No newline at end of file
+}