Merge pull request #4596 from ColdAnkles/asset-constructor-string-fix

Alternate Encoding Handling for Addon Content

src/main/java/net/rptools/maptool/model/Asset.java

@@ -27,6 +27,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.nio.ByteBuffer;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Objects;
@@ -471,7 +475,23 @@ private Asset(MD5Key key, String name, byte[] data, Type type, String extension,
     }
 
     if (type.isStringType()) {
-      dataAsString = new String(data);
+      CharsetDecoder decoder = StandardCharsets.UTF_8.newDecoder();
+      decoder
+          .onMalformedInput(CodingErrorAction.REPORT)
+          .onUnmappableCharacter(CodingErrorAction.REPORT);
+      String decodedString;
+      try {
+        decodedString = decoder.decode(ByteBuffer.wrap(data)).toString();
+      } catch (Exception eOne) {
+        try {
+          decoder = StandardCharsets.UTF_16.newDecoder();
+          decodedString = decoder.decode(ByteBuffer.wrap(data)).toString();
+        } catch (Exception eTwo) {
+          decodedString = null;
+        }
+      }
+
+      dataAsString = decodedString;
     } else {
       dataAsString = null;
     }