Better error checking for cancellations

Needs psanford/wormhole-william#53 fixed to work propertly in all cases.
Jacalz · Aug 4, 2021 · b46d678 · b46d678
1 parent 7882b4b
commit b46d678
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 14 deletions.
diff --git a/internal/transport/bridge/recv.go b/internal/transport/bridge/recv.go
@@ -2,6 +2,7 @@ package bridge
 
 import (
 	"context"
+	"errors"
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/container"
@@ -86,13 +87,16 @@ func (p *RecvList) NewReceive(code string) {
 	}()
 
 	go func() {
-		if err := p.client.NewReceive(ctx, code, path); err != nil {
+		if err := p.client.NewReceive(ctx, code, path); err == nil {
+			recv.Status = "Completed"
+			p.client.ShowNotification("Receive completed", "The data was received successfully.")
+		} else if errors.Is(err, context.Canceled) {
+			recv.Status = "Cancelled"
+			p.client.ShowNotification("Receive cancelled", "The receive was cancelled.")
+		} else {
 			recv.Status = "Failed"
 			p.client.ShowNotification("Receive failed", "An error occurred when receiving the data.")
 			dialog.ShowError(err, fyne.CurrentApp().Driver().AllWindows()[0])
-		} else {
-			recv.Status = "Completed"
-			p.client.ShowNotification("Receive completed", "The data was received successfully.")
 		}
 
 		cancel()

diff --git a/internal/transport/bridge/send.go b/internal/transport/bridge/send.go
@@ -2,6 +2,7 @@ package bridge
 
 import (
 	"context"
+	"errors"
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/container"
@@ -108,12 +109,14 @@ func (p *SendList) OnFileSelect(file fyne.URIReadCloser, err error) {
 		send.Code = code
 		p.Refresh()
 
-		if res := <-result; res.Error != nil {
+		if res := <-result; res.Error == nil && res.OK {
+			p.client.ShowNotification("File send completed", "The file was sent successfully.")
+		} else if errors.Is(res.Error, context.Canceled) {
+			p.client.ShowNotification("File send cancelled", "The file send was cancelled.")
+		} else {
 			fyne.LogError("Error on sending file", res.Error)
 			dialog.ShowError(res.Error, fyne.CurrentApp().Driver().AllWindows()[0])
 			p.client.ShowNotification("File send failed", "An error occurred when sending the file.")
-		} else if res.OK {
-			p.client.ShowNotification("File send completed", "The file was sent successfully.")
 		}
 	}()
 }
@@ -142,12 +145,14 @@ func (p *SendList) OnDirSelect(dir fyne.ListableURI, err error) {
 		send.Code = code
 		p.Refresh()
 
-		if res := <-result; res.Error != nil {
+		if res := <-result; res.Error == nil && res.OK {
+			p.client.ShowNotification("Directory send completed", "The directory was sent successfully.")
+		} else if errors.Is(res.Error, context.Canceled) {
+			p.client.ShowNotification("Directory send cancelled", "The directory send was cancelled.")
+		} else {
 			fyne.LogError("Error on sending directory", res.Error)
 			dialog.ShowError(res.Error, fyne.CurrentApp().Driver().AllWindows()[0])
 			p.client.ShowNotification("Directory send failed", "An error occurred when sending the directory.")
-		} else if res.OK {
-			p.client.ShowNotification("Directory send completed", "The directory was sent successfully.")
 		}
 	}()
 }
@@ -169,12 +174,14 @@ func (p *SendList) SendText() {
 			send.Code = code
 			p.Refresh()
 
-			if res := <-result; res.Error != nil {
-				fyne.LogError("Error on sending text", res.Error)
+			if res := <-result; res.Error == nil && res.OK {
+				p.client.ShowNotification("Text send completed", "The text was sent successfully.")
+			} else if errors.Is(res.Error, context.Canceled) {
+				p.client.ShowNotification("Text send cancelled", "The text send was cancelled.")
+			} else {
+				fyne.LogError("Error on sending file", res.Error)
 				dialog.ShowError(res.Error, fyne.CurrentApp().Driver().AllWindows()[0])
 				p.client.ShowNotification("Text send failed", "An error occurred when sending the text.")
-			} else if res.OK && p.client.Notifications {
-				p.client.ShowNotification("Text send completed", "The text was sent successfully.")
 			}
 		} else {
 			p.RemoveItem(p.Length() - 1)