Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/linphone/chat/ChatActivity.java
View file

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

4
app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
View file

@ -258,6 +258,10 @@ public class ChatMessagesFragment extends Fragment
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.setEnabled(false);

8
app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
View file

@ -220,6 +220,14 @@ public class ChatRoomCreationFragment extends Fragment
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 =
new LinphoneLinearLayoutManager(getActivity().getApplicationContext());

1
app/src/main/res/values/non_localizable_custom.xml
View file

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