Qortal/qortal
1
0
Fork 0
mirror of https://github.com/Qortal/qortal.git synced 2025-06-03 23:16:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set charset to UTF-8 in various places that bytes are converted to a string.

Browse Source
This commit is contained in:
CalDescent 2023-04-28 13:06:29 +01:00
parent 45bc2e46d6
commit 6dfaaf0054
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/qortal/arbitrary/metadata/ArbitraryDataMetadata.java
View File

@ -9,6 +9,7 @@ import java.io.BufferedWriter;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
@ -75,7 +76,7 @@ public class ArbitraryDataMetadata {
throw new IOException(String.format("Metadata file doesn't exist: %s", this.filePath.toString())); throw new IOException(String.format("Metadata file doesn't exist: %s", this.filePath.toString()));
} }
this.jsonString = new String(Files.readAllBytes(this.filePath)); this.jsonString = new String(Files.readAllBytes(this.filePath), StandardCharsets.UTF_8);
} }

3
src/main/java/org/qortal/arbitrary/metadata/ArbitraryDataQortalMetadata.java
View File

@ -9,6 +9,7 @@ import java.io.BufferedWriter;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
@ -69,7 +70,7 @@ public class ArbitraryDataQortalMetadata extends ArbitraryDataMetadata {
throw new IOException(String.format("Patch file doesn't exist: %s", path.toString())); throw new IOException(String.format("Patch file doesn't exist: %s", path.toString()));
} }
this.jsonString = new String(Files.readAllBytes(path)); this.jsonString = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
} }

2
src/main/java/org/qortal/arbitrary/misc/Service.java
View File

@ -227,7 +227,7 @@ public enum Service {
} }
public static JSONObject toJsonObject(byte[] data) { public static JSONObject toJsonObject(byte[] data) {
String dataString = new String(data); String dataString = new String(data, StandardCharsets.UTF_8);
return new JSONObject(dataString); return new JSONObject(dataString);
} }

3
src/main/java/org/qortal/list/ResourceList.java
View File

@ -9,6 +9,7 @@ import java.io.BufferedWriter;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
@ -81,7 +82,7 @@ public class ResourceList {
} }
try { try {
String jsonString = new String(Files.readAllBytes(path)); String jsonString = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
this.list = ResourceList.listFromJSONString(jsonString); this.list = ResourceList.listFromJSONString(jsonString);
} catch (IOException e) { } catch (IOException e) {
throw new IOException(String.format("Couldn't read contents from file %s", path.toString())); throw new IOException(String.format("Couldn't read contents from file %s", path.toString()));