From 59027b59fef185ea4769ebf5f7550bdf9def0b4a Mon Sep 17 00:00:00 2001 From: Joshua <8Joshua@web.de> Date: Thu, 11 Oct 2018 15:14:18 +0200 Subject: [PATCH] =?UTF-8?q?Downloads=20von=20PDFs=20jetzt=20auch=20m=C3=B6?= =?UTF-8?q?glich=20:D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fuplanner/services/KVV/KVVModuleList.java | 2 +- .../fuplanner/tools/network/HttpRequest.java | 8 +------ .../sebse/fuplanner/tools/network/Result.java | 21 +++++++++++++++---- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java index 5e52a2a..d5aa9b7 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java +++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java @@ -624,7 +624,7 @@ class KVVModuleList extends HTTPService { try { //todo eventuel prüfen ob genügend speicher noch vorhanden ist FileOutputStream out = new FileOutputStream(ordner.getPath()+"/"+filename); - out.write(datei.getParsed().getBytes()); + out.write(datei.getBytes()); out.close(); pfad=ordner.getPath()+"/"+filename; } catch (Exception e) { diff --git a/app/src/main/java/de/sebse/fuplanner/tools/network/HttpRequest.java b/app/src/main/java/de/sebse/fuplanner/tools/network/HttpRequest.java index 646633a..62f1467 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/network/HttpRequest.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/network/HttpRequest.java @@ -28,13 +28,7 @@ class HttpRequest extends Request { @Override protected Response parseNetworkResponse(NetworkResponse response) { - String parsed; - try { - parsed = new String(response.data, HttpHeaderParser.parseCharset(response.headers)); - } catch (UnsupportedEncodingException e) { - parsed = new String(response.data); - } - Result result = new Result(parsed, response.headers); + Result result = new Result(response.data, response.headers); return Response.success(result, HttpHeaderParser.parseCacheHeaders(response)); } diff --git a/app/src/main/java/de/sebse/fuplanner/tools/network/Result.java b/app/src/main/java/de/sebse/fuplanner/tools/network/Result.java index 2491dba..412b1d2 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/network/Result.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/network/Result.java @@ -1,21 +1,34 @@ package de.sebse.fuplanner.tools.network; +import com.android.volley.toolbox.HttpHeaderParser; + +import java.io.UnsupportedEncodingException; import java.util.Map; +import de.sebse.fuplanner.tools.logging.Logger; + /** * Created by sebastian on 24.10.17. */ public class Result { - private final String parsed; + private final byte[] body; private final Map headers; - public Result(String parsed, Map headers) { - this.parsed = parsed; + public Result(byte[] body, Map headers) { + this.body = body; this.headers = headers; } public String getParsed() { - return parsed; + try { + return new String(this.body, HttpHeaderParser.parseCharset(headers)); + } catch (UnsupportedEncodingException e) { + return new String(this.body); + } + } + + public byte[] getBytes() { + return body; } public Map getHeaders() {