gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-02-02 20:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1993 from nextcloud/feature/1883/disableCalls

Browse Source 
disable call buttons if calls are disabled by capability
This commit is contained in:
Marcel Hibbe 2022-05-10 16:06:55 +02:00 committed by GitHub
commit 8376f1fab2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 108 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -411,7 +411,7 @@ class ChatController(args: Bundle) :
}
private fun loadAvatarForStatusBar() {
if (inOneToOneCall() && activity != null && conversationVoiceCallMenuItem != null) {
if (inOneToOneCall() && activity != null) {
val imageRequest = DisplayUtils.getImageRequestForUrl(
ApiUtils.getUrlForAvatar(
@ -1159,33 +1159,54 @@ class ChatController(args: Bundle) :
}
private fun checkReadOnlyState() {
if (currentConversation != null && isAlive()) {
if (currentConversation?.shouldShowLobby(conversationUser) ?: false ||
currentConversation?.conversationReadOnlyState != null &&
currentConversation?.conversationReadOnlyState ==
Conversation.ConversationReadOnlyState.CONVERSATION_READ_ONLY
) {
conversationVoiceCallMenuItem?.icon?.alpha = SEMI_TRANSPARENT_INT
conversationVideoMenuItem?.icon?.alpha = SEMI_TRANSPARENT_INT
binding.messageInputView.visibility = View.GONE
} else {
if (conversationVoiceCallMenuItem != null) {
conversationVoiceCallMenuItem?.icon?.alpha = FULLY_OPAQUE_INT
}
if (conversationVideoMenuItem != null) {
conversationVideoMenuItem?.icon?.alpha = FULLY_OPAQUE_INT
}
if (currentConversation != null && currentConversation!!.shouldShowLobby(conversationUser)
) {
if (isAlive()) {
if (isReadOnlyConversation() || shouldShowLobby()) {
disableCallButtons()
binding.messageInputView.visibility = View.GONE
} else {
enableCallButtons()
binding.messageInputView.visibility = View.VISIBLE
}
}
}
private fun shouldShowLobby(): Boolean {
if (currentConversation != null) {
return currentConversation?.shouldShowLobby(conversationUser) == true
}
return false
}
private fun disableCallButtons() {
if (CapabilitiesUtil.isAbleToCall(conversationUser)) {
if (conversationVoiceCallMenuItem != null && conversationVideoMenuItem != null) {
conversationVoiceCallMenuItem?.icon?.alpha = SEMI_TRANSPARENT_INT
conversationVideoMenuItem?.icon?.alpha = SEMI_TRANSPARENT_INT
conversationVoiceCallMenuItem?.isEnabled = false
conversationVideoMenuItem?.isEnabled = false
} else {
Log.e(TAG, "call buttons were null when trying to disable them")
}
}
}
private fun enableCallButtons() {
if (CapabilitiesUtil.isAbleToCall(conversationUser)) {
if (conversationVoiceCallMenuItem != null && conversationVideoMenuItem != null) {
conversationVoiceCallMenuItem?.icon?.alpha = FULLY_OPAQUE_INT
conversationVideoMenuItem?.icon?.alpha = FULLY_OPAQUE_INT
conversationVoiceCallMenuItem?.isEnabled = true
conversationVideoMenuItem?.isEnabled = true
} else {
Log.e(TAG, "call buttons were null when trying to enable them")
}
}
}
private fun isReadOnlyConversation(): Boolean {
return currentConversation?.conversationReadOnlyState != null &&
currentConversation?.conversationReadOnlyState ==
Conversation.ConversationReadOnlyState.CONVERSATION_READ_ONLY
}
private fun checkLobbyState() {
@ -2300,14 +2321,11 @@ class ChatController(args: Bundle) :
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
super.onCreateOptionsMenu(menu, inflater)
inflater.inflate(R.menu.menu_conversation, menu)
if (conversationUser?.userId == "?") {
menu.removeItem(R.id.conversation_info)
conversationVoiceCallMenuItem = menu.findItem(R.id.conversation_voice_call)
conversationVideoMenuItem = menu.findItem(R.id.conversation_video_call)
} else {
conversationInfoMenuItem = menu.findItem(R.id.conversation_info)
conversationVoiceCallMenuItem = menu.findItem(R.id.conversation_voice_call)
conversationVideoMenuItem = menu.findItem(R.id.conversation_video_call)
if (CapabilitiesUtil.hasSpreedFeatureCapability(conversationUser, "rich-object-list-media")) {
conversationSharedItemsItem = menu.findItem(R.id.shared_items)
@ -2317,6 +2335,14 @@ class ChatController(args: Bundle) :
loadAvatarForStatusBar()
}
if (CapabilitiesUtil.isAbleToCall(conversationUser)) {
conversationVoiceCallMenuItem = menu.findItem(R.id.conversation_voice_call)
conversationVideoMenuItem = menu.findItem(R.id.conversation_video_call)
} else {
menu.removeItem(R.id.conversation_video_call)
menu.removeItem(R.id.conversation_voice_call)
}
}
override fun onPrepareOptionsMenu(menu: Menu) {
@ -2335,19 +2361,13 @@ class ChatController(args: Bundle) :
return true
}
R.id.conversation_video_call -> {
if (conversationVideoMenuItem?.icon?.alpha == FULLY_OPAQUE_INT) {
startACall(false)
return true
}
return false
}
R.id.conversation_voice_call -> {
if (conversationVoiceCallMenuItem?.icon?.alpha == FULLY_OPAQUE_INT) {
startACall(true)
return true
}
return false
}
R.id.conversation_info -> {
showConversationInfoScreen()
return true

23
app/src/main/java/com/nextcloud/talk/models/database/CapabilitiesUtil.java
View File

@ -258,4 +258,27 @@ public abstract class CapabilitiesUtil {
}
return false;
}
public static boolean isAbleToCall(@Nullable UserEntity user) {
if (user != null && user.getCapabilities() != null) {
try {
Capabilities capabilities = LoganSquare.parse(user.getCapabilities(), Capabilities.class);
if (capabilities != null &&
capabilities.getSpreedCapability() != null &&
capabilities.getSpreedCapability().getConfig() != null &&
capabilities.getSpreedCapability().getConfig().containsKey("call") &&
capabilities.getSpreedCapability().getConfig().get("call") != null &&
capabilities.getSpreedCapability().getConfig().get("call").containsKey("enabled")) {
return Boolean.parseBoolean(
capabilities.getSpreedCapability().getConfig().get("call").get("enabled"));
} else {
// older nextcloud versions without the capability can't disable the calls
return true;
}
} catch (IOException e) {
Log.e(TAG, "Failed to get capabilities for the user", e);
}
}
return false;
}
}