moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-21 12:03:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Throw proper exceptions when an HTTP request fails

Browse Source
This commit is contained in:
Cameron Gutman 2014-11-13 21:56:07 -08:00
parent 52f81274f0
commit 022a08f5a1
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
moonlight-common/src/com/limelight/nvstream/http/NvHTTP.java
View File

@ -1,5 +1,6 @@
package com.limelight.nvstream.http; package com.limelight.nvstream.http;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
@ -36,6 +37,7 @@ import com.limelight.nvstream.StreamConfiguration;
import com.limelight.nvstream.http.PairingManager.PairState; import com.limelight.nvstream.http.PairingManager.PairState;
import com.squareup.okhttp.OkHttpClient; import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Request; import com.squareup.okhttp.Request;
import com.squareup.okhttp.Response;
import com.squareup.okhttp.ResponseBody; import com.squareup.okhttp.ResponseBody;
@ -230,14 +232,25 @@ public class NvHTTP {
// queries do not. // queries do not.
private ResponseBody openHttpConnection(String url, boolean enableReadTimeout) throws IOException { private ResponseBody openHttpConnection(String url, boolean enableReadTimeout) throws IOException {
Request request = new Request.Builder().url(url).build(); Request request = new Request.Builder().url(url).build();
Response response;
if (enableReadTimeout) { if (enableReadTimeout) {
performAndroidTlsHack(httpClientWithReadTimeout); performAndroidTlsHack(httpClientWithReadTimeout);
return httpClientWithReadTimeout.newCall(request).execute().body(); response = httpClientWithReadTimeout.newCall(request).execute();
} }
else { else {
performAndroidTlsHack(httpClient); performAndroidTlsHack(httpClient);
return httpClient.newCall(request).execute().body(); response = httpClient.newCall(request).execute();
}
if (response.isSuccessful()) {
return response.body();
}
else if (response.code() == 404) {
throw new FileNotFoundException(url);
}
else {
throw new IOException("HTTP request failed: "+response.code());
} }
} }