Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-28 07:22:50 -05:00
Code Packages Releases Activity

core: replace all use of interface{} with any (#848)

Browse Source
This commit is contained in:
Marcus Ramberg
2025-12-01 17:04:37 +01:00
committed by GitHub
parent cfc07f4411
commit 94851a51aa
60 changed files with 336 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/internal/server/network/backend.go
View File

@@ -35,7 +35,7 @@ type Backend interface {
ListVPNPlugins() ([]VPNPlugin, error)
ImportVPN(filePath string, name string) (*VPNImportResult, error)
GetVPNConfig(uuidOrName string) (*VPNConfig, error)
UpdateVPNConfig(uuid string, updates map[string]interface{}) error
UpdateVPNConfig(uuid string, updates map[string]any) error
SetVPNCredentials(uuid string, username string, password string, save bool) error
DeleteVPN(uuidOrName string) error

2
core/internal/server/network/backend_hybrid_iwd_networkd.go
View File

@@ -196,7 +196,7 @@ func (b *HybridIwdNetworkdBackend) GetVPNConfig(uuidOrName string) (*VPNConfig,
return nil, fmt.Errorf("VPN not supported in hybrid mode")
}
func (b *HybridIwdNetworkdBackend) UpdateVPNConfig(uuid string, updates map[string]interface{}) error {
func (b *HybridIwdNetworkdBackend) UpdateVPNConfig(uuid string, updates map[string]any) error {
return fmt.Errorf("VPN not supported in hybrid mode")
}

2
core/internal/server/network/backend_iwd_unimplemented.go
View File

@@ -66,7 +66,7 @@ func (b *IWDBackend) GetVPNConfig(uuidOrName string) (*VPNConfig, error) {
return nil, fmt.Errorf("VPN not supported by iwd backend")
}
func (b *IWDBackend) UpdateVPNConfig(uuid string, updates map[string]interface{}) error {
func (b *IWDBackend) UpdateVPNConfig(uuid string, updates map[string]any) error {
return fmt.Errorf("VPN not supported by iwd backend")
}

2
core/internal/server/network/backend_networkd_unimplemented.go
View File

@@ -66,7 +66,7 @@ func (b *SystemdNetworkdBackend) GetVPNConfig(uuidOrName string) (*VPNConfig, er
return nil, fmt.Errorf("VPN not supported by networkd backend")
}
func (b *SystemdNetworkdBackend) UpdateVPNConfig(uuid string, updates map[string]interface{}) error {
func (b *SystemdNetworkdBackend) UpdateVPNConfig(uuid string, updates map[string]any) error {
return fmt.Errorf("VPN not supported by networkd backend")
}

10
core/internal/server/network/backend_networkmanager.go
View File

@@ -45,12 +45,12 @@ type ethernetDeviceInfo struct {
}
type NetworkManagerBackend struct {
nmConn interface{}
ethernetDevice interface{}
nmConn any
ethernetDevice any
ethernetDevices map[string]*ethernetDeviceInfo
wifiDevice interface{}
settings interface{}
wifiDev interface{}
wifiDevice any
settings any
wifiDev any
wifiDevices map[string]*wifiDeviceInfo
dbusConn *dbus.Conn

4
core/internal/server/network/backend_networkmanager_ethernet.go
View File

@@ -155,8 +155,8 @@ func (b *NetworkManagerBackend) ConnectEthernet() error {
}
}
settings := make(map[string]map[string]interface{})
settings["connection"] = map[string]interface{}{
settings := make(map[string]map[string]any)
settings["connection"] = map[string]any{
"id": "Wired connection",
"type": "802-3-ethernet",
}

14
core/internal/server/network/backend_networkmanager_signals_test.go
View File

@@ -17,7 +17,7 @@ func TestNetworkManagerBackend_HandleDBusSignal_NewConnection(t *testing.T) {
sig := &dbus.Signal{
Name: "org.freedesktop.NetworkManager.Settings.NewConnection",
Body: []interface{}{"/org/freedesktop/NetworkManager/Settings/1"},
Body: []any{"/org/freedesktop/NetworkManager/Settings/1"},
}
assert.NotPanics(t, func() {
@@ -33,7 +33,7 @@ func TestNetworkManagerBackend_HandleDBusSignal_ConnectionRemoved(t *testing.T)
sig := &dbus.Signal{
Name: "org.freedesktop.NetworkManager.Settings.ConnectionRemoved",
Body: []interface{}{"/org/freedesktop/NetworkManager/Settings/1"},
Body: []any{"/org/freedesktop/NetworkManager/Settings/1"},
}
assert.NotPanics(t, func() {
@@ -49,7 +49,7 @@ func TestNetworkManagerBackend_HandleDBusSignal_InvalidBody(t *testing.T) {
sig := &dbus.Signal{
Name: "org.freedesktop.DBus.Properties.PropertiesChanged",
Body: []interface{}{"only-one-element"},
Body: []any{"only-one-element"},
}
assert.NotPanics(t, func() {
@@ -65,7 +65,7 @@ func TestNetworkManagerBackend_HandleDBusSignal_InvalidInterface(t *testing.T) {
sig := &dbus.Signal{
Name: "org.freedesktop.DBus.Properties.PropertiesChanged",
Body: []interface{}{123, map[string]dbus.Variant{}},
Body: []any{123, map[string]dbus.Variant{}},
}
assert.NotPanics(t, func() {
@@ -81,7 +81,7 @@ func TestNetworkManagerBackend_HandleDBusSignal_InvalidChanges(t *testing.T) {
sig := &dbus.Signal{
Name: "org.freedesktop.DBus.Properties.PropertiesChanged",
Body: []interface{}{dbusNMInterface, "not-a-map"},
Body: []any{dbusNMInterface, "not-a-map"},
}
assert.NotPanics(t, func() {
@@ -137,7 +137,7 @@ func TestNetworkManagerBackend_HandleNetworkManagerChange_ActiveConnections(t *t
mockNM.EXPECT().GetPropertyPrimaryConnection().Return(nil, nil).Maybe()
changes := map[string]dbus.Variant{
"ActiveConnections": dbus.MakeVariant([]interface{}{}),
"ActiveConnections": dbus.MakeVariant([]any{}),
}
assert.NotPanics(t, func() {
@@ -200,7 +200,7 @@ func TestNetworkManagerBackend_HandleWiFiChange_AccessPoints(t *testing.T) {
assert.NoError(t, err)
changes := map[string]dbus.Variant{
"AccessPoints": dbus.MakeVariant([]interface{}{}),
"AccessPoints": dbus.MakeVariant([]any{}),
}
assert.NotPanics(t, func() {

2
core/internal/server/network/backend_networkmanager_state.go
View File

@@ -114,7 +114,7 @@ func (b *NetworkManagerBackend) getDeviceStateReason(dev gonetworkmanager.Device
return 0
}
if stateReasonStruct, ok := variant.Value().([]interface{}); ok && len(stateReasonStruct) >= 2 {
if stateReasonStruct, ok := variant.Value().([]any); ok && len(stateReasonStruct) >= 2 {
if reason, ok := stateReasonStruct[1].(uint32); ok {
return reason
}

8
core/internal/server/network/backend_networkmanager_vpn.go
View File

@@ -589,7 +589,7 @@ func (b *NetworkManagerBackend) ClearVPNCredentials(uuidOrName string) error {
vpnSettings["password-flags"] = uint32(1)
}
settings["vpn-secrets"] = make(map[string]interface{})
settings["vpn-secrets"] = make(map[string]any)
}
if err := conn.Update(settings); err != nil {
@@ -1057,7 +1057,7 @@ func (b *NetworkManagerBackend) GetVPNConfig(uuidOrName string) (*VPNConfig, err
return nil, fmt.Errorf("VPN connection not found: %s", uuidOrName)
}
func (b *NetworkManagerBackend) UpdateVPNConfig(connUUID string, updates map[string]interface{}) error {
func (b *NetworkManagerBackend) UpdateVPNConfig(connUUID string, updates map[string]any) error {
s := b.settings
if s == nil {
var err error
@@ -1103,7 +1103,7 @@ func (b *NetworkManagerBackend) UpdateVPNConfig(connUUID string, updates map[str
connMeta["autoconnect"] = autoconnect
}
if data, ok := updates["data"].(map[string]interface{}); ok {
if data, ok := updates["data"].(map[string]any); ok {
if vpnSettings, ok := settings["vpn"]; ok {
existingData, _ := vpnSettings["data"].(map[string]string)
if existingData == nil {
@@ -1185,7 +1185,7 @@ func (b *NetworkManagerBackend) SetVPNCredentials(connUUID string, username stri
vpnSettings, ok := settings["vpn"]
if !ok {
vpnSettings = make(map[string]interface{})
vpnSettings = make(map[string]any)
settings["vpn"] = vpnSettings
}

20
core/internal/server/network/backend_networkmanager_wifi.go
View File

@@ -555,19 +555,19 @@ func (b *NetworkManagerBackend) createAndConnectWiFiOnDevice(req ConnectionReque
req.SSID, req.Interactive)
}
settings := make(map[string]map[string]interface{})
settings := make(map[string]map[string]any)
settings["connection"] = map[string]interface{}{
settings["connection"] = map[string]any{
"id": req.SSID,
"type": "802-11-wireless",
"autoconnect": true,
}
settings["ipv4"] = map[string]interface{}{"method": "auto"}
settings["ipv6"] = map[string]interface{}{"method": "auto"}
settings["ipv4"] = map[string]any{"method": "auto"}
settings["ipv6"] = map[string]any{"method": "auto"}
if secured {
settings["802-11-wireless"] = map[string]interface{}{
settings["802-11-wireless"] = map[string]any{
"ssid": []byte(req.SSID),
"mode": "infrastructure",
"security": "802-11-wireless-security",
@@ -575,7 +575,7 @@ func (b *NetworkManagerBackend) createAndConnectWiFiOnDevice(req ConnectionReque
switch {
case isEnterprise || req.Username != "":
settings["802-11-wireless-security"] = map[string]interface{}{
settings["802-11-wireless-security"] = map[string]any{
"key-mgmt": "wpa-eap",
}
@@ -594,7 +594,7 @@ func (b *NetworkManagerBackend) createAndConnectWiFiOnDevice(req ConnectionReque
useSystemCACerts = *req.UseSystemCACerts
}
x := map[string]interface{}{
x := map[string]any{
"eap": []string{eapMethod},
"system-ca-certs": useSystemCACerts,
"password-flags": uint32(0),
@@ -634,7 +634,7 @@ func (b *NetworkManagerBackend) createAndConnectWiFiOnDevice(req ConnectionReque
eapMethod, phase2Auth, req.Username, req.Interactive, useSystemCACerts, req.DomainSuffixMatch)
case isPsk:
sec := map[string]interface{}{
sec := map[string]any{
"key-mgmt": "wpa-psk",
"psk-flags": uint32(0),
}
@@ -644,7 +644,7 @@ func (b *NetworkManagerBackend) createAndConnectWiFiOnDevice(req ConnectionReque
settings["802-11-wireless-security"] = sec
case isSae:
sec := map[string]interface{}{
sec := map[string]any{
"key-mgmt": "sae",
"pmf": int32(3),
"psk-flags": uint32(0),
@@ -658,7 +658,7 @@ func (b *NetworkManagerBackend) createAndConnectWiFiOnDevice(req ConnectionReque
return fmt.Errorf("secured network but not SAE/PSK/802.1X (rsn=0x%x wpa=0x%x)", rsnFlags, wpaFlags)
}
} else {
settings["802-11-wireless"] = map[string]interface{}{
settings["802-11-wireless"] = map[string]any{
"ssid": []byte(req.SSID),
"mode": "infrastructure",
}

12
core/internal/server/network/handlers.go
View File

@@ -10,9 +10,9 @@ import (
)
type Request struct {
ID int `json:"id,omitempty"`
Method string `json:"method"`
Params map[string]interface{} `json:"params,omitempty"`
ID int `json:"id,omitempty"`
Method string `json:"method"`
Params map[string]any `json:"params,omitempty"`
}
type SuccessResult struct {
@@ -97,7 +97,7 @@ func handleCredentialsSubmit(conn net.Conn, req Request, manager *Manager) {
return
}
secretsRaw, ok := req.Params["secrets"].(map[string]interface{})
secretsRaw, ok := req.Params["secrets"].(map[string]any)
if !ok {
log.Warnf("handleCredentialsSubmit: missing or invalid secrets parameter")
models.RespondError(conn, req.ID, "missing or invalid 'secrets' parameter")
@@ -603,7 +603,7 @@ func handleUpdateVPNConfig(conn net.Conn, req Request, manager *Manager) {
return
}
updates := make(map[string]interface{})
updates := make(map[string]any)
if name, ok := req.Params["name"].(string); ok {
updates["name"] = name
@@ -611,7 +611,7 @@ func handleUpdateVPNConfig(conn net.Conn, req Request, manager *Manager) {
if autoconnect, ok := req.Params["autoconnect"].(bool); ok {
updates["autoconnect"] = autoconnect
}
if data, ok := req.Params["data"].(map[string]interface{}); ok {
if data, ok := req.Params["data"].(map[string]any); ok {
updates["data"] = data
}

6
core/internal/server/network/handlers_test.go
View File

@@ -128,7 +128,7 @@ func TestHandleConnectWiFi(t *testing.T) {
req := Request{
ID: 123,
Method: "network.wifi.connect",
Params: map[string]interface{}{},
Params: map[string]any{},
}
handleConnectWiFi(conn, req, manager)
@@ -152,7 +152,7 @@ func TestHandleSetPreference(t *testing.T) {
req := Request{
ID: 123,
Method: "network.preference.set",
Params: map[string]interface{}{},
Params: map[string]any{},
}
handleSetPreference(conn, req, manager)
@@ -176,7 +176,7 @@ func TestHandleGetNetworkInfo(t *testing.T) {
req := Request{
ID: 123,
Method: "network.info",
Params: map[string]interface{}{},
Params: map[string]any{},
}
handleGetNetworkInfo(conn, req, manager)

2
core/internal/server/network/manager.go
View File

@@ -554,7 +554,7 @@ func (m *Manager) GetVPNConfig(uuidOrName string) (*VPNConfig, error) {
return m.backend.GetVPNConfig(uuidOrName)
}
func (m *Manager) UpdateVPNConfig(uuid string, updates map[string]interface{}) error {
func (m *Manager) UpdateVPNConfig(uuid string, updates map[string]any) error {
return m.backend.UpdateVPNConfig(uuid, updates)
}

4
core/internal/server/network/priority.go
View File

@@ -94,14 +94,14 @@ func (m *Manager) setConnectionMetrics(connType string, metric uint32) error {
if connMeta, ok := connSettings["connection"]; ok {
if cType, ok := connMeta["type"].(string); ok && cType == connType {
if connSettings["ipv4"] == nil {
connSettings["ipv4"] = make(map[string]interface{})
connSettings["ipv4"] = make(map[string]any)
}
if ipv4Map := connSettings["ipv4"]; ipv4Map != nil {
ipv4Map["route-metric"] = int64(metric)
}
if connSettings["ipv6"] == nil {
connSettings["ipv6"] = make(map[string]interface{})
connSettings["ipv6"] = make(map[string]any)
}
if ipv6Map := connSettings["ipv6"]; ipv6Map != nil {
ipv6Map["route-metric"] = int64(metric)