diff --git a/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java b/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java index 9386e4d7e8..56a52e66a1 100644 --- a/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java +++ b/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java @@ -227,7 +227,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity setAction(DOWNLOAD); - if (ConnectionState.isWifiConnected()) + if (ConnectionState.INSTANCE.isWifiConnected()) onDownloadClicked(); return; @@ -421,7 +421,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity return R.string.disconnect_usb_cable; case ERR_DOWNLOAD_ERROR: - return (ConnectionState.isConnected() ? R.string.download_has_failed + return (ConnectionState.INSTANCE.isConnected() ? R.string.download_has_failed : R.string.common_check_internet_connection_dialog); default: return R.string.not_enough_memory; diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java index ef6553a113..8374333b0a 100644 --- a/android/src/com/mapswithme/maps/MwmApplication.java +++ b/android/src/com/mapswithme/maps/MwmApplication.java @@ -34,6 +34,7 @@ import com.mapswithme.maps.search.SearchEngine; import com.mapswithme.maps.sound.TtsPlayer; import com.mapswithme.maps.ugc.UGC; import com.mapswithme.util.Config; +import com.mapswithme.util.ConnectionState; import com.mapswithme.util.Counters; import com.mapswithme.util.KeyValue; import com.mapswithme.util.SharedPropertiesUtils; @@ -164,6 +165,7 @@ public class MwmApplication extends Application implements AppBackgroundTracker. mMediator.initSensitiveDataToleranceLibraries(); mMediator.initSensitiveDataStrictLibrariesAsync(); Statistics.INSTANCE.initialize(this); + ConnectionState.INSTANCE.initialize(this); Statistics.INSTANCE.setMediator(mMediator); initNotificationChannels(); diff --git a/android/src/com/mapswithme/maps/ads/LikesManager.java b/android/src/com/mapswithme/maps/ads/LikesManager.java index 6a5d41222e..0c0c7ce1b2 100644 --- a/android/src/com/mapswithme/maps/ads/LikesManager.java +++ b/android/src/com/mapswithme/maps/ads/LikesManager.java @@ -85,7 +85,7 @@ public enum LikesManager { mActivityRef = new WeakReference<>(activity); - if (!ConnectionState.isConnected()) + if (!ConnectionState.INSTANCE.isConnected()) return; Context context = activity.getApplicationContext(); diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkBackupController.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkBackupController.java index e340e7f7a1..a69ad8adcd 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkBackupController.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkBackupController.java @@ -101,7 +101,7 @@ public class BookmarkBackupController implements Authorizer.Callback, private void requestRestoring() { - if (!ConnectionState.isConnected()) + if (!ConnectionState.INSTANCE.isConnected()) { DialogInterface.OnClickListener clickListener = (dialog, which) -> Utils.showSystemConnectionSettings(mContext); diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkHeaderView.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkHeaderView.java index 7b7bfc10e9..2908b6bcf5 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkHeaderView.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkHeaderView.java @@ -77,7 +77,7 @@ public class BookmarkHeaderView extends LinearLayout { final Context context = getContext(); final String imageUrl = category.getImageUrl(); - if (TextUtils.isEmpty(imageUrl) || !ConnectionState.isConnected()) + if (TextUtils.isEmpty(imageUrl) || !ConnectionState.INSTANCE.isConnected()) { UiUtils.hide(mImageView); } diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java index f64d9bd2cf..94202c727c 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java @@ -493,7 +493,7 @@ public class BookmarksCatalogFragment extends BaseWebViewMwmFragment UiUtils.show(frag.mRetryBtn); UiUtils.hide(frag.mWebView, frag.mProgressView); - if (ConnectionState.isConnected()) + if (ConnectionState.INSTANCE.isConnected()) { LOGGER.e(TAG, "Failed to load catalog: " + mError + ", description: " + description); Statistics.INSTANCE.trackDownloadCatalogError(Statistics.ParamValue.UNKNOWN); diff --git a/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java b/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java index 7863aaa444..764b810277 100644 --- a/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java +++ b/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java @@ -76,7 +76,7 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements Discove if (mOnlineMode) return; - if (ConnectionState.isConnected()) + if (ConnectionState.INSTANCE.isConnected()) NetworkPolicy.checkNetworkPolicy(getFragmentManager(), DiscoveryFragment.this::onNetworkPolicyResult); } }; diff --git a/android/src/com/mapswithme/maps/downloader/MapManager.java b/android/src/com/mapswithme/maps/downloader/MapManager.java index af7baa5a55..b89bbfb66b 100644 --- a/android/src/com/mapswithme/maps/downloader/MapManager.java +++ b/android/src/com/mapswithme/maps/downloader/MapManager.java @@ -185,7 +185,7 @@ public final class MapManager private static boolean warnOn3gInternal(Activity activity, @NonNull final Runnable onAcceptListener) { - if (nativeIsDownloadOn3gEnabled() || !ConnectionState.isMobileConnected()) + if (nativeIsDownloadOn3gEnabled() || !ConnectionState.INSTANCE.isMobileConnected()) { onAcceptListener.run(); return false; diff --git a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java index a8eaeb64a1..48cc9488e2 100644 --- a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java +++ b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java @@ -172,7 +172,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener Config.isAutodownloadEnabled() && !sAutodownloadLocked && !failed && - ConnectionState.isWifiConnected()) + ConnectionState.INSTANCE.isWifiConnected()) { Location loc = LocationHelper.INSTANCE.getSavedLocation(); if (loc != null) diff --git a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java index c5278b308c..71642ab068 100644 --- a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java @@ -326,7 +326,7 @@ public class EditorHostFragment extends BaseMwmToolbarFragment Context context = requireContext(); Statistics.INSTANCE.trackEditorSuccess(mIsNewObject, String.valueOf(OsmOAuth.isAuthorized(context))); - if (OsmOAuth.isAuthorized(context) || !ConnectionState.isConnected()) + if (OsmOAuth.isAuthorized(context) || !ConnectionState.INSTANCE.isConnected()) { Utils.navigateToParent(getActivity()); return; diff --git a/android/src/com/mapswithme/maps/editor/ViralFragment.java b/android/src/com/mapswithme/maps/editor/ViralFragment.java index 87ada6337a..dfcb207ce1 100644 --- a/android/src/com/mapswithme/maps/editor/ViralFragment.java +++ b/android/src/com/mapswithme/maps/editor/ViralFragment.java @@ -37,7 +37,7 @@ public class ViralFragment extends BaseMwmDialogFragment { return !MwmApplication.prefs(context).contains(EXTRA_CONGRATS_SHOWN) && Editor.nativeGetStats()[0] == 2 && - ConnectionState.isConnected(); + ConnectionState.INSTANCE.isConnected(); } @Override diff --git a/android/src/com/mapswithme/maps/gallery/Holders.java b/android/src/com/mapswithme/maps/gallery/Holders.java index 141f644367..40b543fb8b 100644 --- a/android/src/com/mapswithme/maps/gallery/Holders.java +++ b/android/src/com/mapswithme/maps/gallery/Holders.java @@ -542,7 +542,7 @@ public class Holders { super.bind(item); getButton().setText(R.string.gallery_pp_download_guides_offline_cta); - boolean isBtnInvisible = ConnectionState.isConnected() && + boolean isBtnInvisible = ConnectionState.INSTANCE.isConnected() && NetworkPolicy.newInstance(NetworkPolicy.getCurrentNetworkUsageStatus()).canUseNetwork(); if (isBtnInvisible) diff --git a/android/src/com/mapswithme/maps/maplayer/guides/AbstractGuidesClickListener.java b/android/src/com/mapswithme/maps/maplayer/guides/AbstractGuidesClickListener.java index 7c1cf4c31b..2dbb24e0d8 100644 --- a/android/src/com/mapswithme/maps/maplayer/guides/AbstractGuidesClickListener.java +++ b/android/src/com/mapswithme/maps/maplayer/guides/AbstractGuidesClickListener.java @@ -27,7 +27,7 @@ public abstract class AbstractGuidesClickListener extends DefaultClickListener public void onItemClick(@NonNull View v, @NonNull BottomSheetItem item) { Mode mode = item.getMode(); - if (!mode.isEnabled(v.getContext()) && !ConnectionState.isConnected()) + if (!mode.isEnabled(v.getContext()) && !ConnectionState.INSTANCE.isConnected()) { mNoConnectionListener.onNoConnectionError(); return; diff --git a/android/src/com/mapswithme/maps/purchase/AbstractBookmarkSubscriptionFragment.java b/android/src/com/mapswithme/maps/purchase/AbstractBookmarkSubscriptionFragment.java index fee7769336..1dad481f2f 100644 --- a/android/src/com/mapswithme/maps/purchase/AbstractBookmarkSubscriptionFragment.java +++ b/android/src/com/mapswithme/maps/purchase/AbstractBookmarkSubscriptionFragment.java @@ -243,7 +243,7 @@ abstract class AbstractBookmarkSubscriptionFragment extends BaseAuthFragment @Override public void onCheckNetworkConnection() { - if (ConnectionState.isConnected()) + if (ConnectionState.INSTANCE.isConnected()) { onNetworkCheckPassed(); return; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarkPurchaseController.java b/android/src/com/mapswithme/maps/purchase/BookmarkPurchaseController.java index dac458346f..471736a2db 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarkPurchaseController.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarkPurchaseController.java @@ -98,7 +98,7 @@ class BookmarkPurchaseController extends AbstractPurchaseController purchases) { - if (!ConnectionState.isWifiConnected()) + if (!ConnectionState.INSTANCE.isWifiConnected()) { LOGGER.i(TAG, "Validation postponed, connection not WI-FI."); return; diff --git a/android/src/com/mapswithme/maps/purchase/SubscriptionPurchaseController.java b/android/src/com/mapswithme/maps/purchase/SubscriptionPurchaseController.java index 11ce69bffd..e0da2973ab 100644 --- a/android/src/com/mapswithme/maps/purchase/SubscriptionPurchaseController.java +++ b/android/src/com/mapswithme/maps/purchase/SubscriptionPurchaseController.java @@ -113,7 +113,7 @@ class SubscriptionPurchaseController extends AbstractPurchaseController { - if (!ConnectionState.isConnected()) + if (!ConnectionState.INSTANCE.isConnected()) { Statistics.INSTANCE.trackQuickFilterClickError(Statistics.EventParam.HOTEL, Statistics.ParamValue.DATE, @@ -103,7 +103,7 @@ public class SearchToolbarController extends ToolbarController private MenuController mGuestsRoomsMenuController; @NonNull private final View.OnClickListener mRoomsClickListener = v -> { - if (!ConnectionState.isConnected()) + if (!ConnectionState.INSTANCE.isConnected()) { Statistics.INSTANCE.trackQuickFilterClickError(Statistics.EventParam.HOTEL, Statistics.ParamValue.ROOMS, diff --git a/android/src/com/mapswithme/maps/widget/placepage/ErrorCatalogPromoListener.java b/android/src/com/mapswithme/maps/widget/placepage/ErrorCatalogPromoListener.java index 224730d4b7..dcebf9c822 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/ErrorCatalogPromoListener.java +++ b/android/src/com/mapswithme/maps/widget/placepage/ErrorCatalogPromoListener.java @@ -35,7 +35,7 @@ public class ErrorCatalogPromoListener implements com.maps @Override public void onItemSelected(@NonNull T item, int position) { - if (ConnectionState.isConnected()) + if (ConnectionState.INSTANCE.isConnected()) NetworkPolicy.checkNetworkPolicy(mActivity.getSupportFragmentManager(), mListener, true); else Utils.showSystemConnectionSettings(getActivity()); diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index 31aec2f90c..7eff57080e 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -1451,7 +1451,7 @@ public class PlacePageView extends NestedScrollViewClickFixed return; } - boolean isConnected = ConnectionState.isConnected(); + boolean isConnected = ConnectionState.INSTANCE.isConnected(); if (isConnected && policy.canUseNetwork()) showHotelDetailViews(); else @@ -1473,7 +1473,7 @@ public class PlacePageView extends NestedScrollViewClickFixed boolean showTaxiOffer = taxiTypes != null && !taxiTypes.isEmpty() && LocationHelper.INSTANCE.getMyPosition() != null && - ConnectionState.isConnected() + ConnectionState.INSTANCE.isConnected() && mapObject.getRoadWarningMarkType() == RoadWarningMarkType.UNKNOWN; UiUtils.showIf(showTaxiOffer, mTaxi, mTaxiShadow, mTaxiDivider); diff --git a/android/src/com/mapswithme/util/BottomSheetHelper.java b/android/src/com/mapswithme/util/BottomSheetHelper.java index 8fc0bc24a4..9fffe4ab49 100644 --- a/android/src/com/mapswithme/util/BottomSheetHelper.java +++ b/android/src/com/mapswithme/util/BottomSheetHelper.java @@ -144,10 +144,4 @@ public final class BottomSheetHelper { return create(context, title).grid(); } - - public static Builder sheet(Builder builder, int id, @DrawableRes int iconRes, CharSequence text) - { - Drawable icon = ContextCompat.getDrawable(MwmApplication.get(), iconRes); - return builder.sheet(id, icon, text); - } } diff --git a/android/src/com/mapswithme/util/Config.java b/android/src/com/mapswithme/util/Config.java index 4eb46e7788..41e1f749f1 100644 --- a/android/src/com/mapswithme/util/Config.java +++ b/android/src/com/mapswithme/util/Config.java @@ -270,7 +270,7 @@ public final class Config public static void setUseMobileDataSettings(@NonNull NetworkPolicy.Type value) { setInt(KEY_MISC_USE_MOBILE_DATA, value.ordinal()); - setBool(KEY_MISC_USE_MOBILE_DATA_ROAMING, ConnectionState.isInRoaming()); + setBool(KEY_MISC_USE_MOBILE_DATA_ROAMING, ConnectionState.INSTANCE.isInRoaming()); } public static void setMobileDataTimeStamp(long timestamp) diff --git a/android/src/com/mapswithme/util/ConnectionState.java b/android/src/com/mapswithme/util/ConnectionState.java index efbac2a9d5..1f14bdeedb 100644 --- a/android/src/com/mapswithme/util/ConnectionState.java +++ b/android/src/com/mapswithme/util/ConnectionState.java @@ -1,23 +1,28 @@ package com.mapswithme.util; -import android.app.Application; import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.telephony.TelephonyManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.MwmApplication; +import com.mapswithme.maps.base.Initializable; import static com.mapswithme.util.ConnectionState.Type.NONE; -public class ConnectionState +public enum ConnectionState implements Initializable { + INSTANCE; + // values should correspond to ones from enum class EConnectionType (in platform/platform.hpp) private static final byte CONNECTION_NONE = 0; private static final byte CONNECTION_WIFI = 1; private static final byte CONNECTION_WWAN = 2; + @SuppressWarnings("NotNullFieldNotInitialized") + @NonNull + private Context mContext; public enum Type { @@ -45,68 +50,51 @@ public class ConnectionState } } - /** - * Use the {@link #isNetworkConnected(Context, int)} method instead. - */ - @Deprecated - private static boolean isNetworkConnected(int networkType) + @Override + public void initialize(@Nullable Context context) + { + mContext = MwmApplication.from(context); + } + + @Override + public void destroy() + { + // No op + } + + private boolean isNetworkConnected(int networkType) { final NetworkInfo info = getActiveNetwork(); return info != null && info.getType() == networkType && info.isConnected(); } - private static boolean isNetworkConnected(@NonNull Context context, int networkType) - { - final NetworkInfo info = getActiveNetwork(context); - return info != null && info.getType() == networkType && info.isConnected(); - } - - /** - * Use the {@link #getActiveNetwork(Context)} method instead. - */ @Nullable - @Deprecated - public static NetworkInfo getActiveNetwork() + public NetworkInfo getActiveNetwork() { - Application context = MwmApplication.get(); - if (context == null) - return null; - ConnectivityManager manager = - ((ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE)); + ((ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE)); if (manager == null) return null; return manager.getActiveNetworkInfo(); } - @Nullable - public static NetworkInfo getActiveNetwork(@NonNull Context context) - { - ConnectivityManager manager = - ((ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE)); - if (manager == null) - return null; - - return manager.getActiveNetworkInfo(); - } - - public static boolean isMobileConnected() + public boolean isMobileConnected() { return isNetworkConnected(ConnectivityManager.TYPE_MOBILE); } - public static boolean isWifiConnected() + public boolean isWifiConnected() { return isNetworkConnected(ConnectivityManager.TYPE_WIFI); } - public static boolean isConnected() + public boolean isConnected() { return isNetworkConnected(ConnectivityManager.TYPE_WIFI) || isNetworkConnected(ConnectivityManager.TYPE_MOBILE); } - public static boolean isConnectionFast(NetworkInfo info) + public boolean isConnectionFast(NetworkInfo info) { if (info == null || !info.isConnected()) return false; @@ -146,7 +134,7 @@ public class ConnectionState return false; } - public static boolean isInRoaming() + public boolean isInRoaming() { NetworkInfo info = getActiveNetwork(); return info != null && info.isRoaming(); @@ -156,15 +144,11 @@ public class ConnectionState @SuppressWarnings("unused") public static byte getConnectionState() { - return requestCurrentType().getNativeRepresentation(); + return INSTANCE.requestCurrentType().getNativeRepresentation(); } - /** - * Use the {@link #requestCurrentType(Context)} method instead. - */ @NonNull - @Deprecated - public static Type requestCurrentType() + public Type requestCurrentType() { for (ConnectionState.Type each : ConnectionState.Type.values()) { @@ -173,15 +157,4 @@ public class ConnectionState } return NONE; } - - @NonNull - public static Type requestCurrentType(@NonNull Context context) - { - for (ConnectionState.Type each : ConnectionState.Type.values()) - { - if (isNetworkConnected(context, each.getPlatformRepresentation())) - return each; - } - return NONE; - } } diff --git a/android/src/com/mapswithme/util/NetworkPolicy.java b/android/src/com/mapswithme/util/NetworkPolicy.java index 2689ea68f2..ead7e4ca49 100644 --- a/android/src/com/mapswithme/util/NetworkPolicy.java +++ b/android/src/com/mapswithme/util/NetworkPolicy.java @@ -36,7 +36,7 @@ public final class NetworkPolicy public void check(@NonNull FragmentManager fragmentManager, @NonNull NetworkPolicyListener listener, boolean isDialogAllowed) { - boolean nowInRoaming = ConnectionState.isInRoaming(); + boolean nowInRoaming = ConnectionState.INSTANCE.isInRoaming(); boolean acceptedInRoaming = Config.getMobileDataRoaming(); if (nowInRoaming && !acceptedInRoaming) @@ -100,7 +100,7 @@ public final class NetworkPolicy public void check(@NonNull FragmentManager fragmentManager, @NonNull NetworkPolicyListener listener, boolean isDialogAllowed) { - boolean nowInRoaming = ConnectionState.isInRoaming(); + boolean nowInRoaming = ConnectionState.INSTANCE.isInRoaming(); boolean acceptedInRoaming = Config.getMobileDataRoaming(); if (nowInRoaming && !acceptedInRoaming) @@ -137,13 +137,13 @@ public final class NetworkPolicy @NonNull final NetworkPolicyListener listener, boolean isDialogAllowed) { - if (ConnectionState.isWifiConnected()) + if (ConnectionState.INSTANCE.isWifiConnected()) { listener.onResult(new NetworkPolicy(true)); return; } - if (!ConnectionState.isMobileConnected()) + if (!ConnectionState.INSTANCE.isMobileConnected()) { listener.onResult(new NetworkPolicy(false)); return; @@ -161,13 +161,13 @@ public final class NetworkPolicy public static boolean getCurrentNetworkUsageStatus() { - if (ConnectionState.isWifiConnected()) + if (ConnectionState.INSTANCE.isWifiConnected()) return true; - if (!ConnectionState.isMobileConnected()) + if (!ConnectionState.INSTANCE.isMobileConnected()) return false; - boolean nowInRoaming = ConnectionState.isInRoaming(); + boolean nowInRoaming = ConnectionState.INSTANCE.isInRoaming(); boolean acceptedInRoaming = Config.getMobileDataRoaming(); if (nowInRoaming && !acceptedInRoaming) return false; diff --git a/android/src/com/mapswithme/util/Utils.java b/android/src/com/mapswithme/util/Utils.java index c18ead9b16..b3c9b71a85 100644 --- a/android/src/com/mapswithme/util/Utils.java +++ b/android/src/com/mapswithme/util/Utils.java @@ -343,9 +343,10 @@ public class Utils return res; } - public static void checkConnection(final Context context, final @StringRes int message, final Proc onCheckPassedCallback) + public static void checkConnection(final Context context, final @StringRes int message, + final Proc onCheckPassedCallback) { - if (ConnectionState.isConnected()) + if (ConnectionState.INSTANCE.isConnected()) { onCheckPassedCallback.invoke(true); return; diff --git a/android/src/com/mapswithme/util/statistics/MytargetHelper.java b/android/src/com/mapswithme/util/statistics/MytargetHelper.java index d6cfe1c347..fff8b565d3 100644 --- a/android/src/com/mapswithme/util/statistics/MytargetHelper.java +++ b/android/src/com/mapswithme/util/statistics/MytargetHelper.java @@ -43,7 +43,7 @@ public final class MytargetHelper public MytargetHelper(final @NonNull Listener listener, @NonNull Context context) { - if (!ConnectionState.isConnected()) + if (!ConnectionState.INSTANCE.isConnected()) { listener.onNoAds(); return; diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java index 5f17e25ecb..259c7d7c35 100644 --- a/android/src/com/mapswithme/util/statistics/Statistics.java +++ b/android/src/com/mapswithme/util/statistics/Statistics.java @@ -1060,14 +1060,14 @@ public enum Statistics implements Initializable public void trackConnectionState() { - if (ConnectionState.isConnected()) + if (ConnectionState.INSTANCE.isConnected()) { - final NetworkInfo info = ConnectionState.getActiveNetwork(); + final NetworkInfo info = ConnectionState.INSTANCE.getActiveNetwork(); boolean isConnectionMetered = false; //noinspection ConstantConditions trackEvent(EventName.ACTIVE_CONNECTION, params().add(EventParam.CONNECTION_TYPE, info.getTypeName() + ":" + info.getSubtypeName()) - .add(EventParam.CONNECTION_FAST, String.valueOf(ConnectionState.isConnectionFast(info))) + .add(EventParam.CONNECTION_FAST, String.valueOf(ConnectionState.INSTANCE.isConnectionFast(info))) .add(EventParam.CONNECTION_METERED, String.valueOf(isConnectionMetered))); } else @@ -1094,7 +1094,7 @@ public enum Statistics implements Initializable { trackEvent(newObject ? EventName.EDITOR_START_CREATE : EventName.EDITOR_START_EDIT, editorMwmParams().add(EventParam.IS_AUTHENTICATED, valueOfIsAuthorized) - .add(EventParam.IS_ONLINE, String.valueOf(ConnectionState.isConnected()))); + .add(EventParam.IS_ONLINE, String.valueOf(ConnectionState.INSTANCE.isConnected()))); if (newObject) PushwooshHelper.nativeSendEditorAddObjectTag(); @@ -1113,14 +1113,14 @@ public enum Statistics implements Initializable { trackEvent(newObject ? EventName.EDITOR_SUCCESS_CREATE : EventName.EDITOR_SUCCESS_EDIT, editorMwmParams().add(EventParam.IS_AUTHENTICATED, valueOfIsAuthorized) - .add(EventParam.IS_ONLINE, String.valueOf(ConnectionState.isConnected()))); + .add(EventParam.IS_ONLINE, String.valueOf(ConnectionState.INSTANCE.isConnected()))); } public void trackEditorError(boolean newObject, String valueOfIsAuthorized) { trackEvent(newObject ? EventName.EDITOR_ERROR_CREATE : EventName.EDITOR_ERROR_EDIT, editorMwmParams().add(EventParam.IS_AUTHENTICATED, valueOfIsAuthorized) - .add(EventParam.IS_ONLINE, String.valueOf(ConnectionState.isConnected()))); + .add(EventParam.IS_ONLINE, String.valueOf(ConnectionState.INSTANCE.isConnected()))); } public void trackNetworkUsageAlert(@NonNull String event, @NonNull String param) @@ -1302,13 +1302,13 @@ public enum Statistics implements Initializable private String getConnectionState() { final String network; - if (ConnectionState.isWifiConnected()) + if (ConnectionState.INSTANCE.isWifiConnected()) { network = "wifi"; } - else if (ConnectionState.isMobileConnected()) + else if (ConnectionState.INSTANCE.isMobileConnected()) { - if (ConnectionState.isInRoaming()) + if (ConnectionState.INSTANCE.isInRoaming()) network = "roaming"; else network = "mobile"; @@ -1552,7 +1552,7 @@ public enum Statistics implements Initializable trackEvent(UGC_REVIEW_START, params() .add(EventParam.IS_AUTHENTICATED, Framework.nativeIsUserAuthenticated()) - .add(EventParam.IS_ONLINE, ConnectionState.isConnected()) + .add(EventParam.IS_ONLINE, ConnectionState.INSTANCE.isConnected()) .add(EventParam.MODE, isEdit ? ParamValue.EDIT : ParamValue.ADD) .add(EventParam.FROM, isPPPreview ? ParamValue.PLACEPAGE_PREVIEW : isFromNotification ? ParamValue.NOTIFICATION : ParamValue.PLACEPAGE)