Added force end-to-end encryption option + fixed disable chat send file option

This commit is contained in:
Sylvain Berfini 2019-05-16 11:29:15 +02:00
parent 121bafc8aa
commit 11f292f835
4 changed files with 25 additions and 6 deletions

View file

@ -162,12 +162,18 @@ public class ChatActivity extends MainActivity {
} }
} }
if (sharedText != null || sharedFiles != null) { if (!getResources().getBoolean(R.bool.disable_chat_send_file)) {
mSharedText = sharedText; if (sharedText != null || sharedFiles != null) {
mSharedFiles = sharedFiles; mSharedText = sharedText;
Toast.makeText(this, R.string.toast_choose_chat_room_for_sharing, Toast.LENGTH_LONG) mSharedFiles = sharedFiles;
.show(); Toast.makeText(this, R.string.toast_choose_chat_room_for_sharing, Toast.LENGTH_LONG)
Log.i("[Chat Activity] Sharing arguments found: " + mSharedText + " / " + mSharedFiles); .show();
Log.i(
"[Chat Activity] Sharing arguments found: "
+ mSharedText
+ " / "
+ mSharedFiles);
}
} }
} }

View file

@ -258,6 +258,10 @@ public class ChatMessagesFragment extends Fragment
pickFile(); pickFile();
} }
}); });
if (getResources().getBoolean(R.bool.disable_chat_send_file)) {
mAttachImageButton.setEnabled(false);
mAttachImageButton.setVisibility(View.GONE);
}
mSendMessageButton = view.findViewById(R.id.send_message); mSendMessageButton = view.findViewById(R.id.send_message);
mSendMessageButton.setEnabled(false); mSendMessageButton.setEnabled(false);

View file

@ -220,6 +220,14 @@ public class ChatRoomCreationFragment extends Fragment
securityToggleOff.setVisibility(View.GONE); securityToggleOff.setVisibility(View.GONE);
} }
if (getResources().getBoolean(R.bool.force_end_to_end_encryption_in_chat)) {
mSecurityToggle.setChecked(true);
mSearchAdapter.setSecurityEnabled(true);
mSecurityToggle.setVisibility(View.GONE);
securityToggleOn.setVisibility(View.GONE);
securityToggleOff.setVisibility(View.GONE);
}
LinearLayoutManager layoutManager = LinearLayoutManager layoutManager =
new LinphoneLinearLayoutManager(getActivity().getApplicationContext()); new LinphoneLinearLayoutManager(getActivity().getApplicationContext());

View file

@ -95,6 +95,7 @@
<bool name="show_sip_uri_in_chat">false</bool> <bool name="show_sip_uri_in_chat">false</bool>
<bool name="hide_empty_one_to_one_chat_rooms">true</bool> <bool name="hide_empty_one_to_one_chat_rooms">true</bool>
<bool name="create_most_recent_chat_rooms_shortcuts">true</bool> <bool name="create_most_recent_chat_rooms_shortcuts">true</bool>
<bool name="force_end_to_end_encryption_in_chat">false</bool>
<!-- Contacts --> <!-- Contacts -->
<bool name="hide_contact_phone_numbers">false</bool> <bool name="hide_contact_phone_numbers">false</bool>