nutomic
/
syncthing-android
mirror of https://github.com/syncthing/syncthing-android.git
1
0
Fork 0
Code Releases Activity

Merge pull request #582 from DevFactory/release/default-encoding-should-not-be-used-fix-1 

Code quality fix - Classes and methods that rely on the default system encoding should not be used.
This commit is contained in:
Felix Ableitner 2016-03-15 15:15:50 +01:00
parent c3ceb94c38 1d06411883
commit 9d21902090
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java
View File

@ -135,7 +135,7 @@ public class LogActivity extends SyncthingActivity {
pb.redirectErrorStream(true); pb.redirectErrorStream(true);
process = pb.start(); process = pb.start();
BufferedReader bufferedReader = new BufferedReader( BufferedReader bufferedReader = new BufferedReader(
new InputStreamReader(process.getInputStream()), 8192); new InputStreamReader(process.getInputStream(), "UTF-8"), 8192);
StringBuilder log = new StringBuilder(); StringBuilder log = new StringBuilder();
String line = ""; String line = "";
String sep = System.getProperty("line.separator"); String sep = System.getProperty("line.separator");

2
src/main/java/com/nutomic/syncthingandroid/syncthing/GetTask.java
View File

@ -80,7 +80,7 @@ public class GetTask extends AsyncTask<String, Void, String> {
if (entity != null) { if (entity != null) {
InputStream is = entity.getContent(); InputStream is = entity.getContent();
BufferedReader br = new BufferedReader(new InputStreamReader(is)); BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
String line; String line;
String result = ""; String result = "";
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {

4
src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingRunnable.java
View File

@ -242,7 +242,7 @@ public class SyncthingRunnable implements Runnable {
psOut.writeBytes("exit\n"); psOut.writeBytes("exit\n");
psOut.flush(); psOut.flush();
ps.waitFor(); ps.waitFor();
InputStreamReader isr = new InputStreamReader(ps.getInputStream()); InputStreamReader isr = new InputStreamReader(ps.getInputStream(), "UTF-8");
BufferedReader br = new BufferedReader(isr); BufferedReader br = new BufferedReader(isr);
String id; String id;
while ((id = br.readLine()) != null) { while ((id = br.readLine()) != null) {
@ -312,7 +312,7 @@ public class SyncthingRunnable implements Runnable {
@Override @Override
public void run() { public void run() {
try { try {
InputStreamReader isr = new InputStreamReader(is); InputStreamReader isr = new InputStreamReader(is, "UTF-8");
BufferedReader br = new BufferedReader(isr); BufferedReader br = new BufferedReader(isr);
String line; String line;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {