Fix bug on linux when using mailto

rharing · Apr 16, 2016 · 1c60bf3 · 1c60bf3
1 parent 58e6db3
commit 1c60bf3
Showing 1 changed file with 28 additions and 22 deletions.
diff --git a/common/src/main/java/io/bitsquare/common/util/Utilities.java b/common/src/main/java/io/bitsquare/common/util/Utilities.java
@@ -135,15 +135,6 @@ public static void openURI(URI uri) throws IOException {
         }
     }
 
-    public static void openWebPage(String target) {
-        try {
-            openURI(new URI(target));
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error(e.getMessage());
-        }
-    }
-
     public static void openDirectory(File directory) throws IOException {
         if (!isLinux()
                 && Desktop.isDesktopSupported()
@@ -160,31 +151,46 @@ public static void openDirectory(File directory) throws IOException {
                 throw new IOException("Failed to open directory: " + directory.toString());
         }
     }
-
-    public static void printSystemLoad() {
-        Runtime runtime = Runtime.getRuntime();
-        long free = runtime.freeMemory() / 1024 / 1024;
-        long total = runtime.totalMemory() / 1024 / 1024;
-        long used = total - free;
-        log.info("System load (nr. threads/used memory (MB)): " + Thread.activeCount() + "/" + used);
+
+    public static void openWebPage(String target) {
+        try {
+            openURI(new URI(target));
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(e.getMessage());
+        }
     }
 
     public static void openMail(String to, String subject, String body) {
         try {
             subject = URLEncoder.encode(subject, "UTF-8").replace("+", "%20");
             body = URLEncoder.encode(body, "UTF-8").replace("+", "%20");
-            Desktop.getDesktop().mail(new URI("mailto:" + to + "?subject=" + subject + "&body=" + body));
+            openURI(new URI("mailto:" + to + "?subject=" + subject + "&body=" + body));
         } catch (IOException | URISyntaxException e) {
+            log.error("openMail failed " + e.getMessage());
             e.printStackTrace();
         }
     }
 
+    public static void printSystemLoad() {
+        Runtime runtime = Runtime.getRuntime();
+        long free = runtime.freeMemory() / 1024 / 1024;
+        long total = runtime.totalMemory() / 1024 / 1024;
+        long used = total - free;
+        log.info("System load (nr. threads/used memory (MB)): " + Thread.activeCount() + "/" + used);
+    }
+
     public static void copyToClipboard(String content) {
-        if (content != null && content.length() > 0) {
-            Clipboard clipboard = Clipboard.getSystemClipboard();
-            ClipboardContent clipboardContent = new ClipboardContent();
-            clipboardContent.putString(content);
-            clipboard.setContent(clipboardContent);
+        try {
+            if (content != null && content.length() > 0) {
+                Clipboard clipboard = Clipboard.getSystemClipboard();
+                ClipboardContent clipboardContent = new ClipboardContent();
+                clipboardContent.putString(content);
+                clipboard.setContent(clipboardContent);
+            }
+        } catch (Throwable e) {
+            log.error("copyToClipboard failed " + e.getMessage());
+            e.printStackTrace();
         }
     }