pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Review fixes.

Browse source
This commit is contained in:
Roman Romanov 2017-02-01 16:52:51 +04:00
parent ece3e88f87
commit 07a44a8dc6
7 changed files with 48 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -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

2
android/jni/com/mapswithme/util/NetworkPolicy.cpp
View file

@ -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

21
android/res/layout/dialog_stacked_buttons.xml
View file

@ -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"/>
<TextView
android:id="@+id/btn__neutral"
@ -49,12 +52,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="Only Today"/>
tools:text="Only Today"
tools:targetApi="jelly_bean"/>
<TextView
android:id="@+id/btn__negative"
@ -62,10 +68,13 @@
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="Do not Use Today"/>
tools:text="Do not Use Today"
tools:targetApi="jelly_bean"/>
</LinearLayout>

4
android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java
View file

@ -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!");

11
android/src/com/mapswithme/util/Config.java
View file

@ -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);

38
android/src/com/mapswithme/util/NetworkPolicy.java
View file

@ -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;
}

4
platform/network_policy.hpp
View file

@ -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
{