yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-06 03:49:58 +02:00
Code Issues Releases Wiki Activity

replace 'half blocked' by 'contact request'

Browse source
This commit is contained in:
B. Petersen 2025-07-19 12:50:59 +02:00 • committed by bjoern
parent 9e87a4b2a8
commit 5ff8101c2c
3 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/b44t/messenger/DcChat.java
View file

@ -68,10 +68,6 @@ public class DcChat {
return getType() == DC_CHAT_TYPE_OUT_BROADCAST; return getType() == DC_CHAT_TYPE_OUT_BROADCAST;
} }
public boolean isHalfBlocked() {
return isContactRequest();
}
// working with raw c-data // working with raw c-data
private long chatCPtr; // CAVE: the name is referenced in the JNI private long chatCPtr; // CAVE: the name is referenced in the JNI

2
src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
View file

@ -1610,7 +1610,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
} }
public void initializeContactRequest() { public void initializeContactRequest() {
if (!dcChat.isHalfBlocked()) { if (!dcChat.isContactRequest()) {
messageRequestBottomView.setVisibility(View.GONE); messageRequestBottomView.setVisibility(View.GONE);
return; return;
} }

2
src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
View file

@ -825,7 +825,7 @@ public class ConversationFragment extends MessageSelectorFragment
public void onShowFullClicked(DcMsg messageRecord) { public void onShowFullClicked(DcMsg messageRecord) {
Intent intent = new Intent(getActivity(), FullMsgActivity.class); Intent intent = new Intent(getActivity(), FullMsgActivity.class);
intent.putExtra(FullMsgActivity.MSG_ID_EXTRA, messageRecord.getId()); 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); startActivity(intent);
getActivity().overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out); getActivity().overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
} }