From d20d20012bc9d319e22614b6144f1933ec2ce984 Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Wed, 8 Dec 2021 09:57:09 +0100
Subject: [PATCH] Improve error upon encountering corrupt magnet link; fixes
 #598

---
 .../main/java/org/transdroid/core/gui/TorrentsActivity.java    | 2 +-
 .../main/java/org/transdroid/core/gui/lists/LocalTorrent.java  | 2 ++
 app/src/main/java/org/transdroid/daemon/DaemonException.java   | 3 ++-
 app/src/main/res/values/strings.xml                            | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java b/app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java
index 9002f96f..ae9b3f1d 100644
--- a/app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java
+++ b/app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java
@@ -1002,7 +1002,7 @@ public class TorrentsActivity extends AppCompatActivity implements TorrentTasksE
         } catch (IllegalArgumentException e) {
             // Illegal character or escape sequence; fail task to show error
             onCommunicationError(new DaemonTaskFailureResult(AddByMagnetUrlTask.create(currentConnection, url),
-                    new DaemonException(DaemonException.ExceptionType.FileAccessError, "Invalid characters in magnet link")), false);
+                    new DaemonException(DaemonException.ExceptionType.MalformedUri, "Invalid characters in magnet uri")), false);
             return;
         }
 
diff --git a/app/src/main/java/org/transdroid/core/gui/lists/LocalTorrent.java b/app/src/main/java/org/transdroid/core/gui/lists/LocalTorrent.java
index 9ab09507..c6c03a8d 100644
--- a/app/src/main/java/org/transdroid/core/gui/lists/LocalTorrent.java
+++ b/app/src/main/java/org/transdroid/core/gui/lists/LocalTorrent.java
@@ -73,6 +73,8 @@ public class LocalTorrent {
                 return R.string.error_401;
             case FileAccessError:
                 return R.string.error_torrentfile;
+            case MalformedUri:
+                return R.string.error_parsinguri;
             case ConnectionError:
             default:
                 return R.string.error_httperror;
diff --git a/app/src/main/java/org/transdroid/daemon/DaemonException.java b/app/src/main/java/org/transdroid/daemon/DaemonException.java
index d64d4d72..154acfcb 100644
--- a/app/src/main/java/org/transdroid/daemon/DaemonException.java
+++ b/app/src/main/java/org/transdroid/daemon/DaemonException.java
@@ -56,7 +56,8 @@ public class DaemonException extends Exception {
         ParsingFailed,
         AuthenticationFailure,
         NotConnected,
-        FileAccessError
+        FileAccessError,
+        MalformedUri
     }
 
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ca12c464..b5d19e5e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -476,6 +476,7 @@
     <string name="error_daemonnotconnected">Web interface not connected to a running daemon</string>
     <string name="error_401">Access denied (please check your settings)</string>
     <string name="error_torrentfile">Can\'t read .torrent file</string>
+    <string name="error_parsinguri">Link is not a valid uri</string>
     <string name="error_parsingrss">Error while parsing the RSS feed</string>
     <string name="error_invalid_url_form">This URL is not well-formed</string>
     <string name="error_invalid_search_url">Your web search URL is invalid:</string>