fix: reformat networkng page and add option to opt out of error reporting

Author: bartei81

rcp/app.py

@@ -1,6 +1,7 @@
 import os
 from typing import List
 
+
 from kivy.app import App
 from kivy.clock import Clock
 from kivy.uix.screenmanager import ScreenManager, CardTransition, FadeTransition
@@ -21,6 +22,9 @@
 from rcp.main import log
 from rcp.utils import communication, devices
 
+import sentry_sdk
+
+
 class MainApp(App):
     display_color = ConfigParserProperty(
         defaultvalue="#ffffffff",
@@ -164,6 +168,14 @@ def goto(self, screen: str):
 
     def build(self):
         self.formats = FormatsDispatcher(id_override="0")
+
+        if not self.formats.disable_error_reporting:
+            log.info("Error reporting is enabled, configuring Sentry")
+            sentry_sdk.init(
+                dsn="https://8fd20c0607e9c930a16d51a4b1eacc94@o4509625403506688.ingest.us.sentry.io/4509625405014016",
+                send_default_pii=False,
+            )
+
         self.servo = ServoBar(
             id_override="0",
         )

rcp/components/setup/network_screen.kv

@@ -25,42 +25,35 @@
 
         TitleItem:
           name: "Network Interface"
-
+        BooleanItem:
+          name: "Enable Wifi"
+          value: root.wifi_enabled
+          on_value: root.wifi_enabled = self.value
         DropDownItem:
           name: "Network Interface"
           options: root.devices
           value: root.devices[0] if len(root.devices) > 0 else ""
-
         StringItem:
           name: "Hardware Address"
           disabled: True
           value: root.hwaddr
-
-        BooleanItem:
-          name: "Enable Interface"
-          value: root.wifi_enabled
-          on_value: root.wifi_enabled = self.value
-
         StringItem:
           name: "State"
           disabled: True
           value: root.state
 
         TitleItem:
           name: "Connection Properties"
-
         ButtonItem:
           name: "Network"
           value: root.connection if root.connection is not None else ""
           disabled: root.lock
           on_release: Factory.SsidPopup(callback=root.select_network, selected_network=root.connection).open()
-
         StringItem:
           name: "Wifi Password"
           value: root.password
           disabled: root.lock
           on_value: root.password = self.value
-
         ButtonItem:
           name: "Apply configuration"
           value: "Apply"
@@ -69,25 +62,29 @@
 
         TitleItem:
           name: "IP Properties"
-
         StringItem:
           name: "IP Address"
           value: root.address
           disabled: True
           on_value: root.address = self.value
-
         StringItem:
           name: "DNS Server"
           value: root.dns
           disabled: True
           on_value: root.dns = self.value
-
         StringItem:
           name: "Default Gateway"
           value: root.gateway
           disabled: True
           on_value: root.gateway = self.value
 
+        TitleItem:
+          name: "Error Reporting"
+        BooleanItem:
+          name: "Disable Error Reporting"
+          value: app.formats.disable_error_reporting
+          on_value: app.formats.disable_error_reporting = self.value
+
         TitleItem:
           name: "Status"
         TextInput:
@@ -96,4 +93,3 @@
           readonly: True
           multiline: True
           text: root.status_text
-

rcp/dispatchers/formats.py

@@ -3,7 +3,7 @@
 from kivy.logger import Logger
 from kivy.properties import (
     NumericProperty,
-    StringProperty, ListProperty, ObjectProperty, ColorProperty,
+    StringProperty, ListProperty, ObjectProperty, ColorProperty, BooleanProperty,
 )
 
 from rcp.dispatchers import SavingDispatcher
@@ -44,6 +44,8 @@ class FormatsDispatcher(SavingDispatcher):
 
     volume = NumericProperty(0.2)
 
+    disable_error_reporting = BooleanProperty(False)
+
     def __init__(self, **kv):
         super().__init__(**kv)
         self.bind(current_format=self.update_format)

rcp/main.py

@@ -4,14 +4,6 @@
 from kivy.core.window import Window
 import platform
 import asyncio
-import sentry_sdk
-
-sentry_sdk.init(
-    dsn="https://8fd20c0607e9c930a16d51a4b1eacc94@o4509625403506688.ingest.us.sentry.io/4509625405014016",
-    # Add data like request headers and IP for users,
-    # see https://docs.sentry.io/platforms/python/data-management/data-collected/ for more info
-    send_default_pii=True,
-)
 
 log = Logger.getChild(__name__)