Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change bluetooth response to remove deprecated warning.

Browse Source 
The StringBufferInputStream is deprecated, because it doesn't know the
encoding of the string it is buffering. This has been changed to use
a ByteArrayInputStream with UTF-8 encoding now.

Also made use of previously unused mimeType parameter to set the
Content-Type header of the response.
This commit is contained in:
Peter Serwylo 2015-08-17 17:15:41 +10:00
parent 99ebc84a91
commit 2008708cd9
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java
View File

@ -6,11 +6,12 @@ import org.fdroid.fdroid.net.bluetooth.BluetoothConnection;
import org.fdroid.fdroid.net.bluetooth.FileDetails; import org.fdroid.fdroid.net.bluetooth.FileDetails;
import org.fdroid.fdroid.net.bluetooth.httpish.headers.Header; import org.fdroid.fdroid.net.bluetooth.httpish.headers.Header;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.StringBufferInputStream; import java.io.UnsupportedEncodingException;
import java.io.Writer; import java.io.Writer;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -41,13 +42,22 @@ public class Response {
public Response(int statusCode, String mimeType, String content) { public Response(int statusCode, String mimeType, String content) {
this.statusCode = statusCode; this.statusCode = statusCode;
this.headers = new HashMap<String,String>(); this.headers = new HashMap<>();
this.contentStream = new StringBufferInputStream(content); this.headers.put("Content-Type", mimeType);
try {
this.contentStream = new ByteArrayInputStream(content.getBytes("UTF-8"));
} catch (UnsupportedEncodingException e) {
// Not quite sure what to do in the case of a phone not supporting UTF-8, so lets
// throw a runtime exception and hope that we get good bug reports if this ever happens.
Log.e(TAG, "Device does not support UTF-8: " + e.getMessage());
throw new IllegalStateException("Device does not support UTF-8.", e);
}
} }
public Response(int statusCode, String mimeType, InputStream contentStream) { public Response(int statusCode, String mimeType, InputStream contentStream) {
this.statusCode = statusCode; this.statusCode = statusCode;
this.headers = new HashMap<String,String>(); this.headers = new HashMap<>();
this.headers.put("Content-Type", mimeType);
this.contentStream = contentStream; this.contentStream = contentStream;
} }