pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Review fixes

Browse source
This commit is contained in:
Roman Romanov 2017-04-18 15:31:57 +04:00
parent 3567711b55
commit 6312a2e1b1
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -137,6 +137,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
private final Stack<MapTask> mTasks = new Stack<>();
private final StoragePathManager mPathManager = new StoragePathManager();
@Nullable
private MapFragment mMapFragment;
private PlacePageView mPlacePage;
@ -618,14 +619,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
mRootView = (ViewGroup) container.getParent();
}
public void detachMap(FragmentTransaction transaction)
public void detachMap(@NonNull FragmentTransaction transaction)
{
if (mMapFragment == null)
return;
transaction
.remove(mMapFragment);
transaction.remove(mMapFragment);
mMapFragment = null;
}
@ -1036,7 +1035,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
public void recreate()
{
// Explicitly destroy context before activity recreation.
mMapFragment.destroyContext();
if (mMapFragment != null)
mMapFragment.destroyContext();
super.recreate();
}
@ -1372,7 +1372,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
public boolean onTouch(View view, MotionEvent event)
{
return mPlacePage.hideOnTouch() ||
mMapFragment.onTouch(view, event);
(mMapFragment != null && mMapFragment.onTouch(view, event));
}
@Override

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

@ -53,6 +53,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
private boolean mAutoUpdate;
@Nullable
private String[] mOutdatedMaps;
private boolean mFromInstanceState;
@NonNull
private final MapManager.StorageCallback mStorageCallback = new MapManager.StorageCallback()
@ -86,14 +87,15 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
MapManager.showError(getActivity(), item, new Utils.Proc<Boolean>()
{
@Override
public void invoke(@NonNull Boolean param)
public void invoke(@NonNull Boolean result)
{
if (param)
if (result)
{
MapManager.nativeUpdate(CountryItem.getRootId());
}
else
{
// TODO remove attachMap() when dialog migrated to SplashActivity
attachMap();
dismiss();
}
@ -107,6 +109,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
if (!isAllUpdated())
return;
// TODO remove attachMap() when dialog migrated to SplashActivity
attachMap();
dismiss();
}
@ -137,6 +140,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
if (MapManager.nativeIsDownloading())
MapManager.nativeCancel(CountryItem.getRootId());
// TODO remove attachMap() when dialog migrated to SplashActivity
attachMap();
dismiss();
}
@ -190,6 +194,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
fragment.setArguments(args);
FragmentTransaction transaction = fm.beginTransaction()
.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out);
// TODO remove detachMap() when dialog migrated to SplashActivity
if (activity instanceof MwmActivity)
((MwmActivity) activity).detachMap(transaction);
fragment.show(transaction, UpdaterDialogFragment.class.getName());
@ -210,6 +215,7 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
{
super.onCreate(savedInstanceState);
mFromInstanceState = savedInstanceState != null;
readArguments();
}
@ -240,10 +246,21 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
if (isAllUpdated())
{
// TODO remove attachMap() when dialog migrated to SplashActivity
attachMap();
dismiss();
return;
}
// TODO remove detachMap() when dialog migrated to SplashActivity
if (getActivity() instanceof MwmActivity && mFromInstanceState)
{
FragmentTransaction transaction = getActivity().getSupportFragmentManager()
.beginTransaction();
((MwmActivity) getActivity()).detachMap(transaction);
transaction.commit();
}
mListenerSlot = MapManager.nativeSubscribe(mStorageCallback);
if (mAutoUpdate && !MapManager.nativeIsDownloading())
@ -271,10 +288,12 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
if (MapManager.nativeIsDownloading())
MapManager.nativeCancel(CountryItem.getRootId());
// TODO remove attachMap() when dialog migrated to SplashActivity
attachMap();
super.onCancel(dialog);
}
//TODO remove attachMap() when dialog migrated to SplashActivity
private void attachMap()
{
if (!(getActivity() instanceof MwmActivity))