From 20367ce7cd1c0ef77890533c0f1ff8c07fbb556d Mon Sep 17 00:00:00 2001 From: Roman Tsisyk Date: Wed, 1 Mar 2023 11:17:02 +0200 Subject: [PATCH] [android] Fix a crash in Bundle.getParcelable() Partially revert b2da0b5e See #143 Signed-off-by: Roman Tsisyk --- android/src/app/organicmaps/MwmActivity.java | 2 +- .../organicmaps/base/BaseMwmFragmentActivity.java | 2 +- android/src/app/organicmaps/util/Utils.java | 12 ------------ 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/android/src/app/organicmaps/MwmActivity.java b/android/src/app/organicmaps/MwmActivity.java index 4832850435..9f08829bc5 100644 --- a/android/src/app/organicmaps/MwmActivity.java +++ b/android/src/app/organicmaps/MwmActivity.java @@ -960,7 +960,7 @@ public class MwmActivity extends BaseMwmFragmentActivity intent.hasExtra(EXTRA_TASK) && ((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0)) { - final MapTask mapTask = Utils.getSerializable(intent, EXTRA_TASK, MapTask.class); + final MapTask mapTask = (MapTask) intent.getSerializableExtra(EXTRA_TASK); mTasks.add(mapTask); intent.removeExtra(EXTRA_TASK); diff --git a/android/src/app/organicmaps/base/BaseMwmFragmentActivity.java b/android/src/app/organicmaps/base/BaseMwmFragmentActivity.java index 1e535d2fab..eac0459f84 100644 --- a/android/src/app/organicmaps/base/BaseMwmFragmentActivity.java +++ b/android/src/app/organicmaps/base/BaseMwmFragmentActivity.java @@ -74,7 +74,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity // An intent that was skipped due to core wasn't initialized has to be used // as a target intent for this activity, otherwise all input extras will be lost // in a splash activity loop. - Intent initialIntent = Utils.getParcelable(getIntent(), SplashActivity.EXTRA_INITIAL_INTENT, Intent.class); + Intent initialIntent = getIntent().getParcelableExtra(SplashActivity.EXTRA_INITIAL_INTENT); if (initialIntent != null) setIntent(initialIntent); diff --git a/android/src/app/organicmaps/util/Utils.java b/android/src/app/organicmaps/util/Utils.java index a599a68d60..eee93eeb76 100644 --- a/android/src/app/organicmaps/util/Utils.java +++ b/android/src/app/organicmaps/util/Utils.java @@ -814,12 +814,6 @@ public class Utils return (T) args.getParcelable(key); } - @Nullable - public static T getParcelable(@NonNull Intent intent, String key, Class clazz) - { - final Bundle args = intent.getExtras(); - return (args == null) ? null : getParcelable(args, key, clazz); - } @Nullable public static T getParcelable(@NonNull Bundle args, String key, Class clazz) @@ -846,12 +840,6 @@ public class Utils return args.getSerializable(key, clazz); } - @Nullable - public static T getSerializable(@NonNull Intent intent, String key, Class clazz) - { - final Bundle args = intent.getExtras(); - return (args == null) ? null : getSerializable(args, key, clazz); - } @SuppressWarnings("deprecation") private static Spanned fromHtmlOld(@NonNull String htmlDescription)