mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2026-03-26 17:35:38 +00:00
Code Issues Projects Releases Wiki Activity

Use UTF_8 constant for encoding

Browse Source
This commit is contained in:
Sergey Ponomarev
2026-01-30 23:48:59 +02:00
parent b09d385496
commit fbe4eea90f
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/jivesoftware/spark/plugin/PluginClassLoader.java
View File

@ -37,6 +37,8 @@ import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import static java.nio.charset.StandardCharsets.UTF_8;
/**
* A simple classloader to extend the classpath to
* include all jars in a lib directory.<p>
@ -113,7 +115,7 @@ public class PluginClassLoader extends URLClassLoader {
// Get an array of class loaders to try loading the providers files from.
Reader reader = new BufferedReader(new InputStreamReader(providerStream, "UTF-8"));
Reader reader = new BufferedReader(new InputStreamReader(providerStream, UTF_8));
try {
final XmlPullParser parser = SmackXmlParser.newXmlParser(reader);
XmlPullParser.Event eventType = parser.getEventType();

10
plugins/fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/ChatRoomDecorator.java
View File

@ -39,9 +39,10 @@ import org.jxmpp.jid.impl.JidCreate;
import javax.swing.*;
import java.awt.*;
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import static java.nio.charset.StandardCharsets.UTF_8;
public class ChatRoomDecorator
{
public RolloverButton fileuploadButton;
@ -93,12 +94,7 @@ public class ChatRoomDecorator
private void handleUpload(File file, ChatRoom room, Message.Type type)
{
Log.debug("Uploading file: " + file.getAbsolutePath());
String fileName = null;
try {
fileName = URLEncoder.encode(file.getName(), "UTF-8");
} catch (UnsupportedEncodingException ignored) {
// Can be safely ignored because UTF-8 is always supported
}
String fileName = URLEncoder.encode(file.getName(), UTF_8);
try {
UploadRequest request = new UploadRequest(fileName, file.length());
request.setTo(JidCreate.fromOrThrowUnchecked("httpfileupload." + SparkManager.getSessionManager().getServerAddress()));

8
plugins/meet/src/main/java/org/jivesoftware/spark/plugin/ofmeet/SparkMeetPlugin.java
View File

@ -19,6 +19,7 @@ package org.jivesoftware.spark.plugin.ofmeet;
import java.awt.*;
import javax.swing.*;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.zip.*;
import java.io.*;
@ -47,6 +48,8 @@ import de.mxro.process.*;
import org.jxmpp.jid.parts.*;
import org.jxmpp.jid.impl.JidCreate;
import static java.nio.charset.StandardCharsets.UTF_8;
public class SparkMeetPlugin implements Plugin, ChatRoomListener, GlobalMessageListener
{
public Properties props = new Properties();
@ -276,8 +279,8 @@ public class SparkMeetPlugin implements Plugin, ChatRoomListener, GlobalMessageL
public void openURL(String newUrl)
{
try {
String username = URLEncoder.encode(SparkManager.getSessionManager().getUsername(), "UTF-8");
String password = URLEncoder.encode(SparkManager.getSessionManager().getPassword(), "UTF-8");
String username = URLEncoder.encode(SparkManager.getSessionManager().getUsername(), UTF_8);
String password = URLEncoder.encode(SparkManager.getSessionManager().getPassword(), UTF_8);
electronThread = Spawn.startProcess(electronExePath + " --ignore-certificate-errors " + newUrl, new File(electronHomePath), new ProcessListener() {
@ -305,7 +308,6 @@ public class SparkMeetPlugin implements Plugin, ChatRoomListener, GlobalMessageL
Log.warning("Electron error", t);
}
});
} catch (Exception t) {
Log.error("Error opening url " + newUrl, t);
}

6
plugins/sip/src/main/java/org/jivesoftware/sparkplugin/calllog/LogManagerImpl.java
View File

@ -39,6 +39,8 @@ import java.io.*;
import java.text.DateFormat;
import java.util.*;
import static java.nio.charset.StandardCharsets.UTF_8;
/**
* Title: SIPark
* Description:JAIN-SIP Audio/Video phone application
@ -188,7 +190,7 @@ public class LogManagerImpl implements SoftPhoneListener, LogManager {
// Write out new File
try {
getHistoryFile().getParentFile().mkdirs();
BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(getHistoryFile()), "UTF-8"));
BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(getHistoryFile()), UTF_8));
out.write(builder.toString());
out.close();
}
@ -215,7 +217,7 @@ public class LogManagerImpl implements SoftPhoneListener, LogManager {
try {
final MXParser parser = new MXParser();
parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(historyFile), "UTF-8"));
BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(historyFile), UTF_8));
parser.setInput(in);
boolean done = false;
while (!done) {

9
plugins/sip/src/main/java/org/jivesoftware/sparkplugin/phonebook/PhonebookManager.java
View File

@ -16,10 +16,13 @@ import javax.swing.JOptionPane;
import net.java.sipmack.common.Log;
import org.jivesoftware.Spark;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.spark.plugin.phone.resource.PhoneRes;
import org.xmlpull.mxp1.MXParser;
import org.xmlpull.v1.XmlPullParser;
import static java.nio.charset.StandardCharsets.UTF_8;
public class PhonebookManager implements BookManager
{
private static final PhonebookManager instance = new PhonebookManager();
@ -110,7 +113,7 @@ public class PhonebookManager implements BookManager
try {
final MXParser parser = new MXParser();
parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(bookFile), "UTF-8"));
BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(bookFile), UTF_8));
parser.setInput(in);
boolean done = false;
while (!done) {
@ -177,12 +180,12 @@ public class PhonebookManager implements BookManager
// Write out new File
try {
getPhonebookFile().getParentFile().mkdirs();
BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(getPhonebookFile()), "UTF-8"));
BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(getPhonebookFile()), UTF_8));
out.write(builder.toString());
out.close();
}
catch (IOException e) {
org.jivesoftware.spark.util.log.Log.error(e);
Log.error(e);
}
}