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

android: prevent mapObject from being null after first init

Browse source 
Signed-off-by: Arnaud Vergnet <arnaud.vergnet@mailo.com>
This commit is contained in:
Arnaud Vergnet 2023-01-23 23:09:16 +01:00 • committed by Viktor Govako
parent eebeaf67c2
commit 77d4c1bef3
3 changed files with 64 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
android/src/app/organicmaps/widget/placepage/PlacePageBookmarkFragment.java
View file

@ -16,6 +16,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import app.organicmaps.R;
@ -25,15 +26,12 @@ import app.organicmaps.bookmarks.data.MapObject;
import app.organicmaps.util.StringUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.log.Logger;
public class PlacePageBookmarkFragment extends Fragment implements View.OnClickListener,
View.OnLongClickListener,
Observer<MapObject>,
EditBookmarkFragment.EditBookmarkListener
{
private static final String TAG = PlacePageBookmarkFragment.class.getSimpleName();
private View mFrame;
private TextView mTvBookmarkNote;
@Nullable
@ -41,7 +39,7 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
private PlacePageViewModel viewModel;
// TODO description header is not shown
private Bookmark currentBookmark;
@Nullable
@Override
@ -67,8 +65,6 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
private void initWebView()
{
if (mWvBookmarkNote != null)
return;
mWvBookmarkNote = new WebView(requireContext());
final WebSettings settings = mWvBookmarkNote.getSettings();
settings.setJavaScriptEnabled(false);
@ -78,14 +74,6 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
linearLayout.addView(mWvBookmarkNote, linearLayout.getChildCount() - 1);
}
@Nullable
private MapObject getMapObject()
{
if (viewModel != null)
return viewModel.getMapObject().getValue();
return null;
}
@Override
public void onDestroy()
{
@ -93,32 +81,25 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
viewModel.getMapObject().removeObserver(this);
}
private void updateBookmarkDetails(@NonNull MapObject mapObject)
private void updateBookmarkDetails()
{
if (mapObject.getMapObjectType() != MapObject.BOOKMARK)
return;
final String notes = ((Bookmark) mapObject).getBookmarkDescription();
final String notes = currentBookmark.getBookmarkDescription();
if (TextUtils.isEmpty(notes))
{
UiUtils.hide(mTvBookmarkNote);
if (mWvBookmarkNote != null)
UiUtils.hide(mWvBookmarkNote);
return;
}
if (StringUtils.nativeIsHtml(notes))
else if (StringUtils.nativeIsHtml(notes))
{
if (mWvBookmarkNote == null)
initWebView();
// According to loadData documentation, HTML should be either base64 or percent encoded.
// Default UTF-8 encoding for all content is set above in WebSettings.
initWebView();
if (mWvBookmarkNote != null)
{
final String b64encoded = Base64.encodeToString(notes.getBytes(), Base64.DEFAULT);
mWvBookmarkNote.loadData(b64encoded, Utils.TEXT_HTML, "base64");
UiUtils.show(mWvBookmarkNote);
UiUtils.hide(mTvBookmarkNote);
}
final String b64encoded = Base64.encodeToString(notes.getBytes(), Base64.DEFAULT);
mWvBookmarkNote.loadData(b64encoded, Utils.TEXT_HTML, "base64");
UiUtils.show(mWvBookmarkNote);
UiUtils.hide(mTvBookmarkNote);
}
else
{
@ -133,17 +114,11 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
@Override
public void onClick(View v)
{
final MapObject mapObject = getMapObject();
if (mapObject == null)
{
Logger.e(TAG, "A bookmark cannot be edited, mMapObject is null!");
return;
}
Bookmark bookmark = (Bookmark) mapObject;
EditBookmarkFragment.editBookmark(bookmark.getCategoryId(),
bookmark.getBookmarkId(),
requireActivity(),
requireActivity().getSupportFragmentManager(),
final FragmentActivity activity = requireActivity();
EditBookmarkFragment.editBookmark(currentBookmark.getCategoryId(),
currentBookmark.getBookmarkId(),
activity,
activity.getSupportFragmentManager(),
PlacePageBookmarkFragment.this);
}
@ -163,8 +138,14 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
@Override
public void onChanged(MapObject mapObject)
{
if (mapObject != null)
updateBookmarkDetails(mapObject);
// MapObject could be something else than a bookmark if the user already has the place page
// opened and clicks on a non-bookmarked POI.
// This callback would be called before the fragment had time to be destroyed
if (mapObject.getMapObjectType() == MapObject.BOOKMARK)
{
currentBookmark = (Bookmark) mapObject;
updateBookmarkDetails();
}
}
@Override

82
android/src/app/organicmaps/widget/placepage/PlacePageController.java
View file

@ -62,7 +62,6 @@ public class PlacePageController implements Initializable<Activity>,
private int mPreviewHeight;
private int mFrameHeight;
private boolean mDeactivateMapSelection = true;
@Nullable
private MapObject mMapObject;
private WindowInsets mCurrentWindowInsets;
@ -159,7 +158,7 @@ public class PlacePageController implements Initializable<Activity>,
mDeactivateMapSelection = true;
PlacePageUtils.moveViewportUp(mPlacePage, mViewportMinHeight);
resetPlacePageHeightBounds();
viewModel.setMapObject(null);
removePlacePageFragments();
}
public int getPlacePageWidth()
@ -216,8 +215,6 @@ public class PlacePageController implements Initializable<Activity>,
private void setPeekHeight()
{
final int peekHeight = calculatePeekHeight();
if (mMapObject == null)
return;
final int state = mPlacePageBehavior.getState();
final boolean shouldAnimate = !PlacePageUtils.isHiddenState(state);
@ -265,7 +262,7 @@ public class PlacePageController implements Initializable<Activity>,
private int calculatePeekHeight()
{
if (mMapObject != null && mMapObject.getOpeningMode() == MapObject.OPENING_MODE_PREVIEW_PLUS)
if (mMapObject.getOpeningMode() == MapObject.OPENING_MODE_PREVIEW_PLUS)
return (int) (mCoordinator.getHeight() * PREVIEW_PLUS_RATIO);
return mPreviewHeight + mButtonsHeight;
}
@ -302,7 +299,7 @@ public class PlacePageController implements Initializable<Activity>,
mPreviewHeight = previewHeight;
mFrameHeight = frameHeight;
setPeekHeight();
if (mShouldCollapse && mMapObject != null && !PlacePageUtils.isCollapsedState(mPlacePageBehavior.getState()))
if (mShouldCollapse && !PlacePageUtils.isCollapsedState(mPlacePageBehavior.getState()))
mPlacePageBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
mShouldCollapse = false;
}
@ -340,53 +337,52 @@ public class PlacePageController implements Initializable<Activity>,
placePageFragment.onPlacePageButtonClick(item);
}
private void onMapObjectChange(@Nullable MapObject mapObject)
private void removePlacePageFragments()
{
mMapObject = mapObject;
if (mMapObject == null)
Fragment placePageButtonsFragment = mMwmActivity.getSupportFragmentManager()
.findFragmentByTag(PLACE_PAGE_BUTTONS_FRAGMENT_TAG);
if (placePageButtonsFragment != null)
{
Fragment placePageButtonsFragment = mMwmActivity.getSupportFragmentManager()
.findFragmentByTag(PLACE_PAGE_BUTTONS_FRAGMENT_TAG);
if (placePageButtonsFragment != null)
{
mMwmActivity.getSupportFragmentManager().beginTransaction()
.remove(placePageButtonsFragment)
.commit();
}
Fragment placePageFragment = mMwmActivity.getSupportFragmentManager()
.findFragmentByTag(PLACE_PAGE_FRAGMENT_TAG);
if (placePageFragment != null)
{
mMwmActivity.getSupportFragmentManager().beginTransaction()
.remove(placePageFragment)
.commit();
}
mMwmActivity.getSupportFragmentManager().beginTransaction()
.remove(placePageButtonsFragment)
.commit();
}
else
Fragment placePageFragment = mMwmActivity.getSupportFragmentManager()
.findFragmentByTag(PLACE_PAGE_FRAGMENT_TAG);
if (placePageFragment != null)
{
if (mMwmActivity.getSupportFragmentManager()
.findFragmentByTag(PLACE_PAGE_FRAGMENT_TAG) == null)
{
mMwmActivity.getSupportFragmentManager().beginTransaction()
.add(R.id.placepage_fragment,
PlacePageView.class, null, PLACE_PAGE_FRAGMENT_TAG)
.commit();
}
if (mMwmActivity.getSupportFragmentManager()
.findFragmentByTag(PLACE_PAGE_BUTTONS_FRAGMENT_TAG) == null)
{
mMwmActivity.getSupportFragmentManager().beginTransaction()
.add(R.id.pp_buttons_fragment,
PlacePageButtons.class, null, PLACE_PAGE_BUTTONS_FRAGMENT_TAG)
.commit();
}
mMwmActivity.getSupportFragmentManager().beginTransaction()
.remove(placePageFragment)
.commit();
}
}
private void createPlacePageFragments()
{
if (mMwmActivity.getSupportFragmentManager()
.findFragmentByTag(PLACE_PAGE_FRAGMENT_TAG) == null)
{
mMwmActivity.getSupportFragmentManager().beginTransaction()
.add(R.id.placepage_fragment,
PlacePageView.class, null, PLACE_PAGE_FRAGMENT_TAG)
.commit();
}
if (mMwmActivity.getSupportFragmentManager()
.findFragmentByTag(PLACE_PAGE_BUTTONS_FRAGMENT_TAG) == null)
{
mMwmActivity.getSupportFragmentManager().beginTransaction()
.add(R.id.pp_buttons_fragment,
PlacePageButtons.class, null, PLACE_PAGE_BUTTONS_FRAGMENT_TAG)
.commit();
}
}
@Override
public void onChanged(MapObject mapObject)
{
onMapObjectChange(mapObject);
mMapObject = mapObject;
createPlacePageFragments();
}
@Override

5
android/src/app/organicmaps/widget/placepage/PlacePagePhoneFragment.java
View file

@ -50,9 +50,6 @@ public class PlacePagePhoneFragment extends Fragment implements Observer<MapObje
@Override
public void onChanged(MapObject mapObject)
{
if (mapObject != null)
{
mPhoneAdapter.refreshPhones(mapObject.getMetadata(Metadata.MetadataType.FMD_PHONE_NUMBER));
}
mPhoneAdapter.refreshPhones(mapObject.getMetadata(Metadata.MetadataType.FMD_PHONE_NUMBER));
}
}