Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-06-08 16:26:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash on recipient preference change for non-signal user

Browse Source 
Fixes #5760
// FREEBIe
This commit is contained in:
Moxie Marlinspike
2016-10-08 14:04:33 -07:00
parent 338c0d82e1
commit 21258f244c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
+4 -4
View File
@@ -295,16 +295,16 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
@Override
public void onSuccess(Optional<IdentityKey> result) {
if (result.isPresent()) {
identityPreference.setOnPreferenceClickListener(new IdentityClickedListener(result.get()));
identityPreference.setEnabled(true);
if (identityPreference != null) identityPreference.setOnPreferenceClickListener(new IdentityClickedListener(result.get()));
if (identityPreference != null) identityPreference.setEnabled(true);
} else {
getPreferenceScreen().removePreference(identityPreference);
if (identityPreference != null) getPreferenceScreen().removePreference(identityPreference);
}
}
@Override
public void onFailure(ExecutionException e) {
getPreferenceScreen().removePreference(identityPreference);
if (identityPreference != null) getPreferenceScreen().removePreference(identityPreference);
}
});
}