Strip out OPEN-CUTS reporting

Unfortunately the UBports OPEN-CUTS instance has its certificate expiring regularly or is down completely. Change-Id: Icfedfeace2e34bf93b3971e49b5c196c9b362360 Signed-off-by: Alexander Martinz <[email protected]>
ubports · Mar 2, 2023 · 3069922 · 3069922
1 parent 9754a0e
commit 3069922
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 451 deletions.
diff --git a/README.md b/README.md
@@ -73,16 +73,15 @@ Options:
 
 The UBports Foundation maintains a various free- and open-source NPM libraries for the UBports Installer.
 
-| Package                  | Version                                                                                                             | Description                                                            |
-| ------------------------ | ------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- |
-| `progressive-downloader` | [![version](https://shields.io/npm/v/progressive-downloader)](https://www.npmjs.com/package/progressive-downloader) | Parallel downloads and opportunistic checksum verification             |
-| `promise-android-tools`  | [![version](https://shields.io/npm/v/promise-android-tools)](https://www.npmjs.com/package/promise-android-tools)   | Extensive wrapper for ADB, Fastboot, Heimdall                          |
-| `android-tools-bin`      | [![version](https://shields.io/npm/v/android-tools-bin)](https://www.npmjs.com/package/android-tools-bin)           | Cross-platform binaries for ADB, Fastboot, Heimdall                    |
-| `open-cuts-reporter`     | [![version](https://shields.io/npm/v/open-cuts-reporter)](https://www.npmjs.com/package/open-cuts-reporter)         | Report test results to [UBports OPEN-CUTS](https://www.open-cuts.org/) |
+| Package                  | Version                                                                                                             | Description                                                |
+| ------------------------ | ------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------- |
+| `progressive-downloader` | [![version](https://shields.io/npm/v/progressive-downloader)](https://www.npmjs.com/package/progressive-downloader) | Parallel downloads and opportunistic checksum verification |
+| `promise-android-tools`  | [![version](https://shields.io/npm/v/promise-android-tools)](https://www.npmjs.com/package/promise-android-tools)   | Extensive wrapper for ADB, Fastboot, Heimdall              |
+| `android-tools-bin`      | [![version](https://shields.io/npm/v/android-tools-bin)](https://www.npmjs.com/package/android-tools-bin)           | Cross-platform binaries for ADB, Fastboot, Heimdall        |
 
 ## License
 
-Original development by [Marius Gripsgård](http://mariogrip.com/) and [Johannah Sprinz](https://spri.nz). Copyright (C) 2017-2022 [UBports Foundation](https://ubports.com).
+Original development by [Marius Gripsgård](http://mariogrip.com/) and [Johannah Sprinz](https://spri.nz). Copyright (C) 2017-2023 [UBports Foundation](https://ubports.com).
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 

diff --git a/__mocks__/open-cuts-reporter.js b/__mocks__/open-cuts-reporter.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -64,7 +64,6 @@
     "form-data": "^4.0.0",
     "fs-extra": "^11.1.0",
     "graphql": "^16.6.0",
-    "open-cuts-reporter": "^1.0.2",
     "progressive-downloader": "^2.0.2",
     "promise-android-tools": "^4.0.13",
     "ps-tree": "^1.2.0",

diff --git a/src/lib/mainEvent.js b/src/lib/mainEvent.js
@@ -205,7 +205,7 @@ mainEvent.on("user:write:done", () => {
   log.info(
     "All done! Your device will now reboot and complete the installation. Enjoy exploring Ubuntu Touch!"
   );
-  if (!settings.get("never.opencuts")) {
+  if (!settings.get("never.reportInstallationResult")) {
     setTimeout(() => {
       window.send("user:report", true);
     }, 1500);

diff --git a/src/lib/menuManager.js b/src/lib/menuManager.js
@@ -153,6 +153,16 @@ class MenuManager {
                 !settings.get("systemimage.showHiddenChannels")
               )
           },
+          {
+            label: "Never ask for installation result reporting",
+            checked: settings.get("never.reportInstallationResult"),
+            type: "checkbox",
+            click: () =>
+              settings.set(
+                "never.reportInstallationResult",
+                !settings.get("never.reportInstallationResult")
+              )
+          },
           {
             label: "Never ask for udev rules",
             checked: settings.get("never.udev"),
@@ -171,17 +181,6 @@ class MenuManager {
                 "never.windowsDrivers",
                 !settings.get("never.windowsDrivers")
               )
-          },
-          {
-            label: "Never ask for OPEN-CUTS automatic reporting",
-            checked: settings.get("never.opencuts"),
-            type: "checkbox",
-            click: () =>
-              settings.set("never.opencuts", !settings.get("never.opencuts"))
-          },
-          {
-            label: "OPEN-CUTS API Token",
-            click: () => reporter.tokenDialog(mainWindow)
           }
         ]
       },