diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index be51ff90a3..30f3b7b308 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -73,10 +73,6 @@
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version"/>
-
-
@@ -329,23 +325,6 @@
android:name=".discovery.DiscoveryActivity"
android:parentActivityName=".MwmActivity" />
-
-
-
-
-
-
-
-
-
-
-
-
-
- - @color/button_accent_text_disabled
- @drawable/button_ghost
- @color/button_text_ghost
- - @drawable/button_ghost_facebook
- @drawable/button_red
- @color/button_red_text
@@ -274,7 +273,6 @@
- @color/button_accent_text_disabled_night
- @drawable/button_ghost_night
- @color/button_text_ghost_night
- - @drawable/button_ghost_facebook_night
- @drawable/button_red
- @color/button_red_text
diff --git a/android/src/com/mapswithme/maps/Framework.java b/android/src/com/mapswithme/maps/Framework.java
index b97dbf9715..94868dea16 100644
--- a/android/src/com/mapswithme/maps/Framework.java
+++ b/android/src/com/mapswithme/maps/Framework.java
@@ -87,12 +87,11 @@ public class Framework
public static final int ROUTE_REBUILD_AFTER_POINTS_LOADING = 0;
@Retention(RetentionPolicy.SOURCE)
- @IntDef({ SOCIAL_TOKEN_INVALID, SOCIAL_TOKEN_FACEBOOK, SOCIAL_TOKEN_GOOGLE,
+ @IntDef({ SOCIAL_TOKEN_INVALID, SOCIAL_TOKEN_GOOGLE,
SOCIAL_TOKEN_PHONE, TOKEN_MAPSME })
public @interface AuthTokenType
{}
public static final int SOCIAL_TOKEN_INVALID = -1;
- public static final int SOCIAL_TOKEN_FACEBOOK = 0;
public static final int SOCIAL_TOKEN_GOOGLE = 1;
public static final int SOCIAL_TOKEN_PHONE = 2;
//TODO(@alexzatsepin): remove TOKEN_MAPSME from this list.
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 4f2e40eda3..0622e033ce 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -1489,10 +1489,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
LikesManager.INSTANCE.showRateDialogForOldUser(this);
Counters.setShowReviewForOldUser(context, false);
}
- else
- {
- LikesManager.INSTANCE.showDialogs(this);
- }
}
@Override
diff --git a/android/src/com/mapswithme/maps/ads/Banner.java b/android/src/com/mapswithme/maps/ads/Banner.java
index dfc0a6456f..4784291063 100644
--- a/android/src/com/mapswithme/maps/ads/Banner.java
+++ b/android/src/com/mapswithme/maps/ads/Banner.java
@@ -48,8 +48,6 @@ public final class Banner implements Parcelable
{
switch (Type.values()[mType])
{
- case TYPE_FACEBOOK:
- return Providers.FACEBOOK;
case TYPE_RB:
return Providers.MY_TARGET;
case TYPE_MOPUB:
@@ -111,7 +109,6 @@ public final class Banner implements Parcelable
public enum Type
{
TYPE_NONE,
- TYPE_FACEBOOK,
TYPE_RB,
TYPE_MOPUB,
TYPE_GOOGLE
diff --git a/android/src/com/mapswithme/maps/ads/FacebookInvitesDialogFragment.java b/android/src/com/mapswithme/maps/ads/FacebookInvitesDialogFragment.java
deleted file mode 100644
index 3dd0e4b8b6..0000000000
--- a/android/src/com/mapswithme/maps/ads/FacebookInvitesDialogFragment.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.mapswithme.maps.ads;
-
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.facebook.FacebookSdk;
-import com.facebook.share.model.AppInviteContent;
-import com.facebook.share.widget.AppInviteDialog;
-import com.mapswithme.maps.R;
-import com.mapswithme.maps.base.BaseMwmDialogFragment;
-import com.mapswithme.maps.dialog.DialogUtils;
-import com.mapswithme.util.statistics.Statistics;
-
-public class FacebookInvitesDialogFragment extends BaseMwmDialogFragment
-{
- private static final String INVITE_APP_URL = "https://fb.me/958251974218933";
- private static final String INVITE_IMAGE = "https://omaps.app/images/fb_app_invite_banner.png";
-
- private boolean mHasInvited;
-
- @NonNull
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState)
- {
- final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
- final LayoutInflater inflater = getActivity().getLayoutInflater();
-
- final View root = inflater.inflate(R.layout.fragment_app_invites_dialog, null);
- return builder.setView(root)
- .setNegativeButton(R.string.remind_me_later, new DialogInterface.OnClickListener()
- {
- @Override
- public void onClick(DialogInterface dialog, int which)
- {
- Statistics.INSTANCE.trackEvent(Statistics.EventName.FACEBOOK_INVITE_LATER);
- }
- })
- .setPositiveButton(R.string.share, new DialogInterface.OnClickListener()
- {
- @Override
- public void onClick(DialogInterface dialog, int which)
- {
- mHasInvited = true;
- showAppInviteDialog();
- Statistics.INSTANCE.trackEvent(Statistics.EventName.FACEBOOK_INVITE_INVITED);
- }
- }).create();
- }
-
- @Override
- public void onResume()
- {
- super.onResume();
- if (mHasInvited)
- dismiss();
- }
-
- @Override
- public void onCancel(DialogInterface dialog)
- {
- super.onCancel(dialog);
- Statistics.INSTANCE.trackEvent(Statistics.EventName.FACEBOOK_INVITE_LATER);
- }
-
- private void showAppInviteDialog()
- {
- FacebookSdk.sdkInitialize(getActivity());
- AppInviteContent content = new AppInviteContent.Builder()
- .setApplinkUrl(INVITE_APP_URL)
- .setPreviewImageUrl(INVITE_IMAGE)
- .build();
- if (AppInviteDialog.canShow())
- AppInviteDialog.show(this, content);
- else
- {
- DialogUtils.showAlertDialog(getActivity(), R.string.email_error_title);
- dismiss();
- }
- }
-}
diff --git a/android/src/com/mapswithme/maps/ads/LikesManager.java b/android/src/com/mapswithme/maps/ads/LikesManager.java
index 0c0c7ce1b2..ff733299e5 100644
--- a/android/src/com/mapswithme/maps/ads/LikesManager.java
+++ b/android/src/com/mapswithme/maps/ads/LikesManager.java
@@ -6,7 +6,6 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import android.content.Context;
-import android.util.SparseArray;
import com.mapswithme.maps.BuildConfig;
import com.mapswithme.maps.MwmActivity;
@@ -15,7 +14,6 @@ import com.mapswithme.maps.downloader.MapManager;
import com.mapswithme.maps.editor.EditorHostFragment;
import com.mapswithme.maps.routing.RoutingController;
import com.mapswithme.maps.search.SearchFragment;
-import com.mapswithme.util.ConnectionState;
import com.mapswithme.util.Counters;
import com.mapswithme.util.concurrency.UiThread;
@@ -29,7 +27,6 @@ public enum LikesManager
private static final int DIALOG_DELAY_DEFAULT = 30000;
- private static final int DIALOG_DELAY_SHORT = 5000;
/*
Maps type of like dialog to the dialog, performing like.
@@ -37,9 +34,7 @@ public enum LikesManager
public enum LikeType
{
GPLAY_NEW_USERS(RateStoreDialogFragment.class, DIALOG_DELAY_DEFAULT),
- GPLAY_OLD_USERS(RateStoreDialogFragment.class, DIALOG_DELAY_DEFAULT),
- FACEBOOK_INVITE_NEW_USERS(FacebookInvitesDialogFragment.class, DIALOG_DELAY_DEFAULT),
- FACEBOOK_INVITES_OLD_USERS(FacebookInvitesDialogFragment.class, DIALOG_DELAY_DEFAULT);
+ GPLAY_OLD_USERS(RateStoreDialogFragment.class, DIALOG_DELAY_DEFAULT);
public final Class clazz;
public final int delay;
@@ -51,23 +46,10 @@ public enum LikesManager
}
}
- /*
- Maps number of session to LikeType.
- */
- private static final SparseArray sOldUsersMapping = new SparseArray<>();
- private static final SparseArray sNewUsersMapping = new SparseArray<>();
-
private static final List> sFragments = new ArrayList<>();
static
{
- sOldUsersMapping.put(6, LikeType.FACEBOOK_INVITES_OLD_USERS);
- sOldUsersMapping.put(30, LikeType.FACEBOOK_INVITES_OLD_USERS);
- sOldUsersMapping.put(50, LikeType.FACEBOOK_INVITES_OLD_USERS);
- sNewUsersMapping.put(9, LikeType.FACEBOOK_INVITE_NEW_USERS);
- sNewUsersMapping.put(35, LikeType.FACEBOOK_INVITE_NEW_USERS);
- sNewUsersMapping.put(55, LikeType.FACEBOOK_INVITE_NEW_USERS);
-
sFragments.add(SearchFragment.class);
sFragments.add(EditorHostFragment.class);
sFragments.add(DownloaderFragment.class);
@@ -81,21 +63,6 @@ public enum LikesManager
return (Counters.getFirstInstallVersion(context) == BuildConfig.VERSION_CODE);
}
- public void showDialogs(FragmentActivity activity)
- {
- mActivityRef = new WeakReference<>(activity);
-
- if (!ConnectionState.INSTANCE.isConnected())
- return;
-
- Context context = activity.getApplicationContext();
- int sessionCount = Counters.getSessionCount(context);
- final LikeType type = isNewUser(context) ?
- sNewUsersMapping.get(sessionCount) : sOldUsersMapping.get(sessionCount);
- if (type != null)
- displayLikeDialog(context, type.clazz, type.delay);
- }
-
public void showRateDialogForOldUser(FragmentActivity activity)
{
Context context = activity.getApplicationContext();
diff --git a/android/src/com/mapswithme/maps/ads/NetworkType.java b/android/src/com/mapswithme/maps/ads/NetworkType.java
index 78d48bcdbc..9613d8112d 100644
--- a/android/src/com/mapswithme/maps/ads/NetworkType.java
+++ b/android/src/com/mapswithme/maps/ads/NetworkType.java
@@ -2,7 +2,6 @@ package com.mapswithme.maps.ads;
public enum NetworkType
{
- FACEBOOK,
GOOGLE,
MOPUB,
MOPUB_GOOGLE,
diff --git a/android/src/com/mapswithme/maps/ads/Providers.java b/android/src/com/mapswithme/maps/ads/Providers.java
index 63cb12541d..b1672873cd 100644
--- a/android/src/com/mapswithme/maps/ads/Providers.java
+++ b/android/src/com/mapswithme/maps/ads/Providers.java
@@ -3,7 +3,6 @@ package com.mapswithme.maps.ads;
class Providers
{
- static final String FACEBOOK = "FB";
static final String MY_TARGET = "MY_TARGET";
static final String MOPUB = "MOPUB";
static final String GOOGLE = "GOOGLE";
diff --git a/android/src/com/mapswithme/maps/auth/Constants.java b/android/src/com/mapswithme/maps/auth/Constants.java
index 4ba9151202..8995950bb7 100644
--- a/android/src/com/mapswithme/maps/auth/Constants.java
+++ b/android/src/com/mapswithme/maps/auth/Constants.java
@@ -1,8 +1,5 @@
package com.mapswithme.maps.auth;
-import java.util.Collections;
-import java.util.List;
-
class Constants
{
static final int REQ_CODE_PHONE_AUTH_RESULT = 102;
@@ -15,6 +12,4 @@ class Constants
static final String EXTRA_PRIVACY_POLICY_ACCEPTED = "extra_privacy_policy_accepted";
static final String EXTRA_TERMS_OF_USE_ACCEPTED = "extra_terms_of_use_accepted";
static final String EXTRA_PROMO_ACCEPTED = "extra_promo_accepted";
- static final List FACEBOOK_PERMISSIONS =
- Collections.singletonList("email");
}
diff --git a/android/src/com/mapswithme/maps/auth/FacebookTokenHandler.java b/android/src/com/mapswithme/maps/auth/FacebookTokenHandler.java
deleted file mode 100644
index 8d2a16a3f6..0000000000
--- a/android/src/com/mapswithme/maps/auth/FacebookTokenHandler.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mapswithme.maps.auth;
-
-import android.content.Intent;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import android.text.TextUtils;
-
-import com.facebook.AccessToken;
-import com.mapswithme.maps.Framework;
-
-class FacebookTokenHandler implements TokenHandler
-{
- @Override
- public boolean checkToken(int requestCode, @NonNull Intent data)
- {
- AccessToken facebookToken = AccessToken.getCurrentAccessToken();
- return facebookToken != null && !TextUtils.isEmpty(facebookToken.getToken());
- }
-
- @Nullable
- @Override
- public String getToken()
- {
- AccessToken facebookToken = AccessToken.getCurrentAccessToken();
- return facebookToken != null ? facebookToken.getToken() : null;
- }
-
- @Override
- public int getType()
- {
- return Framework.SOCIAL_TOKEN_FACEBOOK;
- }
-}
diff --git a/android/src/com/mapswithme/maps/auth/SocialAuthDialogFragment.java b/android/src/com/mapswithme/maps/auth/SocialAuthDialogFragment.java
index 1b220d684f..5e9a5edf33 100644
--- a/android/src/com/mapswithme/maps/auth/SocialAuthDialogFragment.java
+++ b/android/src/com/mapswithme/maps/auth/SocialAuthDialogFragment.java
@@ -5,10 +5,6 @@ import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
-import androidx.annotation.IdRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
@@ -16,11 +12,10 @@ import android.view.ViewGroup;
import android.view.Window;
import android.widget.CheckBox;
-import com.facebook.CallbackManager;
-import com.facebook.FacebookCallback;
-import com.facebook.FacebookException;
-import com.facebook.login.LoginManager;
-import com.facebook.login.LoginResult;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import com.google.android.gms.auth.api.signin.GoogleSignIn;
import com.google.android.gms.auth.api.signin.GoogleSignInClient;
import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
@@ -33,7 +28,6 @@ import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
import com.mapswithme.util.statistics.Statistics;
-import java.lang.ref.WeakReference;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
@@ -46,10 +40,9 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
@NonNull
private GoogleSignInClient mGoogleSignInClient;
@NonNull
- private final CallbackManager mFacebookCallbackManager = CallbackManager.Factory.create();
- @NonNull
private final List mTokenHandlers = Arrays.asList(
- new FacebookTokenHandler(), new GoogleTokenHandler(), new PhoneTokenHandler());
+ new GoogleTokenHandler(), new PhoneTokenHandler()
+ );
@Nullable
private TokenHandler mCurrentTokenHandler;
@NonNull
@@ -69,14 +62,6 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
trackStatsIfArgsExist(Statistics.EventName.AUTH_START);
}
};
- @NonNull
- private final View.OnClickListener mFacebookClickListener = v -> {
- LoginManager lm = LoginManager.getInstance();
- lm.logInWithReadPermissions(SocialAuthDialogFragment.this,
- Constants.FACEBOOK_PERMISSIONS);
- lm.registerCallback(mFacebookCallbackManager, new FBCallback(SocialAuthDialogFragment.this));
- trackStatsIfArgsExist(Statistics.EventName.AUTH_START);
- };
@SuppressWarnings("NullableProblems")
@NonNull
private CheckBox mPrivacyPolicyCheck;
@@ -140,20 +125,19 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
View view = inflater.inflate(R.layout.fragment_auth_passport_dialog, container, false);
setLoginButton(view, R.id.google_button, mGoogleClickListener);
- setLoginButton(view, R.id.facebook_button, mFacebookClickListener);
setLoginButton(view, R.id.phone_button, mPhoneClickListener);
mPromoCheck = view.findViewById(R.id.newsCheck);
mPrivacyPolicyCheck = view.findViewById(R.id.privacyPolicyCheck);
mPrivacyPolicyCheck.setOnCheckedChangeListener((buttonView, isChecked) -> {
setButtonAvailability(view, isChecked && mTermOfUseCheck.isChecked(),
- R.id.google_button, R.id.facebook_button, R.id.phone_button);
+ R.id.google_button, R.id.phone_button);
});
mTermOfUseCheck = view.findViewById(R.id.termOfUseCheck);
mTermOfUseCheck.setOnCheckedChangeListener((buttonView, isChecked) -> {
setButtonAvailability(view, isChecked && mPrivacyPolicyCheck.isChecked(),
- R.id.google_button, R.id.facebook_button, R.id.phone_button);
+ R.id.google_button, R.id.phone_button);
});
UiUtils.linkifyView(view, R.id.privacyPolicyLink, R.string.sign_agree_pp_gdpr,
@@ -162,8 +146,7 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
UiUtils.linkifyView(view, R.id.termOfUseLink, R.string.sign_agree_tof_gdpr,
Framework.nativeGetTermsOfUseLink());
- setButtonAvailability(view, false, R.id.google_button, R.id.facebook_button,
- R.id.phone_button);
+ setButtonAvailability(view, false, R.id.google_button, R.id.phone_button);
trackStatsIfArgsExist(Statistics.EventName.AUTH_SHOWN);
return view;
@@ -214,7 +197,6 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
public void onActivityResult(int requestCode, int resultCode, Intent data)
{
super.onActivityResult(requestCode, resultCode, data);
- mFacebookCallbackManager.onActivityResult(requestCode, resultCode, data);
if (resultCode != Activity.RESULT_OK || data == null)
return;
@@ -262,47 +244,4 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
super.onDismiss(dialog);
}
- private static class FBCallback implements FacebookCallback
- {
- @NonNull
- private final WeakReference mFragmentRef;
-
- private FBCallback(@NonNull SocialAuthDialogFragment fragment)
- {
- mFragmentRef = new WeakReference<>(fragment);
- }
-
- @Override
- public void onSuccess(LoginResult loginResult)
- {
- Statistics.INSTANCE.trackUGCExternalAuthSucceed(Statistics.ParamValue.FACEBOOK);
- LOGGER.d(TAG, "onSuccess");
- }
-
- @Override
- public void onCancel()
- {
- LOGGER.w(TAG, "onCancel");
- sendEmptyResult(Activity.RESULT_CANCELED, Framework.SOCIAL_TOKEN_FACEBOOK,
- null, true);
- }
-
- @Override
- public void onError(FacebookException error)
- {
- LOGGER.e(TAG, "onError", error);
- sendEmptyResult(Activity.RESULT_CANCELED, Framework.SOCIAL_TOKEN_FACEBOOK,
- error != null ? error.getMessage() : null, false);
- }
-
- private void sendEmptyResult(int resultCode, @Framework.AuthTokenType int type,
- @Nullable String error, boolean isCancel)
- {
- SocialAuthDialogFragment fragment = mFragmentRef.get();
- if (fragment == null)
- return;
-
- fragment.sendResult(resultCode, null, type, error, isCancel);
- }
- }
}
diff --git a/android/src/com/mapswithme/maps/editor/OsmOAuth.java b/android/src/com/mapswithme/maps/editor/OsmOAuth.java
index bab859f83c..cc4da55723 100644
--- a/android/src/com/mapswithme/maps/editor/OsmOAuth.java
+++ b/android/src/com/mapswithme/maps/editor/OsmOAuth.java
@@ -20,7 +20,6 @@ public final class OsmOAuth
public enum AuthType
{
OSM("OSM"),
- FACEBOOK("Facebook"),
GOOGLE("Google");
public final String name;
@@ -139,13 +138,6 @@ public final class OsmOAuth
@Nullable
public static native String[] nativeAuthWithWebviewToken(String key, String secret, String verifier);
- /**
- * @return url for web auth, and token with secret for finishing authorization later
- */
- @Size(3)
- @Nullable
- public static native String[] nativeGetFacebookAuthUrl();
-
/**
* @return url for web auth, and token with secret for finishing authorization later
*/
diff --git a/android/src/com/mapswithme/maps/widget/placepage/NativeAdWrapper.java b/android/src/com/mapswithme/maps/widget/placepage/NativeAdWrapper.java
index c23cc5cbc3..f3ea06e437 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/NativeAdWrapper.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/NativeAdWrapper.java
@@ -19,7 +19,6 @@ public class NativeAdWrapper implements MwmNativeAd
{
{
put(NetworkType.MOPUB, UiType.DEFAULT);
- put(NetworkType.FACEBOOK, UiType.DEFAULT);
put(NetworkType.MYTARGET, UiType.DEFAULT);
}
};
diff --git a/android/src/com/mapswithme/util/sharing/ViralEditorShareable.java b/android/src/com/mapswithme/util/sharing/ViralEditorShareable.java
index ae96392f27..5a2d553086 100644
--- a/android/src/com/mapswithme/util/sharing/ViralEditorShareable.java
+++ b/android/src/com/mapswithme/util/sharing/ViralEditorShareable.java
@@ -6,16 +6,10 @@ import android.net.Uri;
import androidx.annotation.DrawableRes;
import androidx.annotation.Nullable;
-import java.util.Locale;
-
-import com.facebook.FacebookSdk;
-import com.facebook.share.model.ShareLinkContent;
-import com.facebook.share.widget.ShareDialog;
import com.mapswithme.util.UiUtils;
public class ViralEditorShareable extends BaseShareable
{
- private static final String FACEBOOK_SHARE_URL = "https://omaps.app/fb-editor-v1?lang=" + Locale.getDefault().getLanguage();
private static final String VIRAL_TAIL = " https://omaps.app/im_get";
private final Uri mUri;
@@ -45,12 +39,6 @@ public class ViralEditorShareable extends BaseShareable
Intent intent = getTargetIntent(target);
String lowerCaseName = target.activityName.toLowerCase();
- if (lowerCaseName.contains("facebook"))
- {
- shareFacebook();
- return;
- }
-
setText(mText + VIRAL_TAIL);
if (lowerCaseName.contains("sms") || lowerCaseName.contains("mms"))
@@ -67,18 +55,4 @@ public class ViralEditorShareable extends BaseShareable
super.share(target);
}
-
- private void shareFacebook()
- {
- FacebookSdk.sdkInitialize(getActivity());
- ShareDialog shareDialog = new ShareDialog(getActivity());
- if (ShareDialog.canShow(ShareLinkContent.class))
- {
- ShareLinkContent linkContent = new ShareLinkContent.Builder()
- .setContentUrl(Uri.parse(FACEBOOK_SHARE_URL))
- .build();
-
- shareDialog.show(linkContent);
- }
- }
}
diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java
index c7778a0926..d4f3062546 100644
--- a/android/src/com/mapswithme/util/statistics/Statistics.java
+++ b/android/src/com/mapswithme/util/statistics/Statistics.java
@@ -12,11 +12,8 @@ import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.billingclient.api.BillingClient;
-import com.facebook.ads.AdError;
-import com.facebook.appevents.AppEventsLogger;
import com.mapswithme.maps.BuildConfig;
import com.mapswithme.maps.Framework;
-import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.PrivateVariables;
import com.mapswithme.maps.ads.MwmNativeAd;
import com.mapswithme.maps.ads.NativeAdError;
@@ -35,7 +32,6 @@ import com.mapswithme.maps.purchase.ValidationStatus;
import com.mapswithme.maps.routing.RoutePointInfo;
import com.mapswithme.maps.routing.RoutingOptions;
import com.mapswithme.maps.settings.RoadType;
-import com.mapswithme.maps.taxi.TaxiInfoError;
import com.mapswithme.maps.taxi.TaxiManager;
import com.mapswithme.maps.taxi.TaxiType;
import com.mapswithme.maps.widget.menu.MainMenu;
@@ -90,10 +86,8 @@ import static com.mapswithme.util.statistics.Statistics.EventName.INAPP_PURCHASE
import static com.mapswithme.util.statistics.Statistics.EventName.INAPP_PURCHASE_PRODUCT_DELIVERED;
import static com.mapswithme.util.statistics.Statistics.EventName.INAPP_PURCHASE_STORE_ERROR;
import static com.mapswithme.util.statistics.Statistics.EventName.INAPP_PURCHASE_VALIDATION_ERROR;
-import static com.mapswithme.util.statistics.Statistics.EventName.PP_BANNER_BLANK;
import static com.mapswithme.util.statistics.Statistics.EventName.PP_BANNER_CLOSE;
import static com.mapswithme.util.statistics.Statistics.EventName.PP_BANNER_ERROR;
-import static com.mapswithme.util.statistics.Statistics.EventName.PP_BANNER_SHOW;
import static com.mapswithme.util.statistics.Statistics.EventName.PP_OWNERSHIP_BUTTON_CLICK;
import static com.mapswithme.util.statistics.Statistics.EventName.PP_SPONSORED_BOOK;
import static com.mapswithme.util.statistics.Statistics.EventName.PP_SPONSORED_ERROR;
@@ -166,7 +160,6 @@ import static com.mapswithme.util.statistics.Statistics.ParamValue.BACKUP;
import static com.mapswithme.util.statistics.Statistics.ParamValue.BICYCLE;
import static com.mapswithme.util.statistics.Statistics.ParamValue.BOOKING_COM;
import static com.mapswithme.util.statistics.Statistics.ParamValue.DISK_NO_SPACE;
-import static com.mapswithme.util.statistics.Statistics.ParamValue.FACEBOOK;
import static com.mapswithme.util.statistics.Statistics.ParamValue.FALSE;
import static com.mapswithme.util.statistics.Statistics.ParamValue.GOOGLE;
import static com.mapswithme.util.statistics.Statistics.ParamValue.HOLIDAY;
@@ -499,7 +492,6 @@ public enum Statistics implements Initializable
static final String PP_SPONSORED_USER_ITEM = "Placepage_SponsoredGallery_UsersItem_shown";
static final String PP_BANNER_SHOW = "Placepage_Banner_show";
static final String PP_BANNER_ERROR = "Placepage_Banner_error";
- static final String PP_BANNER_BLANK = "Placepage_Banner_blank";
static final String PP_BANNER_CLOSE = "Placepage_Banner_close";
static final String PP_OWNERSHIP_BUTTON_CLICK = "Placepage_OwnershipButton_click";
@@ -514,8 +506,6 @@ public enum Statistics implements Initializable
// dialogs
public static final String RATE_DIALOG_LATER = "GPlay dialog cancelled.";
- public static final String FACEBOOK_INVITE_LATER = "Facebook invites dialog cancelled.";
- public static final String FACEBOOK_INVITE_INVITED = "Facebook invites dialog accepted.";
static final String RATE_DIALOG_RATED = "GPlay dialog. Rating set";
// misc
@@ -680,7 +670,6 @@ public enum Statistics implements Initializable
public static final String IS_SUCCESS = "is_success_message";
public static final String ERR_MSG = "error_message";
public static final String OSM = "OSM";
- public static final String FACEBOOK = "Facebook";
public static final String PROVIDER = "provider";
public static final String HOTEL = "hotel";
public static final String ERROR = "error";
@@ -793,7 +782,6 @@ public enum Statistics implements Initializable
public static final String NEXT = "next";
public static final String NO_PRODUCTS = "no_products";
public static final String EDIT = "edit";
- public static final String FACEBOOK = "facebook";
public static final String CHECKIN = "check_in";
public static final String CHECKOUT = "check_out";
public static final String ANY = "any";
@@ -993,7 +981,6 @@ public enum Statistics implements Initializable
{
if (mEnabled)
{
- AppEventsLogger.activateApp(activity.getApplication());
org.alohalytics.Statistics.onStart(activity);
}
@@ -1223,15 +1210,13 @@ public enum Statistics implements Initializable
public void trackPPBannerError(@NonNull String bannerId, @NonNull String provider,
@Nullable NativeAdError error, int state)
{
- boolean isAdBlank = error != null && error.getCode() == AdError.NO_FILL_ERROR_CODE;
- String eventName = isAdBlank ? PP_BANNER_BLANK : PP_BANNER_ERROR;
Statistics.ParameterBuilder builder = Statistics.params();
builder.add(BANNER, !TextUtils.isEmpty(bannerId) ? bannerId : "N/A")
.add(ERROR_CODE, error != null ? String.valueOf(error.getCode()) : "N/A")
.add(ERROR_MESSAGE, error != null ? error.getMessage() : "N/A")
.add(PROVIDER, provider)
.add(STATE, String.valueOf(state));
- trackEvent(eventName, builder.get());
+ trackEvent(PP_BANNER_ERROR, builder.get());
}
public void trackBookingSearchEvent(@NonNull MapObject mapObject)
@@ -1616,8 +1601,6 @@ public enum Statistics implements Initializable
{
switch (type)
{
- case Framework.SOCIAL_TOKEN_FACEBOOK:
- return FACEBOOK;
case Framework.SOCIAL_TOKEN_GOOGLE:
return GOOGLE;
case Framework.SOCIAL_TOKEN_PHONE: