浏览代码

Fix to check value for "recording"

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>
Marcel Hibbe 2 年之前
父节点
当前提交
401bb6e2cf

+ 1 - 2
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java

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

+ 6 - 2
app/src/main/java/com/nextcloud/talk/utils/database/user/CapabilitiesUtilNew.kt

@@ -100,9 +100,13 @@ object CapabilitiesUtilNew {
 
     @JvmStatic
     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"]
-            return map != null && map.containsKey("recording")
+            if (map != null && map.containsKey("recording")) {
+                return map["recording"].toBoolean()
+            }
         }
         return false
     }