git.iko.soy/unity8
on xenial help sign in
Merge pull request #77 from ubports/xenial_-_disable-apport

Disable apport

commit8134948431f1ac1d41589e4f6868e7636e6b760c authorRodney <6557070+dobey@users.noreply.github.com> dateWed 10 Oct 2018, 21:31 (8 years ago) parent99fdac3978c798
2 files changed+1−108
compare with xenial
unifiedsplit
qml/Wizard/Pages/75-report-check.qml−92 tests/qmltests/Wizard/tst_Wizard.qml+1−16
qml/Wizard/Pages/75-report-check.qmldeleted−92
@@ -1,92 +0,0 @@
1−/*
2− * Copyright (C) 2015-2016 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.4
18−import Ubuntu.Components 1.3
19−import Ubuntu.Web 0.2
20−import ".." as LocalComponents
21−
22−LocalComponents.Page {
23− id: reportingPage
24− objectName: "reportingPage"
25−
26− title: webview.visible ? i18n.tr("Privacy Policy") : i18n.tr("Help Us Improve")
27− forwardButtonSourceComponent: !webview.visible ? forwardButton : null
28− customBack: true
29− customTitle: webview.visible
30− onlyOnInstall: true
31−
32− skip: !diagnostics.reportCrashes // skip the page when the system is configured not to report crashes
33−
34− onBackClicked: {
35− if (webview.visible) {
36− webview.visible = false;
37− } else {
38− pageStack.prev();
39− }
40− }
41−
42− Column {
43− id: column
44− anchors {
45− fill: content
46− leftMargin: leftMargin
47− rightMargin: rightMargin
48− topMargin: customMargin
49− }
50−
51− LocalComponents.CheckableSetting {
52− anchors {
53− left: parent.left
54− right: parent.right
55− }
56−
57− id: reportCheck
58− objectName: "reportCheck"
59− showDivider: false
60− text: i18n.tr("Improve system performance by sending us crashes and error reports.") + "<br><br><a href='#'>" +
61− i18n.tr("Privacy policy") + "</a>"
62− checked: diagnostics.reportCrashes
63− visible: !webview.visible
64− onLinkActivated: {
65− webview.url = "http://www.ubuntu.com/legal/terms-and-policies/privacy-policy";
66− webview.visible = true;
67− }
68− }
69−
70− WebView {
71− id: webview
72− objectName: "webview"
73− anchors.left: parent.left
74− anchors.right: parent.right
75− anchors.leftMargin: -leftMargin
76− anchors.rightMargin: -rightMargin
77− height: parent.height
78− visible: false
79− }
80− }
81−
82− Component {
83− id: forwardButton
84− LocalComponents.StackButton {
85− text: i18n.tr("Next")
86− onClicked: {
87− diagnostics.setReportCrashes(reportCheck.checked);
88− pageStack.next();
89− }
90− }
91− }
92−}
tests/qmltests/Wizard/tst_Wizard.qml+1−16
@@ -168,16 +168,13 @@ Item {
168168 return stack.currentPage;
169169 }
170170
171− function goToPage(name, skipSim, skipLocation, skipReporting) {
171+ function goToPage(name, skipSim, skipLocation) {
172172 if (skipSim === undefined) {
173173 skipSim = false;
174174 }
175175 if (skipLocation === undefined) {
176176 skipLocation = false;
177177 }
178− if (skipReporting === undefined) {
179− skipReporting = false;
180− }
181178
182179 var page = waitForPage("languagePage");
183180 if (name === page.objectName) return page;
@@ -222,12 +219,6 @@ Item {
222219 if (name === page.objectName) return page;
223220 tap(findChild(page, "forwardButton"));
224221
225− if (!skipReporting) {
226− page = waitForPage("reportingPage");
227− if (name === page.objectName) return page;
228− tap(findChild(page, "forwardButton"));
229− }
230−
231222 page = waitForPage("finishedPage");
232223 if (name === page.objectName) return page;
233224 waitUntilTransitionsEnd(page);
@@ -334,8 +325,6 @@ Item {
334325 enterPasscode("1111");
335326
336327 // now finish up
337− page = waitForPage("reportingPage");
338− tap(findChild(page, "forwardButton"));
339328 page = waitForPage("systemUpdatePage");
340329 tap(findChild(page, "forwardButton"));
341330 page = waitForPage("finishedPage");
@@ -376,8 +365,6 @@ Item {
376365 tap(continueButton);
377366
378367 // now finish up
379− page = waitForPage("reportingPage");
380− tap(findChild(page, "forwardButton"));
381368 page = waitForPage("systemUpdatePage");
382369 tap(findChild(page, "forwardButton"));
383370 page = waitForPage("finishedPage");
@@ -396,8 +383,6 @@ Item {
396383
397384 // now finish up
398385 tap(findChild(page, "forwardButton"));
399− page = waitForPage("reportingPage");
400− tap(findChild(page, "forwardButton"));
401386 page = waitForPage("systemUpdatePage");
402387 tap(findChild(page, "forwardButton"));
403388 page = waitForPage("finishedPage");