Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Yunitsky <yunik@mapswithme.com>2015-09-02 18:22:36 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 03:03:45 +0300
commitba2ff2fb90844cd72f5f6b7ce9b173990d7bca65 (patch)
tree4d2a5edbf3495b6d935531624c1b4641364a4873 /android
parentdd241c47c511a311f8bee367b4a2d1eab0f0ce4c (diff)
[android] Removed pedestrian notifications and dialogs.
Diffstat (limited to 'android')
-rw-r--r--android/res/drawable-hdpi/ic_img_achive_pedestrian_phone.pngbin31824 -> 0 bytes
-rw-r--r--android/res/drawable-hdpi/ic_img_achive_pedestrian_tablet.pngbin50887 -> 0 bytes
-rw-r--r--android/res/drawable-hdpi/ic_img_pedestrian_phone.pngbin4183 -> 0 bytes
-rw-r--r--android/res/drawable-hdpi/ic_img_pedestrian_teblet.pngbin7384 -> 0 bytes
-rw-r--r--android/res/drawable-mdpi/ic_img_achive_pedestrian_phone.pngbin4007 -> 0 bytes
-rw-r--r--android/res/drawable-mdpi/ic_img_achive_pedestrian_tablet.pngbin6017 -> 0 bytes
-rw-r--r--android/res/drawable-mdpi/ic_img_pedestrian_phone.pngbin3038 -> 0 bytes
-rw-r--r--android/res/drawable-mdpi/ic_img_pedestrian_teblet.pngbin4510 -> 0 bytes
-rw-r--r--android/res/drawable-xhdpi/ic_img_achive_pedestrian_phone.pngbin7911 -> 0 bytes
-rw-r--r--android/res/drawable-xhdpi/ic_img_achive_pedestrian_tablet.pngbin13580 -> 0 bytes
-rw-r--r--android/res/drawable-xhdpi/ic_img_pedestrian_phone.pngbin6231 -> 0 bytes
-rw-r--r--android/res/drawable-xhdpi/ic_img_pedestrian_teblet.pngbin8712 -> 0 bytes
-rw-r--r--android/res/drawable-xxhdpi/ic_img_achive_pedestrian_phone.pngbin18915 -> 0 bytes
-rw-r--r--android/res/drawable-xxhdpi/ic_img_achive_pedestrian_tablet.pngbin20580 -> 0 bytes
-rw-r--r--android/res/drawable-xxhdpi/ic_img_pedestrian_phone.pngbin9671 -> 0 bytes
-rw-r--r--android/res/drawable-xxhdpi/ic_img_pedestrian_teblet.pngbin13327 -> 0 bytes
-rw-r--r--android/res/drawable-xxxhdpi/ic_img_achive_pedestrian_phone.pngbin16771 -> 0 bytes
-rw-r--r--android/res/drawable-xxxhdpi/ic_img_achive_pedestrian_tablet.pngbin27132 -> 0 bytes
-rw-r--r--android/res/drawable-xxxhdpi/ic_img_pedestrian_phone.pngbin12071 -> 0 bytes
-rw-r--r--android/res/drawable-xxxhdpi/ic_img_pedestrian_teblet.pngbin21562 -> 0 bytes
-rw-r--r--android/res/layout/fragment_pedestrian_dialog.xml33
-rw-r--r--android/src/com/mapswithme/maps/MwmActivity.java5
-rw-r--r--android/src/com/mapswithme/maps/ads/BasePedestrianDialogFragment.java58
-rw-r--r--android/src/com/mapswithme/maps/ads/LikesManager.java28
-rw-r--r--android/src/com/mapswithme/maps/ads/PedestrianFirstUseDialogFragment.java27
-rw-r--r--android/src/com/mapswithme/maps/ads/PedestrianMasterDialogFragment.java27
-rw-r--r--android/src/com/mapswithme/maps/background/Notifier.java12
-rw-r--r--android/src/com/mapswithme/maps/background/UpgradeReceiver.java1
-rw-r--r--android/src/com/mapswithme/maps/background/UpgradeReceiverCompat.java3
-rw-r--r--android/src/com/mapswithme/maps/background/WorkerService.java65
-rw-r--r--android/src/com/mapswithme/util/sharing/PedestrianShareable.java62
-rw-r--r--android/src/com/mapswithme/util/sharing/ShareOption.java14
-rw-r--r--android/src/com/mapswithme/util/statistics/Statistics.java2
33 files changed, 5 insertions, 332 deletions
diff --git a/android/res/drawable-hdpi/ic_img_achive_pedestrian_phone.png b/android/res/drawable-hdpi/ic_img_achive_pedestrian_phone.png
deleted file mode 100644
index eed9f626cc..0000000000
--- a/android/res/drawable-hdpi/ic_img_achive_pedestrian_phone.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-hdpi/ic_img_achive_pedestrian_tablet.png b/android/res/drawable-hdpi/ic_img_achive_pedestrian_tablet.png
deleted file mode 100644
index 3546969e7f..0000000000
--- a/android/res/drawable-hdpi/ic_img_achive_pedestrian_tablet.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-hdpi/ic_img_pedestrian_phone.png b/android/res/drawable-hdpi/ic_img_pedestrian_phone.png
deleted file mode 100644
index 773af16a99..0000000000
--- a/android/res/drawable-hdpi/ic_img_pedestrian_phone.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-hdpi/ic_img_pedestrian_teblet.png b/android/res/drawable-hdpi/ic_img_pedestrian_teblet.png
deleted file mode 100644
index c8b62d9046..0000000000
--- a/android/res/drawable-hdpi/ic_img_pedestrian_teblet.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-mdpi/ic_img_achive_pedestrian_phone.png b/android/res/drawable-mdpi/ic_img_achive_pedestrian_phone.png
deleted file mode 100644
index b01ff128ec..0000000000
--- a/android/res/drawable-mdpi/ic_img_achive_pedestrian_phone.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-mdpi/ic_img_achive_pedestrian_tablet.png b/android/res/drawable-mdpi/ic_img_achive_pedestrian_tablet.png
deleted file mode 100644
index f18a2fad13..0000000000
--- a/android/res/drawable-mdpi/ic_img_achive_pedestrian_tablet.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-mdpi/ic_img_pedestrian_phone.png b/android/res/drawable-mdpi/ic_img_pedestrian_phone.png
deleted file mode 100644
index 579ee63507..0000000000
--- a/android/res/drawable-mdpi/ic_img_pedestrian_phone.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-mdpi/ic_img_pedestrian_teblet.png b/android/res/drawable-mdpi/ic_img_pedestrian_teblet.png
deleted file mode 100644
index 97bd205a8f..0000000000
--- a/android/res/drawable-mdpi/ic_img_pedestrian_teblet.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-xhdpi/ic_img_achive_pedestrian_phone.png b/android/res/drawable-xhdpi/ic_img_achive_pedestrian_phone.png
deleted file mode 100644
index 877753be31..0000000000
--- a/android/res/drawable-xhdpi/ic_img_achive_pedestrian_phone.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-xhdpi/ic_img_achive_pedestrian_tablet.png b/android/res/drawable-xhdpi/ic_img_achive_pedestrian_tablet.png
deleted file mode 100644
index cceccf5dc4..0000000000
--- a/android/res/drawable-xhdpi/ic_img_achive_pedestrian_tablet.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-xhdpi/ic_img_pedestrian_phone.png b/android/res/drawable-xhdpi/ic_img_pedestrian_phone.png
deleted file mode 100644
index 5146aaee81..0000000000
--- a/android/res/drawable-xhdpi/ic_img_pedestrian_phone.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-xhdpi/ic_img_pedestrian_teblet.png b/android/res/drawable-xhdpi/ic_img_pedestrian_teblet.png
deleted file mode 100644
index 8e3350f0c7..0000000000
--- a/android/res/drawable-xhdpi/ic_img_pedestrian_teblet.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-xxhdpi/ic_img_achive_pedestrian_phone.png b/android/res/drawable-xxhdpi/ic_img_achive_pedestrian_phone.png
deleted file mode 100644
index c9477dd2aa..0000000000
--- a/android/res/drawable-xxhdpi/ic_img_achive_pedestrian_phone.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-xxhdpi/ic_img_achive_pedestrian_tablet.png b/android/res/drawable-xxhdpi/ic_img_achive_pedestrian_tablet.png
deleted file mode 100644
index 55a8d6bcf3..0000000000
--- a/android/res/drawable-xxhdpi/ic_img_achive_pedestrian_tablet.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-xxhdpi/ic_img_pedestrian_phone.png b/android/res/drawable-xxhdpi/ic_img_pedestrian_phone.png
deleted file mode 100644
index aae9477a8f..0000000000
--- a/android/res/drawable-xxhdpi/ic_img_pedestrian_phone.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-xxhdpi/ic_img_pedestrian_teblet.png b/android/res/drawable-xxhdpi/ic_img_pedestrian_teblet.png
deleted file mode 100644
index 42f9b572df..0000000000
--- a/android/res/drawable-xxhdpi/ic_img_pedestrian_teblet.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-xxxhdpi/ic_img_achive_pedestrian_phone.png b/android/res/drawable-xxxhdpi/ic_img_achive_pedestrian_phone.png
deleted file mode 100644
index a8dcf606a0..0000000000
--- a/android/res/drawable-xxxhdpi/ic_img_achive_pedestrian_phone.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-xxxhdpi/ic_img_achive_pedestrian_tablet.png b/android/res/drawable-xxxhdpi/ic_img_achive_pedestrian_tablet.png
deleted file mode 100644
index bdf88bc8c1..0000000000
--- a/android/res/drawable-xxxhdpi/ic_img_achive_pedestrian_tablet.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-xxxhdpi/ic_img_pedestrian_phone.png b/android/res/drawable-xxxhdpi/ic_img_pedestrian_phone.png
deleted file mode 100644
index ab6d3b51ba..0000000000
--- a/android/res/drawable-xxxhdpi/ic_img_pedestrian_phone.png
+++ /dev/null
Binary files differ
diff --git a/android/res/drawable-xxxhdpi/ic_img_pedestrian_teblet.png b/android/res/drawable-xxxhdpi/ic_img_pedestrian_teblet.png
deleted file mode 100644
index 971bfbd43f..0000000000
--- a/android/res/drawable-xxxhdpi/ic_img_pedestrian_teblet.png
+++ /dev/null
Binary files differ
diff --git a/android/res/layout/fragment_pedestrian_dialog.xml b/android/res/layout/fragment_pedestrian_dialog.xml
deleted file mode 100644
index 76c3e7483d..0000000000
--- a/android/res/layout/fragment_pedestrian_dialog.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="@dimen/margin_base_plus">
-
- <TextView
- android:id="@+id/tv__title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/title_walking_available"
- android:textAppearance="@style/MwmTextAppearance.Title"
- android:textStyle="bold"/>
-
- <ImageView
- android:id="@+id/iv__image"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="@dimen/margin_half_plus"
- android:contentDescription="@null"
- android:src="@drawable/ic_img_pedestrian_phone"/>
-
- <TextView
- android:id="@+id/tv__text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/margin_half_plus"
- android:text="@string/share_walking_routes_mastering"
- android:textAppearance="@style/MwmTextAppearance.Body2"/>
-
-</LinearLayout> \ No newline at end of file
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 4b47013309..e33b7a09dc 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -1348,12 +1348,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
public void run()
{
if (resultCode == RoutingResultCodesProcessor.NO_ERROR)
- {
- if (Framework.getRouter() == Framework.ROUTER_TYPE_PEDESTRIAN)
- LikesManager.INSTANCE.onPedestrianBuilt();
-
mLayoutRouting.setState(RoutingLayout.State.ROUTE_BUILT, true);
- }
else
{
mLayoutRouting.setState(RoutingLayout.State.ROUTE_BUILD_ERROR, true);
diff --git a/android/src/com/mapswithme/maps/ads/BasePedestrianDialogFragment.java b/android/src/com/mapswithme/maps/ads/BasePedestrianDialogFragment.java
deleted file mode 100644
index d2d9f108cb..0000000000
--- a/android/src/com/mapswithme/maps/ads/BasePedestrianDialogFragment.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mapswithme.maps.ads;
-
-import android.annotation.SuppressLint;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.mapswithme.maps.R;
-import com.mapswithme.maps.base.BaseMwmDialogFragment;
-import com.mapswithme.util.sharing.ShareOption;
-import com.mapswithme.util.statistics.Statistics;
-
-public abstract class BasePedestrianDialogFragment extends BaseMwmDialogFragment
-{
- abstract View buildView(LayoutInflater inflater);
-
- @NonNull
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState)
- {
- final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
- final LayoutInflater inflater = getActivity().getLayoutInflater();
-
- @SuppressLint("InflateParams") final View root = buildView(inflater);
- return builder.
- setView(root).
- setNegativeButton(R.string.dialog_routing_not_now, new DialogInterface.OnClickListener()
- {
- @Override
- public void onClick(DialogInterface dialog, int which)
- {
- LikesManager.setRatingApplied(BasePedestrianDialogFragment.this.getClass(), true);
- Statistics.INSTANCE.trackSimpleNamedEvent(Statistics.EventName.FACEBOOK_PEDESTRIAN_CANCEL);
- }
- }).
- setPositiveButton(R.string.share, new DialogInterface.OnClickListener()
- {
- @Override
- public void onClick(DialogInterface dialog, int which)
- {
- LikesManager.setRatingApplied(BasePedestrianDialogFragment.this.getClass(), true);
- ShareOption.PEDESTRIAN.share(getActivity());
- Statistics.INSTANCE.trackSimpleNamedEvent(Statistics.EventName.FACEBOOK_PEDESTRIAN_SHARE);
- }
- }).create();
- }
-
- @Override
- public void onCancel(DialogInterface dialog)
- {
- super.onCancel(dialog);
- Statistics.INSTANCE.trackSimpleNamedEvent(Statistics.EventName.FACEBOOK_PEDESTRIAN_CANCEL);
- }
-}
diff --git a/android/src/com/mapswithme/maps/ads/LikesManager.java b/android/src/com/mapswithme/maps/ads/LikesManager.java
index 5de6f8d0fc..2219e97cce 100644
--- a/android/src/com/mapswithme/maps/ads/LikesManager.java
+++ b/android/src/com/mapswithme/maps/ads/LikesManager.java
@@ -17,10 +17,8 @@ public enum LikesManager
public static final String LAST_RATED_SESSION = "LastRatedSession";
public static final String RATED_DIALOG = "RatedDialog";
- public static final String PEDESTRIAN_COUNT = "PedestrianCount";
private static final int DIALOG_DELAY_DEFAULT = 30000;
- private static final int DIALOG_DELAY_SHORT = 5000;
private static final int SESSION_NUM = MwmApplication.get().getSessionsNumber();
/*
@@ -33,9 +31,7 @@ public enum LikesManager
GPLUS_NEW_USERS(GooglePlusDialogFragment.class, DIALOG_DELAY_DEFAULT),
GPLUS_OLD_USERS(GooglePlusDialogFragment.class, DIALOG_DELAY_DEFAULT),
FACEBOOK_INVITE_NEW_USERS(FacebookInvitesDialogFragment.class, DIALOG_DELAY_DEFAULT),
- FACEBOOK_INVITES_OLD_USERS(FacebookInvitesDialogFragment.class, DIALOG_DELAY_DEFAULT),
- FACEBOOK_PEDESTRIAN_FIRST_OLD_USERS(PedestrianFirstUseDialogFragment.class, DIALOG_DELAY_SHORT),
- FACEBOOK_PEDESTRIAN_MASTER_OLD_USERS(PedestrianMasterDialogFragment.class, DIALOG_DELAY_SHORT);
+ FACEBOOK_INVITES_OLD_USERS(FacebookInvitesDialogFragment.class, DIALOG_DELAY_DEFAULT);
public final Class<? extends DialogFragment> clazz;
public final int delay;
@@ -55,15 +51,14 @@ public enum LikesManager
static
{
- sOldUsersMapping.put(1, LikeType.FACEBOOK_PEDESTRIAN_FIRST_OLD_USERS);
- sOldUsersMapping.put(4, LikeType.GPLAY_OLD_USERS);
- // sOldUsersMapping.put(4, LikeType.GPLUS_OLD_USERS);
+ sOldUsersMapping.put(1, LikeType.GPLAY_OLD_USERS);
+ sOldUsersMapping.put(4, LikeType.GPLUS_OLD_USERS);
sOldUsersMapping.put(6, LikeType.FACEBOOK_INVITES_OLD_USERS);
sOldUsersMapping.put(10, LikeType.GPLAY_OLD_USERS);
sOldUsersMapping.put(21, LikeType.GPLAY_OLD_USERS);
- // sOldUsersMapping.put(24, LikeType.GPLUS_OLD_USERS);
+ sOldUsersMapping.put(24, LikeType.GPLUS_OLD_USERS);
sOldUsersMapping.put(30, LikeType.FACEBOOK_INVITES_OLD_USERS);
- // sOldUsersMapping.put(44, LikeType.GPLUS_OLD_USERS);
+ sOldUsersMapping.put(44, LikeType.GPLUS_OLD_USERS);
sOldUsersMapping.put(50, LikeType.FACEBOOK_INVITES_OLD_USERS);
sNewUsersMapping.put(3, LikeType.GPLAY_NEW_USERS);
@@ -75,12 +70,6 @@ public enum LikesManager
sNewUsersMapping.put(35, LikeType.FACEBOOK_INVITE_NEW_USERS);
sNewUsersMapping.put(50, LikeType.GPLUS_NEW_USERS);
sNewUsersMapping.put(55, LikeType.FACEBOOK_INVITE_NEW_USERS);
-
- if (MwmApplication.get().nativeGetInt(PEDESTRIAN_COUNT, 0) >= 3 && !isRatingApplied(PedestrianMasterDialogFragment.class))
- {
- sOldUsersMapping.put(SESSION_NUM, LikeType.FACEBOOK_PEDESTRIAN_MASTER_OLD_USERS);
- sNewUsersMapping.put(SESSION_NUM, LikeType.FACEBOOK_PEDESTRIAN_MASTER_OLD_USERS);
- }
}
private final boolean mIsNewUser = MwmApplication.get().getFirstInstallVersion() == BuildConfig.VERSION_CODE;
@@ -105,13 +94,6 @@ public enum LikesManager
UiThread.cancelDelayedTasks(mLikeRunnable);
}
- public void onPedestrianBuilt()
- {
- final MwmApplication APP = MwmApplication.get();
-
- APP.nativeSetInt(PEDESTRIAN_COUNT, APP.nativeGetInt(PEDESTRIAN_COUNT, 0) + 1);
- }
-
private void displayLikeDialog(final Class<? extends DialogFragment> dialogFragmentClass, final int delayMillis)
{
if (isSessionRated(SESSION_NUM) || isRatingApplied(dialogFragmentClass))
diff --git a/android/src/com/mapswithme/maps/ads/PedestrianFirstUseDialogFragment.java b/android/src/com/mapswithme/maps/ads/PedestrianFirstUseDialogFragment.java
deleted file mode 100644
index d9a2a166d2..0000000000
--- a/android/src/com/mapswithme/maps/ads/PedestrianFirstUseDialogFragment.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mapswithme.maps.ads;
-
-import android.annotation.SuppressLint;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.mapswithme.maps.R;
-import com.mapswithme.util.UiUtils;
-
-public class PedestrianFirstUseDialogFragment extends BasePedestrianDialogFragment
-{
- protected View buildView(LayoutInflater inflater)
- {
- @SuppressLint("InflateParams") final View root = inflater.inflate(R.layout.fragment_pedestrian_dialog, null);
-
- final ImageView imageView = (ImageView) root.findViewById(R.id.iv__image);
- imageView.setImageResource(UiUtils.isTablet() ? R.drawable.ic_img_pedestrian_teblet : R.drawable.ic_img_pedestrian_phone);
- final TextView title = (TextView) root.findViewById(R.id.tv__title);
- title.setText(R.string.title_walking_available);
- final TextView text = (TextView) root.findViewById(R.id.tv__text);
- text.setText(R.string.share_walking_routes_first_launch);
-
- return root;
- }
-}
diff --git a/android/src/com/mapswithme/maps/ads/PedestrianMasterDialogFragment.java b/android/src/com/mapswithme/maps/ads/PedestrianMasterDialogFragment.java
deleted file mode 100644
index 3151b41fea..0000000000
--- a/android/src/com/mapswithme/maps/ads/PedestrianMasterDialogFragment.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mapswithme.maps.ads;
-
-import android.annotation.SuppressLint;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.mapswithme.maps.R;
-import com.mapswithme.util.UiUtils;
-
-public class PedestrianMasterDialogFragment extends BasePedestrianDialogFragment
-{
- protected View buildView(LayoutInflater inflater)
- {
- @SuppressLint("InflateParams") final View root = inflater.inflate(R.layout.fragment_pedestrian_dialog, null);
-
- final ImageView imageView = (ImageView) root.findViewById(R.id.iv__image);
- imageView.setImageResource(UiUtils.isTablet() ? R.drawable.ic_img_achive_pedestrian_tablet : R.drawable.ic_img_achive_pedestrian_phone);
- final TextView title = (TextView) root.findViewById(R.id.tv__title);
- title.setText(R.string.share_walking_routes_congratulations);
- final TextView text = (TextView) root.findViewById(R.id.tv__text);
- text.setText(R.string.share_walking_routes_mastering);
-
- return root;
- }
-}
diff --git a/android/src/com/mapswithme/maps/background/Notifier.java b/android/src/com/mapswithme/maps/background/Notifier.java
index 3e54f6d006..eb6da41904 100644
--- a/android/src/com/mapswithme/maps/background/Notifier.java
+++ b/android/src/com/mapswithme/maps/background/Notifier.java
@@ -19,7 +19,6 @@ public final class Notifier
private final static int ID_UPDATE_AVAILABLE = 1;
private final static int ID_DOWNLOAD_FAILED = 2;
private final static int ID_DOWNLOAD_NEW_COUNTRY = 3;
- private final static int ID_PEDESTRIAN = 4;
private static final MwmApplication APP = MwmApplication.get();
@@ -63,17 +62,6 @@ public final class Notifier
getNotificationManager().cancel(ID_DOWNLOAD_NEW_COUNTRY);
}
- public static void notifyPedestrianRouting()
- {
- final String title = APP.getString(R.string.title_walking_available);
- final String content = APP.getString(R.string.walking_rich_notification_text);
-
- final PendingIntent pi = PendingIntent.getActivity(APP, 0, new Intent(APP, MwmActivity.class),
- PendingIntent.FLAG_UPDATE_CURRENT);
-
- placeBigNotification(title, content, pi, ID_PEDESTRIAN);
- }
-
private static void placeNotification(String title, String content, PendingIntent pendingIntent, int notificationId)
{
final Notification notification = getBuilder(title, content, pendingIntent)
diff --git a/android/src/com/mapswithme/maps/background/UpgradeReceiver.java b/android/src/com/mapswithme/maps/background/UpgradeReceiver.java
index 7622c2b6e1..03a66e395b 100644
--- a/android/src/com/mapswithme/maps/background/UpgradeReceiver.java
+++ b/android/src/com/mapswithme/maps/background/UpgradeReceiver.java
@@ -12,6 +12,5 @@ public class UpgradeReceiver extends BroadcastReceiver
public void onReceive(Context context, Intent intent)
{
MwmApplication.get().onUpgrade();
- WorkerService.queuePedestrianNotification();
}
}
diff --git a/android/src/com/mapswithme/maps/background/UpgradeReceiverCompat.java b/android/src/com/mapswithme/maps/background/UpgradeReceiverCompat.java
index bb550caf37..ae50a4ce48 100644
--- a/android/src/com/mapswithme/maps/background/UpgradeReceiverCompat.java
+++ b/android/src/com/mapswithme/maps/background/UpgradeReceiverCompat.java
@@ -12,9 +12,6 @@ public class UpgradeReceiverCompat extends BroadcastReceiver
public void onReceive(Context context, Intent intent)
{
if (context.getPackageName().equals(intent.getData().getSchemeSpecificPart()))
- {
MwmApplication.get().onUpgrade();
- WorkerService.queuePedestrianNotification();
- }
}
}
diff --git a/android/src/com/mapswithme/maps/background/WorkerService.java b/android/src/com/mapswithme/maps/background/WorkerService.java
index cc7374faf8..4c2e5c87c3 100644
--- a/android/src/com/mapswithme/maps/background/WorkerService.java
+++ b/android/src/com/mapswithme/maps/background/WorkerService.java
@@ -1,8 +1,6 @@
package com.mapswithme.maps.background;
-import android.app.AlarmManager;
import android.app.IntentService;
-import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -17,15 +15,10 @@ import com.mapswithme.maps.R;
import com.mapswithme.util.LocationUtils;
import com.mapswithme.util.statistics.Statistics;
-import java.util.Calendar;
-
public class WorkerService extends IntentService
{
private static final String ACTION_CHECK_UPDATE = "com.mapswithme.maps.action.update";
private static final String ACTION_DOWNLOAD_COUNTRY = "com.mapswithme.maps.action.download_country";
- private static final String ACTION_NOTIFY_PEDESTRIAN = "com.mapswithme.maps.action.notify_pedestrian";
- private static final String PREF_NOTIFICATION_ALARM = "PedestrianNotificationAlarmSet";
- private static final String PREF_NOTIFICATION_SHOWN = "PedestrianNotificationShown";
private static final MwmApplication APP = MwmApplication.get();
private static final SharedPreferences PREFS = MwmApplication.prefs();
@@ -56,37 +49,6 @@ public class WorkerService extends IntentService
context.startService(intent);
}
- /**
- * Sets alarm to display notification about pedestrian routing available.
- */
- public static void queuePedestrianNotification()
- {
- if (isPedestrianNotificationAlarmSet())
- return;
-
- Calendar time = Calendar.getInstance();
- time.set(Calendar.MINUTE, 30);
- final int hour = 16;
- final int currentHour = time.get(Calendar.HOUR_OF_DAY);
- if (currentHour > hour)
- time.roll(Calendar.DAY_OF_MONTH, 1);
- time.set(Calendar.HOUR_OF_DAY, hour);
-
- final Intent intent = new Intent(APP, WorkerService.class);
- intent.setAction(WorkerService.ACTION_NOTIFY_PEDESTRIAN);
-
- final AlarmManager manager = (AlarmManager) APP.getSystemService(Context.ALARM_SERVICE);
- manager.set(AlarmManager.RTC, time.getTimeInMillis(), PendingIntent.getService(APP, 0, intent, 0));
-
- onPedestrianAlarmSet();
- }
-
- public static void checkLostPedestrianAlarm()
- {
- if (isPedestrianNotificationAlarmSet() && !isPedestrianNotificationShown())
- queuePedestrianNotification();
- }
-
public WorkerService()
{
super("WorkerService");
@@ -102,18 +64,11 @@ public class WorkerService extends IntentService
switch (action)
{
case ACTION_CHECK_UPDATE:
- checkLostPedestrianAlarm();
handleActionCheckUpdate();
break;
case ACTION_DOWNLOAD_COUNTRY:
- checkLostPedestrianAlarm();
handleActionCheckLocation();
break;
- case ACTION_NOTIFY_PEDESTRIAN:
- if (isPedestrianNotificationShown())
- return;
- Notifier.notifyPedestrianRouting();
- onPedestrianNotificationShown();
}
}
}
@@ -191,24 +146,4 @@ public class WorkerService extends IntentService
PREFS.edit().putString(country, String.valueOf(System.currentTimeMillis())).apply();
}
}
-
- private static boolean isPedestrianNotificationAlarmSet()
- {
- return PREFS.getBoolean(PREF_NOTIFICATION_ALARM, false);
- }
-
- private static void onPedestrianAlarmSet()
- {
- PREFS.edit().putBoolean(PREF_NOTIFICATION_ALARM, true).apply();
- }
-
- private static boolean isPedestrianNotificationShown()
- {
- return PREFS.getBoolean(PREF_NOTIFICATION_SHOWN, false);
- }
-
- private static void onPedestrianNotificationShown()
- {
- PREFS.edit().putBoolean(PREF_NOTIFICATION_SHOWN, true).apply();
- }
}
diff --git a/android/src/com/mapswithme/util/sharing/PedestrianShareable.java b/android/src/com/mapswithme/util/sharing/PedestrianShareable.java
deleted file mode 100644
index 9d3c7e9008..0000000000
--- a/android/src/com/mapswithme/util/sharing/PedestrianShareable.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.mapswithme.util.sharing;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-
-import com.facebook.FacebookSdk;
-import com.facebook.share.model.ShareLinkContent;
-import com.facebook.share.widget.ShareDialog;
-import com.mapswithme.maps.R;
-
-import java.util.Locale;
-
-public class PedestrianShareable extends TextShareable
-{
- private static final String FACEBOOK_SHARE_URL = "http://maps.me/fb-pedestrian?lang=" + Locale.getDefault().getLanguage();
-
- public PedestrianShareable(Activity context)
- {
- super(context);
- }
-
- @Override
- public void share(SharingTarget target)
- {
- Activity activity = getActivity();
- Intent intent = getTargetIntent(target);
- String lowerCaseName = target.activityName.toLowerCase();
-
- if (lowerCaseName.contains("facebook"))
- {
- shareFacebook();
- return;
- }
-
- if (lowerCaseName.contains("mail"))
- {
- setSubject(R.string.share_walking_routes_email_subject);
- intent.putExtra(Intent.EXTRA_TEXT, activity.getString(R.string.share_walking_routes_email_body));
- }
- else if (lowerCaseName.contains("sms") || lowerCaseName.contains("mms"))
- TargetUtils.fillSmsIntent(activity, intent, activity.getString(R.string.share_walking_routes_sms));
- else
- setText(R.string.share_walking_routes_messenger);
-
- 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/sharing/ShareOption.java b/android/src/com/mapswithme/util/sharing/ShareOption.java
index b36414c808..f9f089d5f7 100644
--- a/android/src/com/mapswithme/util/sharing/ShareOption.java
+++ b/android/src/com/mapswithme/util/sharing/ShareOption.java
@@ -17,7 +17,6 @@ public abstract class ShareOption
public static final SmsShareOption SMS = new SmsShareOption();
public static final EmailShareOption EMAIL = new EmailShareOption();
public static final AnyShareOption ANY = new AnyShareOption();
- public static final PedestrianShareOption PEDESTRIAN = new PedestrianShareOption();
@StringRes
protected final int mNameResId;
@@ -90,17 +89,4 @@ public abstract class ShareOption
SharingHelper.shareOutside(new TextShareable(activity, body));
}
}
-
- public static class PedestrianShareOption extends ShareOption
- {
- protected PedestrianShareOption()
- {
- super(R.string.title_walking_available, new Intent(Intent.ACTION_SEND).setType(TargetUtils.TYPE_TEXT_PLAIN));
- }
-
- public void share(final Activity activity)
- {
- SharingHelper.shareOutside(new PedestrianShareable(activity));
- }
- }
} \ No newline at end of file
diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java
index 20a8839fc5..b67ca54ac1 100644
--- a/android/src/com/mapswithme/util/statistics/Statistics.java
+++ b/android/src/com/mapswithme/util/statistics/Statistics.java
@@ -68,8 +68,6 @@ public enum Statistics
public static final String FACEBOOK_INVITE_LATER = "Facebook invites dialog cancelled.";
public static final String FACEBOOK_INVITE_INVITED = "GPlay dialog cancelled.";
public static final String RATE_DIALOG_RATED = "GPlay dialog. Rating set";
- public static final String FACEBOOK_PEDESTRIAN_CANCEL = "Facebook pedestrian cancelled.";
- public static final String FACEBOOK_PEDESTRIAN_SHARE = "Facebook pedestrian shared.";
}
public static class EventParam