diff --git a/src/main/java/com/b44t/messenger/DcChat.java b/src/main/java/com/b44t/messenger/DcChat.java index b4db76c5c..7d5e2597d 100644 --- a/src/main/java/com/b44t/messenger/DcChat.java +++ b/src/main/java/com/b44t/messenger/DcChat.java @@ -68,10 +68,6 @@ public class DcChat { return getType() == DC_CHAT_TYPE_OUT_BROADCAST; } - public boolean isHalfBlocked() { - return isContactRequest(); - } - // working with raw c-data private long chatCPtr; // CAVE: the name is referenced in the JNI diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java index 74500bad9..0d1030d2c 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java @@ -1610,7 +1610,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } public void initializeContactRequest() { - if (!dcChat.isHalfBlocked()) { + if (!dcChat.isContactRequest()) { messageRequestBottomView.setVisibility(View.GONE); return; } diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java index 1644218c3..60d93ad5f 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java @@ -825,7 +825,7 @@ public class ConversationFragment extends MessageSelectorFragment public void onShowFullClicked(DcMsg messageRecord) { Intent intent = new Intent(getActivity(), FullMsgActivity.class); intent.putExtra(FullMsgActivity.MSG_ID_EXTRA, messageRecord.getId()); - intent.putExtra(FullMsgActivity.BLOCK_LOADING_REMOTE, getListAdapter().getChat().isHalfBlocked()); + intent.putExtra(FullMsgActivity.BLOCK_LOADING_REMOTE, getListAdapter().getChat().isContactRequest()); startActivity(intent); getActivity().overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out); }