Fix savedInstanceState crash.
parent
d3c59585fd
commit
7baf8052a2
|
@ -62,7 +62,6 @@ import static org.thoughtcrime.securesms.profiles.edit.EditProfileActivity.SHOW_
|
||||||
public class EditProfileFragment extends LoggingFragment {
|
public class EditProfileFragment extends LoggingFragment {
|
||||||
|
|
||||||
private static final String TAG = Log.tag(EditProfileFragment.class);
|
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 short REQUEST_CODE_SELECT_AVATAR = 31726;
|
||||||
private static final int MAX_GROUP_NAME_LENGTH = 32;
|
private static final int MAX_GROUP_NAME_LENGTH = 32;
|
||||||
|
|
||||||
|
@ -136,20 +135,6 @@ public class EditProfileFragment extends LoggingFragment {
|
||||||
viewModel.refreshUsername();
|
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
|
@Override
|
||||||
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||||
super.onActivityResult(requestCode, resultCode, data);
|
super.onActivityResult(requestCode, resultCode, data);
|
||||||
|
@ -200,7 +185,8 @@ public class EditProfileFragment extends LoggingFragment {
|
||||||
|
|
||||||
EditProfileViewModel.Factory factory = new EditProfileViewModel.Factory(repository, hasSavedInstanceState, groupId);
|
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) {
|
private void initializeResources(@NonNull View view, boolean isEditingGroup) {
|
||||||
|
|
|
@ -91,11 +91,6 @@ class EditProfileViewModel extends ViewModel {
|
||||||
return hasAvatar();
|
return hasAvatar();
|
||||||
}
|
}
|
||||||
|
|
||||||
@MainThread
|
|
||||||
public byte[] getAvatarSnapshot() {
|
|
||||||
return internalAvatar.getValue();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setGivenName(String givenName) {
|
public void setGivenName(String givenName) {
|
||||||
this.givenName.setValue(givenName);
|
this.givenName.setValue(givenName);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue