Merge branch 'jb38419' into 'master'

Enable voicecall record based on feature allowed. See merge request !15
sailfishos · Apr 27, 2017 · 6b49ca8 · 6b49ca8
2 parents 9541332 + b0f4ccf
commit 6b49ca8
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/plugins/declarative/src/voicecallaudiorecorder.cpp b/plugins/declarative/src/voicecallaudiorecorder.cpp
@@ -71,8 +71,8 @@ QDBusMessage createVoicecallFeaturesMessage(void)
 struct ManagerFeature
 {
     QString name;
-    unsigned unused1;
-    unsigned unused2;
+    unsigned allowed;
+    unsigned unused;
 };
 typedef QList<ManagerFeature> ManagerFeatureList;
 
@@ -83,8 +83,8 @@ QDBusArgument &operator<<(QDBusArgument &arg, const ManagerFeature &feature)
 {
     arg.beginStructure();
     arg << feature.name;
-    arg << feature.unused1;
-    arg << feature.unused2;
+    arg << feature.allowed;
+    arg << feature.unused;
     arg.endStructure();
     return arg;
 }
@@ -93,8 +93,8 @@ const QDBusArgument &operator>>(const QDBusArgument &arg, ManagerFeature &featur
 {
     arg.beginStructure();
     arg >> feature.name;
-    arg >> feature.unused1;
-    arg >> feature.unused2;
+    arg >> feature.allowed;
+    arg >> feature.unused;
     arg.endStructure();
     return arg;
 }
@@ -188,7 +188,8 @@ void VoiceCallAudioRecorder::featuresCallFinished(QDBusPendingCallWatcher *watch
     } else {
         const ManagerFeatureList features = reply.argumentAt<4>();
         foreach (const ManagerFeature &feature, features) {
-            if (feature.name == QStringLiteral("voicecallrecord")) {
+            if (feature.name == QStringLiteral("voicecallrecord") &&
+                feature.allowed == 1) {
                 featureAvailable = true;
                 emit availableChanged();
                 break;