Better error handling

wailsapp · Aug 29, 2023 · 386f2c3 · 386f2c3
1 parent a0fb1b6
commit 386f2c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/pkg/edge/capabilities.go b/pkg/edge/capabilities.go
@@ -4,12 +4,12 @@ import "github.com/wailsapp/go-webview2/webviewloader"
 
 type Capability string
 
-type unsupportedCapabilityError struct {
-	capability Capability
-}
+var UnsupportedCapabilityError = &unsupportedCapabilityError{}
+
+type unsupportedCapabilityError struct{}
 
 func (u *unsupportedCapabilityError) Error() string {
-	return "unsupported capability. Requires minimum webview version " + string(u.capability)
+	return "unsupported capability"
 }
 
 // Capabilities is a list of capabilities with their corresponding minimum runtime version
@@ -27,7 +27,3 @@ func hasCapability(webview2RuntimeVersion string, capability Capability) bool {
 	}
 	return result >= 0
 }
-
-func UnsupportedCapabilityError(capability Capability) error {
-	return &unsupportedCapabilityError{capability: capability}
-}
diff --git a/pkg/edge/chromium.go b/pkg/edge/chromium.go
@@ -486,7 +486,7 @@ func (e *Chromium) HasCapability(c Capability) bool {
 
 func (e *Chromium) GetIsSwipeNavigationEnabled() (bool, error) {
 	if !hasCapability(e.webview2RuntimeVersion, SwipeNavigation) {
-		return false, UnsupportedCapabilityError(SwipeNavigation)
+		return false, UnsupportedCapabilityError
 	}
 	webview2Settings, err := e.webview.GetSettings()
 	if err != nil {
@@ -503,7 +503,7 @@ func (e *Chromium) GetIsSwipeNavigationEnabled() (bool, error) {
 
 func (e *Chromium) PutIsSwipeNavigationEnabled(enabled bool) error {
 	if !hasCapability(e.webview2RuntimeVersion, SwipeNavigation) {
-		return UnsupportedCapabilityError(SwipeNavigation)
+		return UnsupportedCapabilityError
 	}
 	webview2Settings, err := e.webview.GetSettings()
 	if err != nil {