From 9fb5d76b0c560c4c461aa5776a7bacd7234c34db Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Thu, 22 Jan 2015 16:50:19 +0300 Subject: [PATCH] Removed old dialogs logic. --- .../com/mapswithme/maps/MWMApplication.cpp | 15 --- .../src/com/mapswithme/maps/MWMActivity.java | 112 ------------------ .../com/mapswithme/maps/MWMApplication.java | 19 +-- 3 files changed, 2 insertions(+), 144 deletions(-) diff --git a/android/jni/com/mapswithme/maps/MWMApplication.cpp b/android/jni/com/mapswithme/maps/MWMApplication.cpp index 89892efdbb..13b040c0d1 100644 --- a/android/jni/com/mapswithme/maps/MWMApplication.cpp +++ b/android/jni/com/mapswithme/maps/MWMApplication.cpp @@ -43,21 +43,6 @@ extern "C" return static_cast(g_framework->NativeFramework()->IsBenchmarking()); } - JNIEXPORT jboolean JNICALL - Java_com_mapswithme_maps_MWMApplication_shouldShowDialog( - JNIEnv * env, jobject thiz, jint dlg) - { - return static_cast(dlg_settings::ShouldShow(static_cast(dlg))); - } - - JNIEXPORT void JNICALL - Java_com_mapswithme_maps_MWMApplication_submitDialogResult( - JNIEnv * env, jobject thiz, jint dlg, jint res) - { - dlg_settings::SaveResult(static_cast(dlg), - static_cast(res)); - } - JNIEXPORT jboolean JNICALL Java_com_mapswithme_maps_MWMApplication_nativeGetBoolean(JNIEnv * env, jobject thiz, diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java index 2ab234074c..5000753d03 100644 --- a/android/src/com/mapswithme/maps/MWMActivity.java +++ b/android/src/com/mapswithme/maps/MWMActivity.java @@ -22,7 +22,6 @@ import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.support.v4.content.LocalBroadcastManager; import android.support.v7.widget.Toolbar; -import android.telephony.TelephonyManager; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.TextUtils; @@ -88,9 +87,7 @@ import com.nineoldandroids.view.ViewHelper; import com.nvidia.devtech.NvEventQueueActivity; import java.io.Serializable; -import java.util.Arrays; import java.util.List; -import java.util.Locale; import java.util.Stack; import java.util.concurrent.TimeUnit; @@ -283,7 +280,6 @@ public class MWMActivity extends NvEventQueueActivity checkKitkatMigrationMove(); checkRoutingMaps(); checkLiteMapsInPro(); - checkFacebookDialog(); checkUserMarkActivation(); } }); @@ -498,108 +494,8 @@ public class MWMActivity extends NvEventQueueActivity public void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); - alignControls(); } - private void showDialogImpl(final int dlgID, int resMsg, DialogInterface.OnClickListener okListener) - { - final MWMApplication application = MWMApplication.get(); - new AlertDialog.Builder(this) - .setCancelable(false) - .setMessage(getString(resMsg)) - .setPositiveButton(getString(R.string.ok), okListener) - .setNeutralButton(getString(R.string.never), new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dlg, int which) - { - dlg.dismiss(); - application.submitDialogResult(dlgID, MWMApplication.NEVER); - } - }) - .setNegativeButton(getString(R.string.later), new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dlg, int which) - { - dlg.dismiss(); - application.submitDialogResult(dlgID, MWMApplication.LATER); - // FIXME hack to deal with native & java FACEBOOK dialog views conflict - application.nativeSetInt(MWMApplication.LAUNCH_NUMBER_SETTING, application.nativeGetInt(MWMApplication.LAUNCH_NUMBER_SETTING, 0) + 1); - } - }) - .create() - .show(); - } - - private boolean isChinaISO(String iso) - { - final String arr[] = {"CN", "CHN", "HK", "HKG", "MO", "MAC"}; - for (final String s : arr) - if (iso.equalsIgnoreCase(s)) - return true; - return false; - } - - private boolean isChinaRegion() - { - final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE); - if (tm != null && tm.getPhoneType() != TelephonyManager.PHONE_TYPE_CDMA) - { - final String iso = tm.getNetworkCountryIso(); - Log.i(TAG, "TelephonyManager country ISO = " + iso); - if (isChinaISO(iso)) - return true; - } - else - { - final Location l = LocationHelper.INSTANCE.getLastLocation(); - if (l != null && nativeIsInChina(l.getLatitude(), l.getLongitude())) - return true; - else - { - final String code = Locale.getDefault().getCountry(); - Log.i(TAG, "Locale country ISO = " + code); - if (isChinaISO(code)) - return true; - } - } - - return false; - } - - private void checkFacebookDialog() - { - if (ConnectionState.isConnected() && - // TODO If new dialog display logic will be fine - move it to core and uncomment the following line - // MWMApplication.get().shouldShowDialog(MWMApplication.FACEBOOK) && - Arrays.asList(MWMApplication.FACEBOOK_RATE_LAUNCHES).contains(MWMApplication.get().getLaunchesNumber()) && - MWMApplication.get().nativeGetBoolean("ShouldShowFacebookDialog", true) && - !isChinaRegion()) - mInfoView.postDelayed(mShareFacebookRunnable, 30 * 1000); - } - - private Runnable mShareFacebookRunnable = new Runnable() - { - @Override - public void run() - { - showDialogImpl(MWMApplication.FACEBOOK, R.string.share_on_facebook_text, - new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dlg, int which) - { - MWMApplication.get().submitDialogResult(MWMApplication.FACEBOOK, MWMApplication.OK); - - dlg.dismiss(); - UiUtils.showFacebookPage(MWMActivity.this); - } - } - ); - } - }; - private void showSearch() { if (mIsFragmentContainer) @@ -1040,10 +936,6 @@ public class MWMActivity extends NvEventQueueActivity mRenderingInitialized = false; } - private void alignControls() - { - } - @Override public void onLocationError(int errorCode) { @@ -1243,7 +1135,6 @@ public class MWMActivity extends NvEventQueueActivity stopWatchingCompassStatusUpdate(); super.onPause(); mLocationPredictor.pause(); - mInfoView.removeCallbacks(mShareFacebookRunnable); } @Override @@ -1259,12 +1150,9 @@ public class MWMActivity extends NvEventQueueActivity findViewById(R.id.map_button_plus), findViewById(R.id.map_button_minus)); - alignControls(); - SearchController.getInstance().onResume(); mInfoView.onResume(); tryResumeRouting(); - MWMApplication.get().onMwmResume(this); mLocationPredictor.resume(); } diff --git a/android/src/com/mapswithme/maps/MWMApplication.java b/android/src/com/mapswithme/maps/MWMApplication.java index 1b66b7aa9e..c3772eb764 100644 --- a/android/src/com/mapswithme/maps/MWMApplication.java +++ b/android/src/com/mapswithme/maps/MWMApplication.java @@ -200,7 +200,7 @@ public class MWMApplication extends android.app.Application implements ActiveCou return storagePath.concat(String.format(Constants.OBB_PATH, BuildConfig.APPLICATION_ID)); } - /// Check if we have free space on storage (writable path). + // Check if we have free space on storage (writable path). public native boolean hasFreeSpace(long size); public double getForegroundTime() @@ -225,24 +225,9 @@ public class MWMApplication extends android.app.Application implements ActiveCou public native boolean nativeIsBenchmarking(); - // Dealing with dialogs. - // Constants should be equal with map/dialog_settings.hpp - public static final int FACEBOOK = 0; - - public static final Integer[] FACEBOOK_RATE_LAUNCHES = new Integer[]{3, 7, 10, 15, 21}; - - public native boolean shouldShowDialog(int dlg); - - static public final int OK = 0; - static public final int LATER = 1; - static public final int NEVER = 2; - - public native void submitDialogResult(int dlg, int res); - // - private native void nativeAddLocalization(String name, String value); - /// Dealing with Settings + // Dealing with Settings public native boolean nativeGetBoolean(String name, boolean defaultValue); public native void nativeSetBoolean(String name, boolean value);