Merge lp:~ken-vandine/ubuntu-system-settings/lp1494442 into lp:ubuntu-system-settings

[Ken VanDine]

Used the correct property to determine if whoopsie will automatically report crashes

Used the correct property to determine if whoopsie will automatically report crashes

[lp:~ken-vandine/ubuntu-system-settings/lp1494442]

1539. By Ken VanDine on 2015-09-30

Fixed another occurance of canReportCrashes

[Jonas G. Drange (jonas-drange)]

Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1538
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2418/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4440
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/602
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3612
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4437
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4437/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23822

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2418/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

On 1 October 2015 at 05:32, PS Jenkins bot <email address hidden>
wrote:

> Review: Needs Fixing continuous-integration
>

​Test saw the ofono assertion error.

Oct 1 02:32:51 ubuntu-phablet kernel: [ 209.701938] init: ofono main
process (1270) killed by ABRT signal
Oct 1 02:32:51 ubuntu-phablet kernel: [ 209.701999] init: ofono main
process ended, respawning
​

=== modified file 'plugins/security-privacy/PageComponent.qml'
--- plugins/security-privacy/PageComponent.qml	2015-09-09 15:08:03 +0000
+++ plugins/security-privacy/PageComponent.qml	2015-09-30 14:58:14 +0000
@@ -212,7 +212,7 @@
             ListItem.SingleValue {
                 text: i18n.tr("Diagnostics")
                 progression: true
-                value: diagnosticsWidget.canReportCrashes ?
+                value: diagnosticsWidget.reportCrashes ?
                            /* TRANSLATORS: This string is shown when crash
                               reports are to be sent by the system. */
                            i18n.tr("Sent") :

=== modified file 'plugins/security-privacy/diagnostics/PageComponent.qml'
--- plugins/security-privacy/diagnostics/PageComponent.qml	2015-07-13 13:13:50 +0000
+++ plugins/security-privacy/diagnostics/PageComponent.qml	2015-09-30 14:58:14 +0000
@@ -33,7 +33,7 @@
     UbuntuDiagnostics {
         id: diagnosticsWidget
         function maybeUpdate() {
-            reportCrashesCheck.checked = diagnosticsWidget.canReportCrashes
+            reportCrashesCheck.checked = diagnosticsWidget.reportCrashes
         }
         onReportCrashesChanged: maybeUpdate()
     }
@@ -68,11 +68,11 @@
 
             DiagnosticsCheckEntry {
                 id: reportCrashesCheck
-                checked: diagnosticsWidget.canReportCrashes
+                checked: diagnosticsWidget.reportCrashes
                 onCheckedChanged: {
-                    diagnosticsWidget.canReportCrashes = checked;
+                    diagnosticsWidget.reportCrashes = checked;
                     /* Confirm the setting stuck and reflect it in the UI. */
-                    if (checked != diagnosticsWidget.canReportCrashes) {
+                    if (checked != diagnosticsWidget.reportCrashes) {
                         checked = !checked;
                     }
 

=== modified file 'plugins/security-privacy/diagnostics/diagnostics.cpp'
--- plugins/security-privacy/diagnostics/diagnostics.cpp	2014-06-12 15:12:58 +0000
+++ plugins/security-privacy/diagnostics/diagnostics.cpp	2015-09-30 14:58:14 +0000
@@ -71,10 +71,10 @@
     Q_EMIT reportCrashesChanged();
 }
 
-bool Diagnostics::canReportCrashes()
+bool Diagnostics::reportCrashes()
 {
     if (m_whoopsieInterface.isValid()) {
-        return m_whoopsieInterface.property("ReportCrashes").toBool();
+        return m_whoopsieInterface.property("AutomaticallyReportCrashes").toBool();
     }
     return false;
 }

=== modified file 'plugins/security-privacy/diagnostics/diagnostics.h'
--- plugins/security-privacy/diagnostics/diagnostics.h	2015-03-16 13:51:36 +0000
+++ plugins/security-privacy/diagnostics/diagnostics.h	2015-09-30 14:58:14 +0000
@@ -29,15 +29,15 @@
 class Diagnostics : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY( bool canReportCrashes
-                READ canReportCrashes
+    Q_PROPERTY( bool reportCrashes
+                READ reportCrashes
                 WRITE setReportCrashes
                 NOTIFY reportCrashesChanged )
 
 public:
     explicit Diagnostics(QObject *parent = 0);
     ~Diagnostics();
-    bool canReportCrashes();
+    bool reportCrashes();
     Q_INVOKABLE void setReportCrashes(bool report);
     Q_INVOKABLE QString systemIdentifier();