diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java index 4e479d3219..ddb7cb1c8f 100644 --- a/android/src/com/mapswithme/maps/MWMActivity.java +++ b/android/src/com/mapswithme/maps/MWMActivity.java @@ -580,7 +580,7 @@ public class MWMActivity extends NvEventQueueActivity { MWMApplication.get().submitDialogResult(MWMApplication.BUYPRO, MWMApplication.OK); dlg.dismiss(); - UiUtils.runProMarketActivity(MWMActivity.this); + UiUtils.openAppInMarket(MWMActivity.this, BuildConfig.PRO_URL); } } ); @@ -1365,7 +1365,7 @@ public class MWMActivity extends NvEventQueueActivity { case R.id.btn_buy_pro: setVerticalToolbarVisible(false); - UiUtils.runProMarketActivity(MWMActivity.this); + UiUtils.openAppInMarket(MWMActivity.this, BuildConfig.PRO_URL); break; case R.id.btn_share: setVerticalToolbarVisible(false); diff --git a/android/src/com/mapswithme/maps/settings/SettingsActivity.java b/android/src/com/mapswithme/maps/settings/SettingsActivity.java index 1f144664f4..84a20fdcbe 100644 --- a/android/src/com/mapswithme/maps/settings/SettingsActivity.java +++ b/android/src/com/mapswithme/maps/settings/SettingsActivity.java @@ -299,7 +299,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference if (key.equals(getString(R.string.pref_rate_app))) { Statistics.INSTANCE.trackSimpleNamedEvent(Statistics.EventName.SETTINGS_RATE); - UiUtils.runLiteOrProActivity(this); + UiUtils.openAppInMarket(this, BuildConfig.REVIEW_URL); } else if (key.equals(getString(R.string.pref_contact))) { diff --git a/android/src/com/mapswithme/util/Constants.java b/android/src/com/mapswithme/util/Constants.java index e4c5c3d56d..63c342a54d 100644 --- a/android/src/com/mapswithme/util/Constants.java +++ b/android/src/com/mapswithme/util/Constants.java @@ -14,7 +14,6 @@ public class Constants public static final String HTTP_GE0_PREFIX = "http://ge0.me/"; public static final String PLAY_MARKET_APP_PREFIX = "market://details?id="; - public static final String PLAY_MARKET_HTTP_APP_PREFIX = "http://play.google.com/store/apps/details?id="; public static final String GEOLOCATION_SERVER_MAPSME = "http://geolocation.server/"; public static final String FB_MAPSME_COMMUNITY_HTTP = "http://www.facebook.com/MapsWithMe"; diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java index 8ac9e021be..72ae07f42e 100644 --- a/android/src/com/mapswithme/util/UiUtils.java +++ b/android/src/com/mapswithme/util/UiUtils.java @@ -257,7 +257,7 @@ public final class UiUtils public void onClick(DialogInterface dlg, int which) { dlg.dismiss(); - runProMarketActivity(activity); + openAppInMarket(activity, BuildConfig.PRO_URL); } }). setNegativeButton(activity.getString(R.string.cancel), new DialogInterface.OnClickListener() @@ -272,44 +272,17 @@ public final class UiUtils .show(); } - public static void runProMarketActivity(Activity activity) + public static void openAppInMarket(Activity activity, String marketUrl) { try { - activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(BuildConfig.PRO_URL))); + activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(marketUrl))); } catch (final Exception e) { e.printStackTrace(); } } - public static void runLiteOrProActivity(Activity activity) - { - if (BuildConfig.IS_PRO) - runProMarketActivity(activity); - else - runLiteActivity(activity); - } - - private static void runLiteActivity(Activity activity) - { - try - { - activity.startActivity(new Intent(Intent.ACTION_VIEW, - Uri.parse(Constants.Url.PLAY_MARKET_APP_PREFIX + Constants.Package.MWM_LITE_PACKAGE))); - } catch (final Exception e1) - { - try - { - activity.startActivity(new Intent(Intent.ACTION_VIEW, - Uri.parse(Constants.Url.PLAY_MARKET_HTTP_APP_PREFIX + Constants.Package.MWM_LITE_PACKAGE))); - } catch (final Exception e2) - { - e2.printStackTrace(); - } - } - } - public static void showFacebookPage(Activity activity) { try