kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] got rid of mwm migration UI and resource files for two component mwms

Browse source
This commit is contained in:
Arsentiy Milchakov 2019-10-10 12:14:24 +03:00 • committed by mpimenov
parent fd7a0493e1
commit f8371a5a00
23 changed files with 13 additions and 616 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/assets/countries_obsolete.txt
View file

@ -1 +0,0 @@
../../data/countries_obsolete.txt

1
android/assets/packed_polygons_obsolete.bin
View file

@ -1 +0,0 @@
../../data/packed_polygons_obsolete.bin

1
android/flavors/mwm-ttf-assets/WorldCoasts_obsolete.mwm
View file

@ -1 +0,0 @@
../../../data/WorldCoasts_obsolete.mwm

3
android/gradle.properties
View file

@ -19,8 +19,7 @@ propObbFonts ../data/01_dejavusans.ttf \
../data/06_code2000.ttf \
../data/07_roboto_medium.ttf
propObbWorlds ../data/World.mwm \
../data/WorldCoasts.mwm \
../data/WorldCoasts_obsolete.mwm
../data/WorldCoasts.mwm
propObbWorldsOutput build/worlds.obb
propObbFontsOutput build/fonts.obb

17
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -706,23 +706,6 @@ void Framework::RequestBookingInfo(JNIEnv * env, jobject policy,
bookingApi->GetHotelInfo(hotelId, lang, callback);
}
bool Framework::HasSpaceForMigration()
{
return m_work.IsEnoughSpaceForMigrate();
}
void Framework::Migrate(bool keepOldMaps)
{
m_work.Migrate(keepOldMaps);
}
storage::CountryId Framework::PreMigrate(
ms::LatLon const & position, Storage::ChangeCountryFunction const & statusChangeListener,
Storage::ProgressFunction const & progressListener)
{
return m_work.PreMigrate(position, statusChangeListener, progressListener);
}
bool Framework::IsAutoRetryDownloadFailed()
{
return m_work.GetDownloadingPolicy().IsAutoRetryDownloadFailed();

7
android/jni/com/mapswithme/maps/Framework.hpp
View file

@ -190,13 +190,6 @@ namespace android
std::string const & hotelId, std::string const & lang,
booking::GetHotelInfoCallback const & callback);
bool HasSpaceForMigration();
storage::CountryId PreMigrate(
ms::LatLon const & position,
storage::Storage::ChangeCountryFunction const & statusChangeListener,
storage::Storage::ProgressFunction const & progressListener);
void Migrate(bool keepOldMaps);
bool IsAutoRetryDownloadFailed();
bool IsDownloadOn3gEnabled();
void EnableDownloadOn3g();

117
android/jni/com/mapswithme/maps/MapManager.cpp
View file

@ -52,7 +52,6 @@ struct TBatchedData
jmethodID g_listAddMethod;
jclass g_countryItemClass;
jobject g_countryChangedListener;
jobject g_migrationListener;
DECLARE_THREAD_CHECKER(g_batchingThreadChecker);
std::unordered_map<jobject, std::vector<TBatchedData>> g_batchedCallbackData;
@ -97,13 +96,6 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeMoveFile(JNIEnv * env, jcla
return base::RenameFileX(jni::ToNativeString(env, oldFile), jni::ToNativeString(env, newFile));
}
// static boolean nativeHasSpaceForMigration();
JNIEXPORT jboolean JNICALL
Java_com_mapswithme_maps_downloader_MapManager_nativeHasSpaceForMigration(JNIEnv * env, jclass clazz)
{
return g_framework->HasSpaceForMigration();
}
// static boolean nativeHasSpaceToDownloadAmount(long bytes);
JNIEXPORT jboolean JNICALL
Java_com_mapswithme_maps_downloader_MapManager_nativeHasSpaceToDownloadAmount(JNIEnv * env, jclass clazz, jlong bytes)
@ -125,115 +117,6 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeHasSpaceToUpdate(JNIEnv * e
return IsEnoughSpaceForUpdate(jni::ToNativeString(env, root), GetStorage());
}
// static native boolean nativeIsLegacyMode();
JNIEXPORT jboolean JNICALL
Java_com_mapswithme_maps_downloader_MapManager_nativeIsLegacyMode(JNIEnv * env, jclass clazz)
{
return !version::IsSingleMwm(GetStorage().GetCurrentDataVersion());
}
// static native boolean nativeNeedMigrate();
JNIEXPORT jboolean JNICALL
Java_com_mapswithme_maps_downloader_MapManager_nativeNeedMigrate(JNIEnv * env, jclass clazz)
{
return platform::migrate::NeedMigrate();
}
static void FinishMigration(JNIEnv * env)
{
ASSERT(g_migrationListener, ());
env->DeleteGlobalRef(g_migrationListener);
g_migrationListener = nullptr;
}
static void OnPrefetchComplete(bool keepOldMaps)
{
ASSERT(g_migrationListener, ());
g_framework->Migrate(keepOldMaps);
JNIEnv * env = jni::GetEnv();
static jmethodID const callback = jni::GetMethodID(env, g_migrationListener, "onComplete", "()V");
env->CallVoidMethod(g_migrationListener, callback);
FinishMigration(env);
}
static void OnMigrationError(NodeErrorCode error)
{
ASSERT(g_migrationListener, ());
JNIEnv * env = jni::GetEnv();
static jmethodID const callback = jni::GetMethodID(env, g_migrationListener, "onError", "(I)V");
env->CallVoidMethod(g_migrationListener, callback, static_cast<jint>(error));
FinishMigration(env);
}
static void MigrationStatusChangedCallback(CountryId const & countryId, bool keepOldMaps)
{
NodeStatuses attrs;
GetStorage().GetPrefetchStorage()->GetNodeStatuses(countryId, attrs);
switch (attrs.m_status)
{
case NodeStatus::OnDisk:
if (!attrs.m_groupNode)
OnPrefetchComplete(keepOldMaps);
break;
case NodeStatus::Undefined:
case NodeStatus::Error:
if (!attrs.m_groupNode)
OnMigrationError(attrs.m_error);
break;
default:
break;
}
}
static void MigrationProgressCallback(CountryId const & countryId, LocalAndRemoteSize const & sizes)
{
JNIEnv * env = jni::GetEnv();
static jmethodID const callback = jni::GetMethodID(env, g_migrationListener, "onProgress", "(I)V");
env->CallVoidMethod(g_migrationListener, callback, static_cast<jint>(sizes.first * 100 / sizes.second));
}
// static @Nullable String nativeMigrate(MigrationListener listener, double lat, double lon, boolean hasLocation, boolean keepOldMaps);
JNIEXPORT jstring JNICALL
Java_com_mapswithme_maps_downloader_MapManager_nativeMigrate(JNIEnv * env, jclass clazz, jobject listener, jdouble lat, jdouble lon, jboolean hasLocation, jboolean keepOldMaps)
{
ms::LatLon position{};
if (hasLocation)
position = MercatorBounds::ToLatLon(g_framework->GetViewportCenter());
g_migrationListener = env->NewGlobalRef(listener);
CountryId id =
g_framework->PreMigrate(position, std::bind(&MigrationStatusChangedCallback, _1, keepOldMaps),
std::bind(&MigrationProgressCallback, _1, _2));
if (id != kInvalidCountryId)
{
NodeAttrs attrs;
GetStorage().GetPrefetchStorage()->GetNodeAttrs(id, attrs);
return jni::ToJavaString(env, attrs.m_nodeLocalName);
}
OnPrefetchComplete(keepOldMaps);
return nullptr;
}
// static void nativeCancelMigration();
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_downloader_MapManager_nativeCancelMigration(JNIEnv * env, jclass clazz)
{
Storage * storage = GetStorage().GetPrefetchStorage();
CountryId const & currentCountry = storage->GetCurrentDownloadingCountryId();
storage->CancelDownloadNode(currentCountry);
}
// static int nativeGetDownloadedCount();
JNIEXPORT jint JNICALL
Java_com_mapswithme_maps_downloader_MapManager_nativeGetDownloadedCount(JNIEnv * env, jclass clazz)

3
android/script/replace_links.bat
View file

@ -8,7 +8,6 @@ cp ../data/classificator.txt assets/
cp ../data/colors.txt assets/
cp ../data/copyright.html assets/
cp ../data/countries.txt assets/
cp ../data/countries_obsolete.txt assets/
cp ../data/drules_proto_dark.bin assets/
cp ../data/drules_proto_clear.bin assets/
cp ../data/drules_proto_vehicle_dark.bin assets/
@ -20,7 +19,6 @@ cp ../data/fonts_blacklist.txt assets/
cp ../data/fonts_whitelist.txt assets/
cp ../data/languages.txt assets/
cp ../data/packed_polygons.bin assets/
cp ../data/packed_polygons_obsolete.bin assets/
cp ../data/patterns.txt assets/
cp ../data/types.txt assets/
cp ../data/unicode_blocks.txt assets/
@ -58,7 +56,6 @@ cp ../data/06_code2000.ttf flavors/mwm-ttf-assets/
cp ../data/07_roboto_medium.ttf flavors/mwm-ttf-assets/
cp ../data/World.mwm flavors/mwm-ttf-assets/
cp ../data/WorldCoasts.mwm flavors/mwm-ttf-assets/
cp ../data/WorldCoasts_obsolete.mwm flavors/mwm-ttf-assets/
rm -rf res/values-zh-rHK/
mkdir res\\values-zh-rHK

4
android/src/com/mapswithme/maps/Framework.java
View file

@ -67,14 +67,12 @@ public class Framework
public static final int ROUTER_TYPE_TRANSIT = 4;
@Retention(RetentionPolicy.SOURCE)
@IntDef({DO_AFTER_UPDATE_NOTHING, DO_AFTER_UPDATE_AUTO_UPDATE, DO_AFTER_UPDATE_ASK_FOR_UPDATE,
DO_AFTER_UPDATE_MIGRATE})
@IntDef({DO_AFTER_UPDATE_NOTHING, DO_AFTER_UPDATE_AUTO_UPDATE, DO_AFTER_UPDATE_ASK_FOR_UPDATE})
public @interface DoAfterUpdate {}
public static final int DO_AFTER_UPDATE_NOTHING = 0;
public static final int DO_AFTER_UPDATE_AUTO_UPDATE = 1;
public static final int DO_AFTER_UPDATE_ASK_FOR_UPDATE = 2;
public static final int DO_AFTER_UPDATE_MIGRATE = 3;
@Retention(RetentionPolicy.SOURCE)
@IntDef({ROUTE_REBUILD_AFTER_POINTS_LOADING})

8
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -53,8 +53,6 @@ import com.mapswithme.maps.discovery.DiscoveryFragment;
import com.mapswithme.maps.discovery.ItemType;
import com.mapswithme.maps.downloader.DownloaderActivity;
import com.mapswithme.maps.downloader.DownloaderFragment;
import com.mapswithme.maps.downloader.MapManager;
import com.mapswithme.maps.downloader.MigrationFragment;
import com.mapswithme.maps.downloader.OnmapDownloader;
import com.mapswithme.maps.editor.Editor;
import com.mapswithme.maps.editor.EditorActivity;
@ -179,7 +177,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
private static final String[] DOCKED_FRAGMENTS = { SearchFragment.class.getName(),
DownloaderFragment.class.getName(),
MigrationFragment.class.getName(),
RoutingPlanFragment.class.getName(),
EditorHostFragment.class.getName(),
ReportFragment.class.getName(),
@ -459,16 +456,13 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Override
public void showDownloader(boolean openDownloaded)
{
if (RoutingController.get().checkMigration(this))
return;
final Bundle args = new Bundle();
args.putBoolean(DownloaderActivity.EXTRA_OPEN_DOWNLOADED, openDownloaded);
if (mIsTabletLayout)
{
SearchEngine.INSTANCE.cancel();
mSearchController.refreshToolbar();
replaceFragment(MapManager.nativeIsLegacyMode() ? MigrationFragment.class : DownloaderFragment.class, args, null);
replaceFragment(DownloaderFragment.class, args, null);
}
else
{

2
android/src/com/mapswithme/maps/ads/LikesManager.java
View file

@ -10,7 +10,6 @@ import com.mapswithme.maps.BuildConfig;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.downloader.DownloaderFragment;
import com.mapswithme.maps.downloader.MapManager;
import com.mapswithme.maps.downloader.MigrationFragment;
import com.mapswithme.maps.editor.EditorHostFragment;
import com.mapswithme.maps.routing.RoutingController;
import com.mapswithme.maps.search.SearchFragment;
@ -71,7 +70,6 @@ public enum LikesManager
sFragments.add(SearchFragment.class);
sFragments.add(EditorHostFragment.class);
sFragments.add(DownloaderFragment.class);
sFragments.add(MigrationFragment.class);
}
private final boolean mIsNewUser = (Counters.getFirstInstallVersion() == BuildConfig.VERSION_CODE);

3
android/src/com/mapswithme/maps/downloader/CountrySuggestFragment.java
View file

@ -214,8 +214,7 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl
break;
case R.id.btn__select_map:
if (!RoutingController.get().checkMigration(getMwmActivity()))
getMwmActivity().replaceFragment(DownloaderFragment.class, null, null);
getMwmActivity().replaceFragment(DownloaderFragment.class, null, null);
break;
case R.id.wpv__download_progress:

3
android/src/com/mapswithme/maps/downloader/DownloaderActivity.java
View file

@ -12,8 +12,7 @@ public class DownloaderActivity extends BaseMwmFragmentActivity
@Override
protected Class<? extends Fragment> getFragmentClass()
{
return (MapManager.nativeIsLegacyMode() ? MigrationFragment.class
: DownloaderFragment.class);
return (DownloaderFragment.class);
}
@Override

36
android/src/com/mapswithme/maps/downloader/MapManager.java
View file

@ -51,14 +51,6 @@ public final class MapManager
void onCurrentCountryChanged(String countryId);
}
@SuppressWarnings("unused")
interface MigrationListener
{
void onComplete();
void onProgress(int percent);
void onError(int code);
}
private static WeakReference<AlertDialog> sCurrentErrorDialog;
private MapManager() {}
@ -277,11 +269,6 @@ public final class MapManager
*/
public static native boolean nativeMoveFile(String oldFile, String newFile);
/**
* Returns {@code true} if there is enough storage space to perform migration. Or {@code false} otherwise.
*/
public static native boolean nativeHasSpaceForMigration();
/**
* Returns {@code true} if there is enough storage space to download specified amount of data. Or {@code false} otherwise.
*/
@ -297,29 +284,6 @@ public final class MapManager
*/
public static native boolean nativeHasSpaceToUpdate(String root);
/**
* Determines whether the legacy (large MWMs) mode is used.
*/
public static native boolean nativeIsLegacyMode();
/**
* Quickly determines if the migration is needed. In the most cases you should use {@link #nativeIsLegacyMode()} instead.
*/
public static native boolean nativeNeedMigrate();
/**
* Performs migration from old (large MWMs) mode.
* @return Name of the country to be loaded during the prefetch.
* Or {@code null} if maps were queued to downloader and migration process is complete.
* In the latter case {@link MigrationListener#onComplete()} will be called before return from {@code nativeMigrate()}.
*/
public static native @Nullable String nativeMigrate(MigrationListener listener, double lat, double lon, boolean hasLocation, boolean keepOldMaps);
/**
* Aborts migration. Affects only prefetch process.
*/
public static native void nativeCancelMigration();
/**
* Return count of fully downloaded maps (excluding fake MWMs).
*/

170
android/src/com/mapswithme/maps/downloader/MigrationController.java
View file

@ -1,170 +0,0 @@
package com.mapswithme.maps.downloader;
import android.location.Location;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.util.statistics.Statistics;
@android.support.annotation.UiThread
final class MigrationController
{
enum State
{
NOT_NECESSARY,
READY,
PROGRESS,
ERROR
}
interface Container
{
void setReadyState();
void setProgressState(String countryName);
void setErrorState(int code);
void onComplete();
void setProgress(int percents);
}
private static final MigrationController sInstance = new MigrationController();
private Container mContainer;
private State mState;
private String mPrefetchingCountry;
private int mProgress;
private int mError;
private final MapManager.MigrationListener mListener = new MapManager.MigrationListener()
{
@Override
public void onComplete()
{
mState = State.NOT_NECESSARY;
callOnComplete();
}
@Override
public void onProgress(int percent)
{
mProgress = percent;
callUpdateProgress();
}
@Override
public void onError(int code)
{
mState = State.ERROR;
mError = code;
callStateError();
MapManager.sendErrorStat(Statistics.EventName.DOWNLOADER_MIGRATION_ERROR, code);
}
};
static MigrationController get()
{
return sInstance;
}
private MigrationController()
{
if (!MapManager.nativeIsLegacyMode())
{
mState = State.NOT_NECESSARY;
return;
}
mState = State.READY;
if (!MapManager.nativeHasSpaceForMigration())
{
mState = State.ERROR;
mError = CountryItem.ERROR_OOM;
}
}
private void callStateReady()
{
if (mContainer != null)
mContainer.setReadyState();
}
private void callStateProgress()
{
if (mContainer != null)
mContainer.setProgressState(mPrefetchingCountry);
}
private void callStateError()
{
if (mContainer != null)
mContainer.setErrorState(mError);
}
private void callUpdateProgress()
{
if (mContainer != null)
mContainer.setProgress(mProgress);
}
private void callOnComplete()
{
if (mContainer != null)
mContainer.onComplete();
}
void attach(Container container)
{
mContainer = container;
}
void detach()
{
mContainer = null;
}
void restore()
{
switch (mState)
{
case READY:
callStateReady();
break;
case PROGRESS:
callStateProgress();
callUpdateProgress();
break;
case ERROR:
callStateError();
break;
}
}
void start(boolean keepOld)
{
if (mState == State.PROGRESS)
return;
Location loc = LocationHelper.INSTANCE.getLastKnownLocation();
double lat = (loc == null ? 0.0 : loc.getLatitude());
double lon = (loc == null ? 0.0 : loc.getLongitude());
mPrefetchingCountry = MapManager.nativeMigrate(mListener, lat, lon, (loc != null), keepOld);
if (mPrefetchingCountry == null)
return;
mState = State.PROGRESS;
mProgress = 0;
callStateProgress();
callUpdateProgress();
}
void cancel()
{
mState = State.READY;
callStateReady();
MapManager.nativeCancelMigration();
}
}

202
android/src/com/mapswithme/maps/downloader/MigrationFragment.java
View file

@ -1,202 +0,0 @@
package com.mapswithme.maps.downloader;
import android.location.Location;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmFragment;
import com.mapswithme.maps.base.OnBackPressListener;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.maps.widget.WheelProgressView;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.statistics.Statistics;
public class MigrationFragment extends BaseMwmFragment
implements OnBackPressListener,
MigrationController.Container
{
private TextView mError;
private TextView mPrepare;
private WheelProgressView mProgress;
private Button mButtonPrimary;
private Button mButtonSecondary;
private final View.OnClickListener mButtonClickListener = new View.OnClickListener()
{
@Override
public void onClick(final View v)
{
MapManager.warnOn3g(getActivity(), null, new Runnable()
{
@Override
public void run()
{
boolean keepOld = (v == mButtonPrimary);
Statistics.INSTANCE.trackEvent(Statistics.EventName.DOWNLOADER_MIGRATION_STARTED,
Statistics.params().add(Statistics.EventParam.TYPE, keepOld ? "all_maps"
: "current_map"));
MigrationController.get().start(keepOld);
}
});
}
};
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{
return inflater.inflate(R.layout.fragment_migrate, container, false);
}
private void checkConnection()
{
Utils.checkConnection(getActivity(), R.string.common_check_internet_connection_dialog, new Utils.Proc<Boolean>()
{
@Override
public void invoke(Boolean result)
{
if (result)
return;
if (getActivity() instanceof MwmActivity)
((MwmActivity) getActivity()).closeSidePanel();
else
getActivity().finish();
}
});
}
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState)
{
super.onActivityCreated(savedInstanceState);
checkConnection();
}
@Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState)
{
super.onViewCreated(view, savedInstanceState);
mError = (TextView) view.findViewById(R.id.error);
mPrepare = (TextView) view.findViewById(R.id.preparation);
mProgress = (WheelProgressView) view.findViewById(R.id.wheel_progress);
mButtonPrimary = (Button) view.findViewById(R.id.button_primary);
mButtonSecondary = (Button) view.findViewById(R.id.button_secondary);
mButtonPrimary.setOnClickListener(mButtonClickListener);
mButtonSecondary.setOnClickListener(mButtonClickListener);
mProgress.setOnClickListener(new View.OnClickListener()
{
@Override
public void onClick(View v)
{
MigrationController.get().cancel();
}
});
Statistics.INSTANCE.trackEvent(Statistics.EventName.DOWNLOADER_MIGRATION_DIALOG_SEEN);
}
@Override
public void onResume()
{
super.onResume();
MigrationController.get().restore();
}
@Override
public void onStart()
{
super.onStart();
MigrationController.get().attach(this);
}
@Override
public void onStop()
{
super.onStop();
MigrationController.get().detach();
}
@Override
public void setReadyState()
{
UiUtils.show(mButtonPrimary);
UiUtils.hide(mPrepare, mProgress, mError);
Location loc = LocationHelper.INSTANCE.getLastKnownLocation();
UiUtils.showIf(loc != null, mButtonSecondary);
}
@Override
public void setProgressState(String countryName)
{
UiUtils.show(mPrepare, mProgress);
UiUtils.hide(mError, mButtonPrimary, mButtonSecondary);
mPrepare.setText(String.format("%1$2s %2$s", getString(R.string.downloader_downloading), countryName));
}
@Override
public void setErrorState(int code)
{
setReadyState();
UiUtils.show(mError);
@StringRes int text;
switch (code)
{
case CountryItem.ERROR_OOM:
text = R.string.migration_no_space_message;
break;
case CountryItem.ERROR_NO_INTERNET:
text = R.string.common_check_internet_connection_dialog;
break;
default:
text = R.string.country_status_download_failed;
}
mError.setText(text);
}
@Override
public void onComplete()
{
if (!isAdded())
return;
if (getActivity() instanceof MwmActivity)
((MwmActivity) getActivity()).showDownloader(false);
else
getActivity().recreate();
Statistics.INSTANCE.trackEvent(Statistics.EventName.DOWNLOADER_MIGRATION_COMPLETE);
}
@Override
public void setProgress(int percents)
{
mProgress.setPending(percents == 0);
if (percents > 0)
mProgress.setProgress(percents);
}
@Override
public boolean onBackPressed()
{
return false;
}
}

9
android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
View file

@ -144,13 +144,12 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
}
else
{
sizeText = (MapManager.nativeIsLegacyMode() ? "" : StringUtils.getFileSizeString(mCurrentCountry.totalSize));
sizeText = (StringUtils.getFileSizeString(mCurrentCountry.totalSize));
if (shouldAutoDownload &&
Config.isAutodownloadEnabled() &&
!sAutodownloadLocked &&
!failed &&
!MapManager.nativeIsLegacyMode() &&
ConnectionState.isWifiConnected())
{
Location loc = LocationHelper.INSTANCE.getSavedLocation();
@ -213,12 +212,6 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
@Override
public void onClick(View v)
{
if (MapManager.nativeIsLegacyMode())
{
mActivity.showDownloader(false);
return;
}
MapManager.warnOn3g(mActivity, mCurrentCountry.id, new Runnable()
{
@Override

2
android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java
View file

@ -172,7 +172,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
else
{
result = Framework.nativeToDoAfterUpdate();
if (result == Framework.DO_AFTER_UPDATE_MIGRATE || result == Framework.DO_AFTER_UPDATE_NOTHING)
if (result == Framework.DO_AFTER_UPDATE_NOTHING)
return false;
Statistics.INSTANCE.trackDownloaderDialogEvent(DOWNLOADER_DIALOG_SHOW,

8
android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java
View file

@ -106,7 +106,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
((TextView) countryView.findViewById(R.id.tv__title)).setText(map.name);
final TextView szView = (TextView) countryView.findViewById(R.id.tv__size);
szView.setText(MapManager.nativeIsLegacyMode() ? "" : StringUtils.getFileSizeString(map.totalSize));
szView.setText(StringUtils.getFileSizeString(map.totalSize));
ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) szView.getLayoutParams();
lp.rightMargin = 0;
szView.setLayoutParams(lp);
@ -155,7 +155,6 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
{
List<Map<String, String>> countries = new ArrayList<>();
long size = 0;
boolean legacy = MapManager.nativeIsLegacyMode();
for (CountryItem item: mMissingMaps)
{
@ -163,13 +162,12 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
data.put(COUNTRY_NAME, item.name);
countries.add(data);
if (!legacy)
size += item.totalSize;
size += item.totalSize;
}
Map<String, String> group = new HashMap<>();
group.put(GROUP_NAME, getString(R.string.maps) + " (" + mMissingMaps.size() + ") ");
group.put(GROUP_SIZE, (legacy ? "" : StringUtils.getFileSizeString(size)));
group.put(GROUP_SIZE, (StringUtils.getFileSizeString(size)));
List<Map<String, String>> groups = new ArrayList<>();
groups.add(group);

17
android/src/com/mapswithme/maps/routing/RoutingController.java
View file

@ -1166,23 +1166,6 @@ public class RoutingController implements TaxiManager.TaxiListener
return StringUtils.formatUsingUsLocale("%d:%02d", current.get(Calendar.HOUR_OF_DAY), current.get(Calendar.MINUTE));
}
public boolean checkMigration(Activity activity)
{
if (!MapManager.nativeIsLegacyMode())
return false;
if (!isNavigating() && !isPlanning())
return false;
new AlertDialog.Builder(activity)
.setTitle(R.string.migrate_title)
.setMessage(R.string.no_migration_during_navigation)
.setPositiveButton(android.R.string.ok, null)
.show();
return true;
}
private void requestTaxiInfo(@NonNull MapObject startPoint, @NonNull MapObject endPoint)
{
mTaxiPlanning = true;

6
android/src/com/mapswithme/maps/widget/menu/MainMenu.java
View file

@ -323,9 +323,7 @@ public class MainMenu extends BaseMenu
UpdateInfo info = MapManager.nativeGetUpdateInfo(null);
int count = (info == null ? 0 : info.filesCount);
boolean show = (MapManager.nativeIsLegacyMode() || count > 0) &&
(!mCollapsed || mCollapseViews.isEmpty()) &&
!isOpen();
boolean show = count > 0 && !isOpen() && (!mCollapsed || mCollapseViews.isEmpty());
UiUtils.showIf(show, mNewsMarker);
UiUtils.showIf(count > 0, mNewsCounter);
@ -408,7 +406,7 @@ public class MainMenu extends BaseMenu
UiUtils.showIf(expandContent,
mItemViews.get(Item.SEARCH),
mItemViews.get(Item.BOOKMARKS));
setVisible(Item.ADD_PLACE, !isRouting && !MapManager.nativeIsLegacyMode());
setVisible(Item.ADD_PLACE, !isRouting);
}
if (mLayoutMeasured)

5
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -1378,10 +1378,7 @@ public class PlacePageView extends NestedScrollView
showTaxiOffer(mapObject);
boolean inRouting = RoutingController.get().isNavigating() ||
RoutingController.get().isPlanning();
if (inRouting || MapManager.nativeIsLegacyMode())
if (RoutingController.get().isNavigating() || RoutingController.get().isPlanning())
{
UiUtils.hide(mEditPlace, mAddOrganisation, mAddPlace, mLocalAd, mEditTopSpace);
}

4
android/src/com/mapswithme/util/statistics/Statistics.java
View file

@ -347,10 +347,6 @@ public enum Statistics
public static class EventName
{
// Downloader
public static final String DOWNLOADER_MIGRATION_DIALOG_SEEN = "Downloader_Migration_dialogue";
public static final String DOWNLOADER_MIGRATION_STARTED = "Downloader_Migration_started";
public static final String DOWNLOADER_MIGRATION_COMPLETE = "Downloader_Migration_completed";
public static final String DOWNLOADER_MIGRATION_ERROR = "Downloader_Migration_error";
public static final String DOWNLOADER_ERROR = "Downloader_Map_error";
public static final String DOWNLOADER_ACTION = "Downloader_Map_action";
public static final String DOWNLOADER_CANCEL = "Downloader_Cancel_downloading";