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

Hiding LIME & group chat feature if default proxy config doesn't supports it + cleaning non_localizable_custom

Browse source
This commit is contained in:
Sylvain Berfini 2018-11-08 16:29:28 +01:00
parent ab5951ef25
commit 9402df1a0e
3 changed files with 104 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/values/non_localizable_custom.xml
View file

@ -13,6 +13,7 @@
<bool name="show_statusbar_only_on_dialer">false</bool> <bool name="show_statusbar_only_on_dialer">false</bool>
<bool name="force_use_of_linphone_friends">false</bool> <bool name="force_use_of_linphone_friends">false</bool>
<bool name="use_linphone_tag">true</bool> <bool name="use_linphone_tag">true</bool>
<bool name="hide_bottom_bar_on_second_level_views">true</bool>
<!-- Time --> <!-- Time -->
<string name="history_date_format">EEE, d MMM</string> <string name="history_date_format">EEE, d MMM</string>

6
src/android/org/linphone/chat/ChatCreationFragment.java
View file

@ -167,9 +167,9 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen
mSecurityToggle.setChecked(mChatRoomEncrypted); mSecurityToggle.setChecked(mChatRoomEncrypted);
ProxyConfig lpc = LinphoneManager.getLc().getDefaultProxyConfig(); ProxyConfig lpc = LinphoneManager.getLc().getDefaultProxyConfig();
if ((mChatRoomSubject != null && mChatRoomAddress != null) || (lpc == null || lpc.getConferenceFactoryUri() == null)) { if ((mChatRoomSubject != null && mChatRoomAddress != null) || (lpc == null || lpc.getConferenceFactoryUri() == null)) {
mSecurityToggle.setEnabled(false); mSecurityToggle.setVisibility(View.GONE);
mSecurityToggleOn.setOnClickListener(null); mSecurityToggleOn.setVisibility(View.GONE);
mSecurityToggleOff.setOnClickListener(null); mSecurityToggleOff.setVisibility(View.GONE);
} }
LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity().getApplicationContext()); LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity().getApplicationContext());

2
src/android/org/linphone/chat/ChatListFragment.java
View file

@ -212,7 +212,7 @@ public class ChatListFragment extends Fragment implements ContactsUpdatedListene
refreshChatRoomsList(); refreshChatRoomsList();
ProxyConfig lpc = lc.getDefaultProxyConfig(); ProxyConfig lpc = lc.getDefaultProxyConfig();
mNewGroupDiscussionButton.setEnabled(lpc != null && lpc.getConferenceFactoryUri() != null); mNewGroupDiscussionButton.setVisibility((lpc != null && lpc.getConferenceFactoryUri() != null) ? View.VISIBLE : View.GONE);
} }
@Override @Override