From cb73aab9c04e1789a77b63ab6eb43b6ff6603229 Mon Sep 17 00:00:00 2001 From: Jasjeet Singh <98077881+07jasjeet@users.noreply.github.com> Date: Tue, 31 Oct 2023 17:31:55 +0530 Subject: [PATCH 01/11] Update AddCategoryFragment.java --- .../org/wordpress/android/ui/posts/AddCategoryFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/AddCategoryFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/AddCategoryFragment.java index adf27e66e604..36e137f71af0 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/AddCategoryFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/AddCategoryFragment.java @@ -96,7 +96,7 @@ private void initSite(Bundle savedInstanceState) { if (mSite == null) { ToastUtils.showToast(getActivity(), R.string.blog_not_found, ToastUtils.Duration.SHORT); - getFragmentManager().popBackStack(); + getParentFragmentManager().popBackStack(); } } From a3056561c738fc16b0f1809d94def4a7518336c1 Mon Sep 17 00:00:00 2001 From: Jasjeet Singh <98077881+07jasjeet@users.noreply.github.com> Date: Tue, 31 Oct 2023 17:32:14 +0530 Subject: [PATCH 02/11] Update FullScreenDialogFragment.java --- .../java/org/wordpress/android/ui/FullScreenDialogFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/FullScreenDialogFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/FullScreenDialogFragment.java index 69ff45ee5536..495a1d6eaa50 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/FullScreenDialogFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/FullScreenDialogFragment.java @@ -215,7 +215,7 @@ public void dismiss() { showActivityBar(); } - getFragmentManager().popBackStackImmediate(); + getParentFragmentManager().popBackStackImmediate(); } @Override From e5d81a6f5a71aee93259af2a69686f2958a313f9 Mon Sep 17 00:00:00 2001 From: Jasjeet Singh <98077881+07jasjeet@users.noreply.github.com> Date: Tue, 31 Oct 2023 17:32:39 +0530 Subject: [PATCH 03/11] Update DomainRegistrationDetailsFragment.kt --- .../DomainRegistrationDetailsFragment.kt | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsFragment.kt index 530d424c31a4..7083f0561cfd 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsFragment.kt @@ -379,22 +379,18 @@ class DomainRegistrationDetailsFragment : Fragment() { ) } - @Suppress("DEPRECATION") private fun showStatePicker(states: List) { val dialogFragment = StatePickerDialogFragment.newInstance(states.toCollection(ArrayList())) - dialogFragment.setTargetFragment(this, 0) - dialogFragment.show(requireFragmentManager(), StatePickerDialogFragment.TAG) + dialogFragment.show(childFragmentManager, StatePickerDialogFragment.TAG) } - @Suppress("DEPRECATION") private fun showCountryPicker(countries: List) { val dialogFragment = CountryPickerDialogFragment.newInstance( countries.toCollection( ArrayList() ) ) - dialogFragment.setTargetFragment(this, 0) - dialogFragment.show(requireFragmentManager(), CountryPickerDialogFragment.TAG) + dialogFragment.show(childFragmentManager, CountryPickerDialogFragment.TAG) } private fun DomainRegistrationDetailsFragmentBinding.toggleFormProgressIndictor(visible: Boolean) { @@ -472,13 +468,9 @@ class DomainRegistrationDetailsFragment : Fragment() { as ArrayList } - @Suppress("DEPRECATION", "UseCheckOrError") + @Suppress("UseCheckOrError") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - if (targetFragment == null) { - throw IllegalStateException("StatePickerDialogFragment is missing a targetFragment ") - } - - viewModel = ViewModelProvider(targetFragment!!, viewModelFactory) + viewModel = ViewModelProvider(requireParentFragment(), viewModelFactory) .get(DomainRegistrationDetailsViewModel::class.java) val builder = MaterialAlertDialogBuilder(requireContext()) builder.setTitle(R.string.domain_registration_state_picker_dialog_title) @@ -521,13 +513,9 @@ class DomainRegistrationDetailsFragment : Fragment() { as ArrayList } - @Suppress("DEPRECATION", "UseCheckOrError") + @Suppress("UseCheckOrError") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - if (targetFragment == null) { - throw IllegalStateException("CountryPickerDialogFragment is missing a targetFragment ") - } - - viewModel = ViewModelProvider(targetFragment!!, viewModelFactory) + viewModel = ViewModelProvider(requireParentFragment(), viewModelFactory) .get(DomainRegistrationDetailsViewModel::class.java) val builder = MaterialAlertDialogBuilder(requireContext()) builder.setTitle(R.string.domain_registration_country_picker_dialog_title) From 52e30cfddec6aca26a21ba5fb7fdbc37eaee8901 Mon Sep 17 00:00:00 2001 From: Jasjeet Singh <98077881+07jasjeet@users.noreply.github.com> Date: Tue, 31 Oct 2023 20:43:33 +0530 Subject: [PATCH 04/11] Update SignupEpilogueFragment.java --- .../android/ui/accounts/signup/SignupEpilogueFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java index c38d95726677..9e762cae2499 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java @@ -336,7 +336,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) { mImageManager.loadIntoCircle(mHeaderAvatar, ImageType.AVATAR_WITHOUT_BACKGROUND, mPhotoUrl); } } else { - mDialog = (FullScreenDialogFragment) getFragmentManager().findFragmentByTag(FullScreenDialogFragment.TAG); + mDialog = (FullScreenDialogFragment) getParentFragmentManager().findFragmentByTag(FullScreenDialogFragment.TAG); if (mDialog != null) { mDialog.setOnConfirmListener(this); @@ -603,7 +603,7 @@ protected void launchDialog() { .setContent(UsernameChangerFullScreenDialogFragment.class, bundle) .build(); - mDialog.show(getActivity().getSupportFragmentManager(), FullScreenDialogFragment.TAG); + mDialog.show(requireActivity().getSupportFragmentManager(), FullScreenDialogFragment.TAG); } protected void loadAvatar(final String avatarUrl, String injectFilePath) { From d895c944c81aba114a07c83f6a379d933e6d9255 Mon Sep 17 00:00:00 2001 From: Jasjeet Singh <98077881+07jasjeet@users.noreply.github.com> Date: Tue, 31 Oct 2023 20:43:48 +0530 Subject: [PATCH 05/11] Update CollapseFullScreenDialogFragment.java --- .../android/ui/CollapseFullScreenDialogFragment.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/CollapseFullScreenDialogFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/CollapseFullScreenDialogFragment.java index 7e694dfa9634..795801d2a42d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/CollapseFullScreenDialogFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/CollapseFullScreenDialogFragment.java @@ -191,8 +191,10 @@ public void dismiss() { showActivityBar(); } - if (getFragmentManager() != null) { - getFragmentManager().popBackStackImmediate(); + try { + getParentFragmentManager().popBackStackImmediate(); + } catch (IllegalStateException e) { + e.printStackTrace(); } } From 604424d5e0359c84300d9cde0869ab7cd2e3bc9d Mon Sep 17 00:00:00 2001 From: Jasjeet Singh <98077881+07jasjeet@users.noreply.github.com> Date: Tue, 31 Oct 2023 21:02:34 +0530 Subject: [PATCH 06/11] Update SitePickerActivity.java --- .../android/ui/main/SitePickerActivity.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java index 8360c304fa2c..f53c3e93d617 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java @@ -1,8 +1,6 @@ package org.wordpress.android.ui.main; -import android.app.Activity; import android.app.Dialog; -import android.app.DialogFragment; import android.content.Intent; import android.os.Bundle; import android.view.Menu; @@ -15,6 +13,8 @@ import androidx.appcompat.app.ActionBar; import androidx.appcompat.view.ActionMode; import androidx.appcompat.widget.SearchView; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentActivity; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.LinearLayoutManager; @@ -818,7 +818,7 @@ public void onDestroyActionMode(@NonNull ActionMode actionMode) { } } - public static void addSite(Activity activity, boolean hasAccessToken, SiteCreationSource source) { + public static void addSite(FragmentActivity activity, boolean hasAccessToken, SiteCreationSource source) { if (hasAccessToken) { if (!BuildConfig.ENABLE_ADD_SELF_HOSTED_SITE) { ActivityLauncher.newBlogForResult(activity, source); @@ -833,36 +833,36 @@ public static void addSite(Activity activity, boolean hasAccessToken, SiteCreati } } - @SuppressWarnings("deprecation") - private static void showAddSiteDialog(Activity activity, SiteCreationSource source) { + private static void showAddSiteDialog(FragmentActivity activity, SiteCreationSource source) { DialogFragment dialog = new AddSiteDialog(); Bundle args = new Bundle(); args.putString(ARG_SITE_CREATION_SOURCE, source.getLabel()); dialog.setArguments(args); - dialog.show(activity.getFragmentManager(), AddSiteDialog.ADD_SITE_DIALOG_TAG); + dialog.show(activity.getSupportFragmentManager(), AddSiteDialog.ADD_SITE_DIALOG_TAG); } - /* - * dialog which appears after user taps "Add site" - enables choosing whether to create - * a new wp.com blog or add an existing self-hosted one + /** + * Dialog which appears after user taps "Add site" - enables choosing whether to create + * a new wp.com blog or add an existing self-hosted one. + * + * @apiNote Must pass ARG_SITE_CREATION_SOURCE in arguments when creating this dialog. */ - @SuppressWarnings("deprecation") public static class AddSiteDialog extends DialogFragment { static final String ADD_SITE_DIALOG_TAG = "add_site_dialog"; @NonNull @Override - @SuppressWarnings("deprecation") public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { + assert getArguments() != null; SiteCreationSource source = SiteCreationSource.fromString(getArguments().getString(ARG_SITE_CREATION_SOURCE)); CharSequence[] items = {getString(R.string.site_picker_create_wpcom), getString(R.string.site_picker_add_self_hosted)}; - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity()); builder.setTitle(R.string.site_picker_add_site); builder.setAdapter( - new ArrayAdapter<>(getActivity(), R.layout.add_new_site_dialog_item, R.id.text, items), + new ArrayAdapter<>(requireActivity(), R.layout.add_new_site_dialog_item, R.id.text, items), (dialog, which) -> { if (which == 0) { ActivityLauncher.newBlogForResult(getActivity(), source); From 80dcb258fbf8315b7f695c4fc539697e6baaaf74 Mon Sep 17 00:00:00 2001 From: Jasjeet Singh <98077881+07jasjeet@users.noreply.github.com> Date: Tue, 31 Oct 2023 21:05:32 +0530 Subject: [PATCH 07/11] Update PersonDetailFragment.java --- .../org/wordpress/android/ui/people/PersonDetailFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java index 7359ea0625e0..e66c4090acc2 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java @@ -257,7 +257,7 @@ private void showRoleChangeDialog() { mSiteStore.getSiteByLocalId( mLocalTableBlogId), person.getRole()); - dialog.show(getFragmentManager(), null); + dialog.show(getChildFragmentManager(), null); } // used to optimistically update the role From c46e0ebf3d47f3a769a15f1f87cc06d9c8e3c222 Mon Sep 17 00:00:00 2001 From: Jasjeet Singh <98077881+07jasjeet@users.noreply.github.com> Date: Fri, 3 Nov 2023 22:21:54 +0530 Subject: [PATCH 08/11] Replaced NullPointerExpection inducing APIs Needs no testing. The behaviour should be same as the new API's will throw IllegalStateException instead of NullPointerException if activity was null. --- .../android/ui/people/PersonDetailFragment.java | 7 ++++--- .../android/ui/posts/AddCategoryFragment.java | 12 ++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java index e66c4090acc2..eef156a8fc70 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java @@ -83,9 +83,10 @@ public static PersonDetailFragment newInstance(long currentUserId, long personId @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - ((WordPress) getActivity().getApplicationContext()).component().inject(this); + ((WordPress) requireActivity().getApplicationContext()).component().inject(this); if (savedInstanceState == null) { + assert getArguments() != null; mCurrentUserId = getArguments().getLong(ARG_CURRENT_USER_ID); mPersonId = getArguments().getLong(ARG_PERSON_ID); mLocalTableBlogId = getArguments().getInt(ARG_LOCAL_TABLE_BLOG_ID); @@ -121,8 +122,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa final ViewGroup rootView = (ViewGroup) inflater.inflate(R.layout.person_detail_fragment, container, false); Toolbar toolbar = rootView.findViewById(R.id.toolbar_main); - ((AppCompatActivity) getActivity()).setSupportActionBar(toolbar); - ActionBar actionBar = ((AppCompatActivity) getActivity()).getSupportActionBar(); + ((AppCompatActivity) requireActivity()).setSupportActionBar(toolbar); + ActionBar actionBar = ((AppCompatActivity) requireActivity()).getSupportActionBar(); if (actionBar != null) { actionBar.setHomeButtonEnabled(true); actionBar.setDisplayHomeAsUpEnabled(true); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/AddCategoryFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/AddCategoryFragment.java index 36e137f71af0..55ff486ace81 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/AddCategoryFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/AddCategoryFragment.java @@ -45,14 +45,14 @@ public static AddCategoryFragment newInstance(SiteModel site) { @Override @NonNull public Dialog onCreateDialog(Bundle savedInstanceState) { - ((WordPress) getActivity().getApplication()).component().inject(this); + ((WordPress) requireActivity().getApplication()).component().inject(this); initSite(savedInstanceState); AlertDialog.Builder builder = new MaterialAlertDialogBuilder(new ContextThemeWrapper(getActivity(), R.style.PostSettingsTheme)); // Get the layout inflater - LayoutInflater inflater = getActivity().getLayoutInflater(); + LayoutInflater inflater = requireActivity().getLayoutInflater(); // Inflate view //noinspection InflateParams @@ -72,7 +72,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) { @Override public void onStart() { super.onStart(); - AlertDialog dialog = (AlertDialog) getDialog(); + AlertDialog dialog = (AlertDialog) requireDialog(); dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -88,14 +88,14 @@ private void initSite(Bundle savedInstanceState) { if (getArguments() != null) { mSite = (SiteModel) getArguments().getSerializable(WordPress.SITE); } else { - mSite = (SiteModel) getActivity().getIntent().getSerializableExtra(WordPress.SITE); + mSite = (SiteModel) requireActivity().getIntent().getSerializableExtra(WordPress.SITE); } } else { mSite = (SiteModel) savedInstanceState.getSerializable(WordPress.SITE); } if (mSite == null) { - ToastUtils.showToast(getActivity(), R.string.blog_not_found, ToastUtils.Duration.SHORT); + ToastUtils.showToast(requireActivity(), R.string.blog_not_found, ToastUtils.Duration.SHORT); getParentFragmentManager().popBackStack(); } } @@ -115,7 +115,7 @@ private boolean addCategory() { categoryName, parentId ); - ((SelectCategoriesActivity) getActivity()).categoryAdded(newCategory); + ((SelectCategoriesActivity) requireActivity()).categoryAdded(newCategory); return true; } From 1923c6f49e8cb6db32a60595e7c511cca74fcf28 Mon Sep 17 00:00:00 2001 From: Jasjeet Singh <98077881+07jasjeet@users.noreply.github.com> Date: Fri, 3 Nov 2023 22:22:27 +0530 Subject: [PATCH 09/11] Documentation updated with hyperlink --- .../java/org/wordpress/android/ui/main/SitePickerActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java index f53c3e93d617..84a27da1a192 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java @@ -845,7 +845,7 @@ private static void showAddSiteDialog(FragmentActivity activity, SiteCreationSou * Dialog which appears after user taps "Add site" - enables choosing whether to create * a new wp.com blog or add an existing self-hosted one. * - * @apiNote Must pass ARG_SITE_CREATION_SOURCE in arguments when creating this dialog. + * @apiNote Must pass {@link SitePickerActivity#ARG_SITE_CREATION_SOURCE} in arguments when creating this dialog. */ public static class AddSiteDialog extends DialogFragment { static final String ADD_SITE_DIALOG_TAG = "add_site_dialog"; From 47a9845620e8745e34e8486324d353c2818c09ed Mon Sep 17 00:00:00 2001 From: Jasjeet Singh <98077881+07jasjeet@users.noreply.github.com> Date: Fri, 3 Nov 2023 22:26:08 +0530 Subject: [PATCH 10/11] Checkstyle error resolved --- .../android/ui/accounts/signup/SignupEpilogueFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java index 9e762cae2499..ece755888abb 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java @@ -336,7 +336,8 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) { mImageManager.loadIntoCircle(mHeaderAvatar, ImageType.AVATAR_WITHOUT_BACKGROUND, mPhotoUrl); } } else { - mDialog = (FullScreenDialogFragment) getParentFragmentManager().findFragmentByTag(FullScreenDialogFragment.TAG); + mDialog = (FullScreenDialogFragment) getParentFragmentManager() + .findFragmentByTag(FullScreenDialogFragment.TAG); if (mDialog != null) { mDialog.setOnConfirmListener(this); From 95a913e17164fbe8c0b884d2e8e582b7d2ff08a0 Mon Sep 17 00:00:00 2001 From: Jasjeet Singh <98077881+07jasjeet@users.noreply.github.com> Date: Tue, 7 Nov 2023 17:07:54 +0530 Subject: [PATCH 11/11] Requested changes 1) Used requireArguments() instead of assertion. --- .../wordpress/android/ui/main/SitePickerActivity.java | 3 +-- .../android/ui/people/PersonDetailFragment.java | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java index 84a27da1a192..416595459885 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java @@ -853,9 +853,8 @@ public static class AddSiteDialog extends DialogFragment { @NonNull @Override public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { - assert getArguments() != null; SiteCreationSource source = - SiteCreationSource.fromString(getArguments().getString(ARG_SITE_CREATION_SOURCE)); + SiteCreationSource.fromString(requireArguments().getString(ARG_SITE_CREATION_SOURCE)); CharSequence[] items = {getString(R.string.site_picker_create_wpcom), getString(R.string.site_picker_add_self_hosted)}; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java index eef156a8fc70..0a75b0f9a5e5 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java @@ -86,11 +86,10 @@ public void onCreate(@Nullable Bundle savedInstanceState) { ((WordPress) requireActivity().getApplicationContext()).component().inject(this); if (savedInstanceState == null) { - assert getArguments() != null; - mCurrentUserId = getArguments().getLong(ARG_CURRENT_USER_ID); - mPersonId = getArguments().getLong(ARG_PERSON_ID); - mLocalTableBlogId = getArguments().getInt(ARG_LOCAL_TABLE_BLOG_ID); - mPersonType = (Person.PersonType) getArguments().getSerializable(ARG_PERSON_TYPE); + mCurrentUserId = requireArguments().getLong(ARG_CURRENT_USER_ID); + mPersonId = requireArguments().getLong(ARG_PERSON_ID); + mLocalTableBlogId = requireArguments().getInt(ARG_LOCAL_TABLE_BLOG_ID); + mPersonType = (Person.PersonType) requireArguments().getSerializable(ARG_PERSON_TYPE); } else { mCurrentUserId = savedInstanceState.getLong(ARG_CURRENT_USER_ID); mPersonId = savedInstanceState.getLong(ARG_PERSON_ID);