From 13ae453bc18732346c758c88ee18c3d713ef3214 Mon Sep 17 00:00:00 2001
From: Dmitry Donskoy <donskdmitry@mail.ru>
Date: Thu, 8 Aug 2019 14:22:21 +0300
Subject: [PATCH] [android] Added an usage of the stats Converter

---
 .../maps/settings/SettingsPrefsFragment.java  |  2 +-
 .../widget/StackedButtonDialogFragment.java   |  2 +-
 .../com/mapswithme/util/NetworkPolicy.java    | 74 +++++++++++--------
 3 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
index 9186cafc7c..99fc79802b 100644
--- a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
+++ b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java
@@ -546,7 +546,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
         {
           Config.setUseMobileDataSettings(type);
           Statistics.INSTANCE.trackNetworkUsageAlert(Statistics.EventName.SETTINGS_MOBILE_INTERNET_CHANGE,
-                                                     type.getAnalytics().getName());
+                                                     type.toStatisticValue());
         }
         else
         {
diff --git a/android/src/com/mapswithme/maps/widget/StackedButtonDialogFragment.java b/android/src/com/mapswithme/maps/widget/StackedButtonDialogFragment.java
index 67444133d8..10d161da3d 100644
--- a/android/src/com/mapswithme/maps/widget/StackedButtonDialogFragment.java
+++ b/android/src/com/mapswithme/maps/widget/StackedButtonDialogFragment.java
@@ -45,7 +45,7 @@ public class StackedButtonDialogFragment extends DialogFragment
   private void onDialogBtnClicked(@NonNull NetworkPolicy.Type type, boolean canUse)
   {
     Statistics.INSTANCE.trackNetworkUsageAlert(Statistics.EventName.MOBILE_INTERNET_ALERT,
-                                               type.getAnalytics().getName());
+                                               type.toStatisticValue());
     Config.setUseMobileDataSettings(type);
     if (mListener != null)
       mListener.onResult(NetworkPolicy.newInstance(canUse));
diff --git a/android/src/com/mapswithme/util/NetworkPolicy.java b/android/src/com/mapswithme/util/NetworkPolicy.java
index eca9bdb1d8..69de6fa269 100644
--- a/android/src/com/mapswithme/util/NetworkPolicy.java
+++ b/android/src/com/mapswithme/util/NetworkPolicy.java
@@ -4,19 +4,34 @@ import android.support.annotation.NonNull;
 import android.support.v4.app.FragmentManager;
 
 import com.mapswithme.maps.widget.StackedButtonDialogFragment;
-import com.mapswithme.util.statistics.Analytics;
+import com.mapswithme.util.statistics.StatisticValueConverter;
 import com.mapswithme.util.statistics.Statistics;
 
 import java.util.concurrent.TimeUnit;
 
 public final class NetworkPolicy
 {
-  public enum Type
+  public enum Type implements StatisticValueConverter<String>
   {
-    ASK(new Analytics(Statistics.ParamValue.ASK)),
-
-    ALWAYS(new Analytics(Statistics.ParamValue.ALWAYS))
+    ASK()
         {
+          @NonNull
+          @Override
+          public String toStatisticValue()
+          {
+            return Statistics.ParamValue.ASK;
+          }
+        },
+
+    ALWAYS()
+        {
+          @NonNull
+          @Override
+          public String toStatisticValue()
+          {
+            return Statistics.ParamValue.ALWAYS;
+          }
+
           @Override
           public void check(@NonNull FragmentManager fragmentManager,
                             @NonNull NetworkPolicyListener listener, boolean isDialogAllowed)
@@ -31,8 +46,15 @@ public final class NetworkPolicy
           }
         },
 
-    NEVER(new Analytics(Statistics.ParamValue.NEVER))
+    NEVER()
         {
+          @NonNull
+          @Override
+          public String toStatisticValue()
+          {
+            return Statistics.ParamValue.NEVER;
+          }
+
           @Override
           public void check(@NonNull FragmentManager fragmentManager,
                             @NonNull NetworkPolicyListener listener, boolean isDialogAllowed)
@@ -45,8 +67,15 @@ public final class NetworkPolicy
         },
 
 
-    NOT_TODAY(new Analytics(Statistics.ParamValue.NOT_TODAY))
+    NOT_TODAY()
         {
+          @NonNull
+          @Override
+          public String toStatisticValue()
+          {
+            return Statistics.ParamValue.NOT_TODAY;
+          }
+
           @Override
           public void check(@NonNull FragmentManager fragmentManager,
                             @NonNull NetworkPolicyListener listener, boolean isDialogAllowed)
@@ -58,8 +87,15 @@ public final class NetworkPolicy
           }
         },
 
-    TODAY(new Analytics(Statistics.ParamValue.TODAY))
+    TODAY()
         {
+          @NonNull
+          @Override
+          public String toStatisticValue()
+          {
+            return Statistics.ParamValue.TODAY;
+          }
+
           @Override
           public void check(@NonNull FragmentManager fragmentManager,
                             @NonNull NetworkPolicyListener listener, boolean isDialogAllowed)
@@ -78,38 +114,18 @@ public final class NetworkPolicy
         {
           @NonNull
           @Override
-          public Analytics getAnalytics()
+          public String toStatisticValue()
           {
             throw new UnsupportedOperationException("Not supported here " + name());
           }
         };
 
-    @NonNull
-    private final Analytics mAnalytics;
-
-    Type(@NonNull Analytics analytics)
-    {
-
-      mAnalytics = analytics;
-    }
-
-    Type()
-    {
-      this(new Analytics(""));
-    }
-
     public void check(@NonNull FragmentManager fragmentManager,
                       @NonNull final NetworkPolicyListener listener,
                       boolean isDialogAllowed)
     {
       showDialog(fragmentManager, listener);
     }
-
-    @NonNull
-    public Analytics getAnalytics()
-    {
-      return mAnalytics;
-    }
   }