TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 19:37:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix crash in RecipientPreferenceActivity

Browse Source 
fixes #4674
closes #4679

// FREEBIE
This commit is contained in:
agrajaghh
2015-11-22 22:09:12 +01:00
parent e914496216
commit 4dce79334d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
View File

@@ -220,9 +220,9 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
} }
if (!recipients.isSingleRecipient() || recipients.isGroupRecipient()) { if (!recipients.isSingleRecipient() || recipients.isGroupRecipient()) {
this.getPreferenceScreen().removePreference(colorPreference); if (colorPreference != null) getPreferenceScreen().removePreference(colorPreference);
this.getPreferenceScreen().removePreference(blockPreference); if (blockPreference != null) getPreferenceScreen().removePreference(blockPreference);
this.getPreferenceScreen().removePreference(identityPreference); if (identityPreference != null) getPreferenceScreen().removePreference(identityPreference);
} else { } else {
colorPreference.setChoices(MaterialColors.CONVERSATION_PALETTE.asConversationColorArray(getActivity())); colorPreference.setChoices(MaterialColors.CONVERSATION_PALETTE.asConversationColorArray(getActivity()));
colorPreference.setValue(recipients.getColor().toActionBarColor(getActivity())); colorPreference.setValue(recipients.getColor().toActionBarColor(getActivity()));