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

Fix to check value for "recording"

Browse Source 
with this fix it's also not necessary to check for HPB in the app. The "recording" value from capabilities is set accordingly on server side.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2023-01-31 14:26:37 +01:00
parent fba04620e1
commit 401bb6e2cf
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -2969,8 +2969,7 @@ public class CallActivity extends CallBaseActivity {
} }
public boolean isAllowedToStartOrStopRecording() { public boolean isAllowedToStartOrStopRecording() {
return CapabilitiesUtilNew.hasSpreedFeatureCapability(conversationUser, "recording-v1") && return CapabilitiesUtilNew.isCallRecordingAvailable(conversationUser)
CapabilitiesUtilNew.isCallRecordingAvailable(conversationUser)
&& isModerator; && isModerator;
} }

8
app/src/main/java/com/nextcloud/talk/utils/database/user/CapabilitiesUtilNew.kt
View File

@ -100,9 +100,13 @@ object CapabilitiesUtilNew {
@JvmStatic @JvmStatic
fun isCallRecordingAvailable(user: User): Boolean { fun isCallRecordingAvailable(user: User): Boolean {
if (user.capabilities?.spreedCapability?.config?.containsKey("call") == true) { if (hasSpreedFeatureCapability(user, "recording-v1") &&
user.capabilities?.spreedCapability?.config?.containsKey("call") == true
) {
val map: Map<String, String>? = user.capabilities!!.spreedCapability!!.config!!["call"] val map: Map<String, String>? = user.capabilities!!.spreedCapability!!.config!!["call"]
return map != null && map.containsKey("recording") if (map != null && map.containsKey("recording")) {
return map["recording"].toBoolean()
}
} }
return false return false
} }