karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

MarkerDetailFragment: load markerId once in onCreate().

Browse Source
This commit is contained in:
Dennis Guse
2020-12-13 17:12:03 +01:00
parent 1862e38a20
commit 96371336f4
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java
+11 -3
View File
@@ -62,6 +62,8 @@ public class MarkerDetailFragment extends Fragment {
private ContentProviderUtils contentProviderUtils; private ContentProviderUtils contentProviderUtils;
private Handler handler; private Handler handler;
private Marker.Id markerId;
private Marker marker; private Marker marker;
private MarkerDetailFragmentBinding viewBinding; private MarkerDetailFragmentBinding viewBinding;
@@ -104,7 +106,7 @@ public class MarkerDetailFragment extends Fragment {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
Marker.Id markerId = getArguments().getParcelable(KEY_MARKER_ID); markerId = getArguments().getParcelable(KEY_MARKER_ID);
if (markerId == null) { if (markerId == null) {
Log.d(TAG, "invalid marker id"); Log.d(TAG, "invalid marker id");
getParentFragmentManager().popBackStack(); getParentFragmentManager().popBackStack();
@@ -153,6 +155,13 @@ public class MarkerDetailFragment extends Fragment {
viewBinding = null; viewBinding = null;
} }
@Override
public void onDestroy() {
super.onDestroy();
markerId = null;
marker = null;
}
@Override @Override
public void setMenuVisibility(boolean menuVisible) { public void setMenuVisibility(boolean menuVisible) {
super.setMenuVisibility(menuVisible); super.setMenuVisibility(menuVisible);
@@ -182,7 +191,6 @@ public class MarkerDetailFragment extends Fragment {
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
Marker.Id markerId = getArguments().getParcelable(KEY_MARKER_ID); //TODO Should only happen in onCreate?
FragmentActivity fragmentActivity = getActivity(); FragmentActivity fragmentActivity = getActivity();
if (item.getItemId() == R.id.marker_detail_show_on_map) { if (item.getItemId() == R.id.marker_detail_show_on_map) {
@@ -216,7 +224,7 @@ public class MarkerDetailFragment extends Fragment {
private void updateMarker(boolean refresh) { private void updateMarker(boolean refresh) {
if (refresh || marker == null) { if (refresh || marker == null) {
marker = contentProviderUtils.getMarker(getArguments().getParcelable(KEY_MARKER_ID)); //TODO Should only happen in onCreate? marker = contentProviderUtils.getMarker(markerId);
if (marker == null) { if (marker == null) {
Log.d(TAG, "marker is null"); Log.d(TAG, "marker is null");
getParentFragmentManager().popBackStack(); getParentFragmentManager().popBackStack();