From 8355d61875eac681583ae3c544bf1f8ff8432618 Mon Sep 17 00:00:00 2001
From: Dmitry Donskoy <donskdmitry@mail.ru>
Date: Thu, 18 Apr 2019 17:01:13 +0300
Subject: [PATCH] [android] Changed stats, removed useless events

---
 .../src/com/mapswithme/maps/MwmActivity.java  |  1 -
 .../maps/routing/RoutingController.java       | 10 ----------
 .../maps/settings/DrivingOptionsFragment.java |  2 +-
 .../util/statistics/Statistics.java           | 19 ++-----------------
 4 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 301fb92e87..5927dcf9aa 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -928,7 +928,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     mPlacePageController.close();
     RoutingOptions.removeOption(roadType);
-    Statistics.INSTANCE.trackSettingsDriveOptionsChangeEvent(Statistics.EventParam.ROUTE);
     rebuildLastRouteInternal();
   }
 
diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java
index 9198c9fc9b..76fc434bf5 100644
--- a/android/src/com/mapswithme/maps/routing/RoutingController.java
+++ b/android/src/com/mapswithme/maps/routing/RoutingController.java
@@ -47,9 +47,6 @@ import static com.mapswithme.util.statistics.Statistics.EventName.ROUTING_POINT_
 public class RoutingController implements TaxiManager.TaxiListener
 {
   private static final String TAG = RoutingController.class.getSimpleName();
-  private static final int ERROR_TYPE_IMPOSSIBLE_DEST = 0;
-  private static final int ERROR_TYPE_IMPOSSIBLE_OPTIONS = 1;
-  private static final int ERROR_TYPE_MISSED_MWM = 3;
 
   private enum State
   {
@@ -200,8 +197,6 @@ public class RoutingController implements TaxiManager.TaxiListener
       return;
 
     mContainsCachedResult = false;
-    Statistics.INSTANCE.trackDriveSettingsStatus();
-
     if (mLastResultCode == ResultCodesHelper.NO_ERROR || mLastResultCode == ResultCodesHelper.HAS_WARNINGS)
     {
       updatePlan();
@@ -218,20 +213,15 @@ public class RoutingController implements TaxiManager.TaxiListener
     if (ResultCodesHelper.isMoreMapsNeeded(mLastResultCode))
     {
       mContainer.onBuildError(mLastResultCode, mLastMissingMaps);
-      Statistics.INSTANCE.trackRoutingBuildError(ERROR_TYPE_MISSED_MWM);
       return;
     }
 
     setBuildState(BuildState.ERROR);
     mLastBuildProgress = 0;
-    Statistics.INSTANCE.trackRoutingBuildError(ERROR_TYPE_IMPOSSIBLE_DEST);
     updateProgress();
 
     if (RoutingOptions.hasAnyOptions())
-    {
       mContainer.onCalculateRouteError();
-      Statistics.INSTANCE.trackRoutingBuildError(ERROR_TYPE_IMPOSSIBLE_OPTIONS);
-    }
   }
 
   private void setState(State newState)
diff --git a/android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java b/android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java
index 612f8b36c1..7d95264d75 100644
--- a/android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java
+++ b/android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java
@@ -124,7 +124,7 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment
       else
         RoutingOptions.removeOption(mRoadType);
 
-      Statistics.INSTANCE.trackSettingsDriveOptionsChangeEvent(Statistics.EventParam.SETTINGS);
+      Statistics.INSTANCE.trackSettingsDriveOptionsChangeEvent();
     }
   }
 }
diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java
index d03d929891..599ff2b648 100644
--- a/android/src/com/mapswithme/util/statistics/Statistics.java
+++ b/android/src/com/mapswithme/util/statistics/Statistics.java
@@ -218,13 +218,6 @@ public enum Statistics
                                                      Statistics.ParamValue.SHARING_OPTIONS));
   }
 
-  public void trackDriveSettingsStatus()
-  {
-    ParameterBuilder status = getRoutingOptionsStatus();
-    trackEvent(Statistics.EventName.SETTINGS_DRIVE_OPTIONS_STATUS,
-               status);
-  }
-
   @NonNull
   private ParameterBuilder getRoutingOptionsStatus()
   {
@@ -240,16 +233,10 @@ public enum Statistics
                   .add(EventParam.UNPAVED, hasDirty ? 1 : 0);
   }
 
-  public void trackRoutingBuildError(int errorType)
-  {
-    Statistics.ParameterBuilder builder = new Statistics.ParameterBuilder();
-    trackEvent(Statistics.EventName.ROUTING_BUILD_ERROR, builder.add(EventParam.ERROR, errorType));
-  }
-
-  public void trackSettingsDriveOptionsChangeEvent(@NonNull String source)
+  public void trackSettingsDriveOptionsChangeEvent()
   {
     ParameterBuilder parameterBuilder = getRoutingOptionsStatus();
-    parameterBuilder.add(EventParam.FROM, source);
+    parameterBuilder.add(EventParam.FROM, EventParam.SETTINGS);
 
     trackEvent(EventName.SETTINGS_DRIVE_OPTIONS_CHANGE,
                parameterBuilder);
@@ -323,8 +310,6 @@ public enum Statistics
     public static final String BM_GUIDEDOWNLOADTOAST_SHOWN = "Bookmarks_GuideDownloadToast_shown";
     public static final String BM_GUIDES_DOWNLOADDIALOGUE_CLICK = "Bookmarks_Guides_DownloadDialogue_click";
     public static final String SETTINGS_DRIVE_OPTIONS_CHANGE = "Settings_Navigation_DrivingOptions_change";
-    public static final String SETTINGS_DRIVE_OPTIONS_STATUS = "Settings_Navigation_DrivingOptions_status";
-    public static final String ROUTING_BUILD_ERROR = "Routing_build_error";
     public static final String PP_DRIVING_OPTIONS_ACTION = "Placepage_DrivingOptions_action";
 
     // search