diff --git a/drongo b/drongo index ca758e12..ad60a37d 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit ca758e128876470f673b5955d75d5311b47c6938 +Subproject commit ad60a37d0ea5ae68d8c9caa0ff10d2cb63203b0d diff --git a/src/main/java/com/sparrowwallet/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java index 76969efc..53c8cc8f 100644 --- a/src/main/java/com/sparrowwallet/sparrow/AppController.java +++ b/src/main/java/com/sparrowwallet/sparrow/AppController.java @@ -633,19 +633,10 @@ public class AppController implements Initializable { byte[] bytes = Files.readAllBytes(file.toPath()); String name = file.getName(); - try { + if(Utils.isHex(bytes) || Utils.isBase64(bytes)) { + addTransactionTab(name, file, new String(bytes, StandardCharsets.UTF_8).trim()); + } else { addTransactionTab(name, file, bytes); - } catch(ParseException e) { - ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes); - ByteSource byteSource = new ByteSource() { - @Override - public InputStream openStream() { - return inputStream; - } - }; - - String text = byteSource.asCharSource(Charsets.UTF_8).read().trim(); - addTransactionTab(name, file, text); } } catch(IOException e) { showErrorDialog("Error opening file", e.getMessage());