From 07a44a8dc6bf06b427c50daa327696f255c8faeb Mon Sep 17 00:00:00 2001 From: Roman Romanov Date: Wed, 1 Feb 2017 16:52:51 +0400 Subject: [PATCH] [android] Review fixes. --- android/jni/com/mapswithme/maps/Framework.cpp | 9 ++--- .../jni/com/mapswithme/util/NetworkPolicy.cpp | 2 +- android/res/layout/dialog_stacked_buttons.xml | 21 +++++++--- .../maps/settings/MiscPrefsFragment.java | 4 +- android/src/com/mapswithme/util/Config.java | 11 +++--- .../com/mapswithme/util/NetworkPolicy.java | 38 +++++++++---------- platform/network_policy.hpp | 4 +- 7 files changed, 48 insertions(+), 41 deletions(-) diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index b2378c3909..3e27bcf586 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -1,5 +1,5 @@ -#include "Framework.hpp" -#include "UserMarkHelper.hpp" +#include "com/mapswithme/maps/Framework.hpp" +#include "com/mapswithme/maps/UserMarkHelper.hpp" #include "com/mapswithme/core/jni_helper.hpp" #include "com/mapswithme/maps/bookmarks/data/BookmarkManager.hpp" #include "com/mapswithme/opengl/androidoglcontextfactory.hpp" @@ -36,16 +36,15 @@ #include "base/math.hpp" #include "base/sunrise_sunset.hpp" -#include "../util/NetworkPolicy.hpp" +#include "com/mapswithme/util/NetworkPolicy.hpp" android::Framework * g_framework = 0; -using network_policy::GetNetworkPolicyStatus; - namespace platform { NetworkPolicy ToNativeNetworkPolicy(JNIEnv * env, jobject obj) { + using network_policy::GetNetworkPolicyStatus; return NetworkPolicy(GetNetworkPolicyStatus(env, obj)); } } // namespace platform diff --git a/android/jni/com/mapswithme/util/NetworkPolicy.cpp b/android/jni/com/mapswithme/util/NetworkPolicy.cpp index beba28424a..b7a5bb1787 100644 --- a/android/jni/com/mapswithme/util/NetworkPolicy.cpp +++ b/android/jni/com/mapswithme/util/NetworkPolicy.cpp @@ -4,7 +4,7 @@ namespace network_policy { bool GetNetworkPolicyStatus(JNIEnv * env, jobject obj) { - const jmethodID networkPolicyCanUseMethod = jni::GetMethodID(env, obj, "isCanUseNetwork", "()Z"); + const jmethodID networkPolicyCanUseMethod = jni::GetMethodID(env, obj, "сanUseNetwork", "()Z"); return env->CallBooleanMethod(obj, networkPolicyCanUseMethod); } } // namespace network_policy diff --git a/android/res/layout/dialog_stacked_buttons.xml b/android/res/layout/dialog_stacked_buttons.xml index 156151821c..b41c356d44 100644 --- a/android/res/layout/dialog_stacked_buttons.xml +++ b/android/res/layout/dialog_stacked_buttons.xml @@ -36,12 +36,15 @@ android:layout_height="@dimen/margin_double_plus" android:layout_marginLeft="@dimen/neg_margin_base_plus" android:layout_marginRight="@dimen/neg_margin_base_plus" - android:padding="@dimen/margin_half" + android:paddingLeft="@dimen/margin_base" + android:paddingRight="@dimen/margin_base" android:gravity="center_vertical|end" android:textAppearance="@style/MwmTextAppearance.Button" + android:fontFamily="@string/robotoMedium" android:lines="1" android:background="?clickableBackground" - tools:text="Use Always"/> + tools:text="Use Always" + tools:targetApi="jelly_bean"/> + tools:text="Only Today" + tools:targetApi="jelly_bean"/> + tools:text="Do not Use Today" + tools:targetApi="jelly_bean"/> diff --git a/android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java b/android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java index 66b663e0f5..a7124e6e6a 100644 --- a/android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java +++ b/android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java @@ -119,11 +119,11 @@ public class MiscPrefsFragment extends BaseXmlSettingsFragment break; case NetworkPolicy.NOT_TODAY: Config.setUseMobileDataSettings(NetworkPolicy.NOT_TODAY); - Config.setTodayStamp(System.currentTimeMillis()); + Config.setMobileDataTimeStamp(System.currentTimeMillis()); break; case NetworkPolicy.TODAY: Config.setUseMobileDataSettings(NetworkPolicy.TODAY); - Config.setTodayStamp(System.currentTimeMillis()); + Config.setMobileDataTimeStamp(System.currentTimeMillis()); break; default: throw new AssertionError("Wrong NetworkPolicy type!"); diff --git a/android/src/com/mapswithme/util/Config.java b/android/src/com/mapswithme/util/Config.java index 7f62c49825..52bedeb298 100644 --- a/android/src/com/mapswithme/util/Config.java +++ b/android/src/com/mapswithme/util/Config.java @@ -5,7 +5,6 @@ import android.text.TextUtils; import android.text.format.DateUtils; import com.mapswithme.maps.BuildConfig; -import com.mapswithme.util.log.LoggerFactory; public final class Config { @@ -35,7 +34,7 @@ public final class Config private static final String KEY_MISC_UI_THEME = "UiTheme"; private static final String KEY_MISC_UI_THEME_SETTINGS = "UiThemeSettings"; private static final String KEY_MISC_USE_MOBILE_DATA = "UseMobileData"; - private static final String KEY_MISC_TODAY_TIMESTAMP = "NotTodayTimestamp"; + private static final String KEY_MISC_USE_MOBILE_DATA_TIMESTAMP = "UseMobileDataTimestamp"; private Config() {} @@ -382,14 +381,14 @@ public final class Config setInt(KEY_MISC_USE_MOBILE_DATA, value); } - public static void setTodayStamp(long timestamp) + public static void setMobileDataTimeStamp(long timestamp) { - setLong(KEY_MISC_TODAY_TIMESTAMP, timestamp); + setLong(KEY_MISC_USE_MOBILE_DATA_TIMESTAMP, timestamp); } - static long getTodayTimeStamp() + static long getMobileDataTimeStamp() { - return getLong(KEY_MISC_TODAY_TIMESTAMP, 0L); + return getLong(KEY_MISC_USE_MOBILE_DATA_TIMESTAMP, 0L); } private static native boolean nativeGetBoolean(String name, boolean defaultValue); diff --git a/android/src/com/mapswithme/util/NetworkPolicy.java b/android/src/com/mapswithme/util/NetworkPolicy.java index 29c7fe397b..5720b98923 100644 --- a/android/src/com/mapswithme/util/NetworkPolicy.java +++ b/android/src/com/mapswithme/util/NetworkPolicy.java @@ -54,28 +54,28 @@ public final class NetworkPolicy listener.onResult(new NetworkPolicy(false)); break; case NOT_TODAY: - long timestamp = Config.getTodayTimeStamp(); - boolean showDialog = TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis() - timestamp) >= 1; - if (!showDialog) - { - listener.onResult(new NetworkPolicy(false)); - return; - } - showDialog(context, listener); + showDialogIfNeed(context, listener, false); break; case TODAY: - timestamp = Config.getTodayTimeStamp(); - showDialog = TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis() - timestamp) >= 1; - if (!showDialog) - { - listener.onResult(new NetworkPolicy(true)); - return; - } - showDialog(context, listener); + showDialogIfNeed(context, listener, true); break; } } + private static void showDialogIfNeed(@NonNull Context context, + @NonNull NetworkPolicyListener listener, + boolean allowByDefault) + { + long timestamp = Config.getMobileDataTimeStamp(); + boolean showDialog = TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis() - timestamp) >= 1; + if (!showDialog) + { + listener.onResult(new NetworkPolicy(allowByDefault)); + return; + } + showDialog(context, listener); + } + private static void showDialog(@NonNull Context context, @NonNull final NetworkPolicyListener listener) { new StackedButtonsDialog.Builder(context) @@ -97,7 +97,7 @@ public final class NetworkPolicy public void onClick(DialogInterface dialog, int which) { Config.setUseMobileDataSettings(NOT_TODAY); - Config.setTodayStamp(System.currentTimeMillis()); + Config.setMobileDataTimeStamp(System.currentTimeMillis()); listener.onResult(new NetworkPolicy(false)); } }) @@ -107,7 +107,7 @@ public final class NetworkPolicy public void onClick(DialogInterface dialog, int which) { Config.setUseMobileDataSettings(TODAY); - Config.setTodayStamp(System.currentTimeMillis()); + Config.setMobileDataTimeStamp(System.currentTimeMillis()); listener.onResult(new NetworkPolicy(true)); } }) @@ -122,7 +122,7 @@ public final class NetworkPolicy mCanUseNetwork = canUse; } - public boolean isCanUseNetwork() + public boolean сanUseNetwork() { return mCanUseNetwork; } diff --git a/platform/network_policy.hpp b/platform/network_policy.hpp index f69387f8da..b121164021 100644 --- a/platform/network_policy.hpp +++ b/platform/network_policy.hpp @@ -2,10 +2,10 @@ #include "std/function.hpp" -class _jobject; class _JNIEnv; -typedef _jobject * jobject; +class _jobject; typedef _JNIEnv JNIEnv; +typedef _jobject * jobject; namespace platform {