Fix track menu opening
This commit is contained in:
parent
c697bf43d5
commit
7c2abb67a4
1 changed files with 9 additions and 7 deletions
|
@ -60,7 +60,6 @@ import net.osmand.plus.UiUtilities;
|
|||
import net.osmand.plus.UiUtilities.UpdateLocationViewCache;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.activities.MapActivityActions;
|
||||
import net.osmand.plus.activities.TrackActivity;
|
||||
import net.osmand.plus.base.ContextMenuFragment;
|
||||
import net.osmand.plus.base.ContextMenuScrollFragment;
|
||||
import net.osmand.plus.helpers.AndroidUiHelper;
|
||||
|
@ -1044,15 +1043,18 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
|
|||
}
|
||||
|
||||
public static void openTrack(@NonNull Context context, @Nullable File file, Bundle prevIntentParams) {
|
||||
Bundle bundle = new Bundle();
|
||||
bundle.putBoolean(OPEN_TRACK_MENU, true);
|
||||
if (file == null) {
|
||||
bundle.putBoolean(TrackActivity.CURRENT_RECORDING, true);
|
||||
boolean currentRecording = file == null;
|
||||
String path = file != null ? file.getAbsolutePath() : null;
|
||||
if (context instanceof MapActivity) {
|
||||
TrackMenuFragment.showInstance((MapActivity) context, path, currentRecording);
|
||||
} else {
|
||||
bundle.putString(TrackActivity.TRACK_FILE_NAME, file.getAbsolutePath());
|
||||
}
|
||||
Bundle bundle = new Bundle();
|
||||
bundle.putString(TRACK_FILE_NAME, path);
|
||||
bundle.putBoolean(OPEN_TRACK_MENU, true);
|
||||
bundle.putBoolean(CURRENT_RECORDING, currentRecording);
|
||||
MapActivity.launchMapActivityMoveToTop(context, prevIntentParams, null, bundle);
|
||||
}
|
||||
}
|
||||
|
||||
public static void showInstance(@NonNull final MapActivity mapActivity, @Nullable String path, boolean showCurrentTrack) {
|
||||
OsmandApplication app = mapActivity.getMyApplication();
|
||||
|
|
Loading…
Reference in a new issue