From 7baf8052a2016093757234fbebf792268a8d2534 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 10 Sep 2020 16:58:05 -0300 Subject: [PATCH] Fix savedInstanceState crash. --- .../profiles/edit/EditProfileFragment.java | 18 ++---------------- .../profiles/edit/EditProfileViewModel.java | 5 ----- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java index 809f24b8d3..7766d84a6b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java @@ -62,7 +62,6 @@ import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.SHOW_ public class EditProfileFragment extends LoggingFragment { private static final String TAG = Log.tag(EditProfileFragment.class); - private static final String AVATAR_STATE = "avatar"; private static final short REQUEST_CODE_SELECT_AVATAR = 31726; private static final int MAX_GROUP_NAME_LENGTH = 32; @@ -136,20 +135,6 @@ public class EditProfileFragment extends LoggingFragment { viewModel.refreshUsername(); } - @Override - public void onSaveInstanceState(@NonNull Bundle outState) { - outState.putByteArray(AVATAR_STATE, viewModel.getAvatarSnapshot()); - } - - @Override - public void onViewStateRestored(@Nullable Bundle savedInstanceState) { - super.onViewStateRestored(savedInstanceState); - - if (savedInstanceState != null && savedInstanceState.containsKey(AVATAR_STATE)) { - viewModel.setAvatar(savedInstanceState.getByteArray(AVATAR_STATE)); - } - } - @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); @@ -200,7 +185,8 @@ public class EditProfileFragment extends LoggingFragment { EditProfileViewModel.Factory factory = new EditProfileViewModel.Factory(repository, hasSavedInstanceState, groupId); - viewModel = ViewModelProviders.of(this, factory).get(EditProfileViewModel.class); + viewModel = ViewModelProviders.of(requireActivity(), factory) + .get(EditProfileViewModel.class); } private void initializeResources(@NonNull View view, boolean isEditingGroup) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileViewModel.java index 3d515005c6..261037362e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileViewModel.java @@ -91,11 +91,6 @@ class EditProfileViewModel extends ViewModel { return hasAvatar(); } - @MainThread - public byte[] getAvatarSnapshot() { - return internalAvatar.getValue(); - } - public void setGivenName(String givenName) { this.givenName.setValue(givenName); }