From 62812518e524f0351298674a2c2b0ced5d9b9c52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 21 May 2021 15:11:26 -0400
Subject: [PATCH] account edition: cleanup, check for null
Change-Id: Id095715acc91b4140fe0e5e9ec81b5b3c75eca59
---
.../cx/ring/account/AccountEditionFragment.java | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/ring-android/app/src/main/java/cx/ring/account/AccountEditionFragment.java b/ring-android/app/src/main/java/cx/ring/account/AccountEditionFragment.java
index 72a60c4de..3989d840a 100644
--- a/ring-android/app/src/main/java/cx/ring/account/AccountEditionFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/account/AccountEditionFragment.java
@@ -165,7 +165,7 @@ public class AccountEditionFragment extends BaseSupportFragment<AccountEditionPr
}
@Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ public void onCreateOptionsMenu(Menu menu, @NonNull MenuInflater inflater) {
menu.clear();
}
@@ -182,7 +182,10 @@ public class AccountEditionFragment extends BaseSupportFragment<AccountEditionPr
}
public boolean onBackPressed() {
+ if (mBinding == null)
+ return false;
mIsVisible = false;
+
if (getActivity() instanceof HomeActivity)
((HomeActivity) getActivity()).setToolbarOutlineState(true);
if (mBinding.fragmentContainer.getVisibility() != View.VISIBLE) {
@@ -213,14 +216,15 @@ public class AccountEditionFragment extends BaseSupportFragment<AccountEditionPr
}
private void setBackListenerEnabled(boolean enable) {
- if (getActivity() instanceof HomeActivity)
- ((HomeActivity) getActivity()).setAccountFragmentOnBackPressedListener(enable ? this : null);
+ Activity activity = getActivity();
+ if (activity instanceof HomeActivity)
+ ((HomeActivity) activity).setAccountFragmentOnBackPressedListener(enable ? this : null);
}
private static class PreferencesPagerAdapter extends FragmentStatePagerAdapter {
- private Context mContext;
- private String accountId;
- private boolean isJamiAccount;
+ private final Context mContext;
+ private final String accountId;
+ private final boolean isJamiAccount;
PreferencesPagerAdapter(FragmentManager fm, Context mContext, String accountId, boolean isJamiAccount) {
super(fm);
--
GitLab