blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix savedInstanceState crash.

master
Alex Hart 2020-09-10 16:58:05 -03:00 committed by Greyson Parrelli
parent d3c59585fd
commit 7baf8052a2
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java
View File

@ -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) {

5
app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileViewModel.java
View File

@ -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);
}