Added a rawResponse field to the GooglePlayException

yeriomin · Aug 28, 2018 · 51a1f1d · 51a1f1d
1 parent aa18403
commit 51a1f1d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/src/main/java/com/github/yeriomin/playstoreapi/GooglePlayException.java b/src/main/java/com/github/yeriomin/playstoreapi/GooglePlayException.java
@@ -5,6 +5,7 @@
 public class GooglePlayException extends IOException {
 
  protected int code;
+ protected byte[] rawResponse;
 
  public GooglePlayException(String message) {
  super(message);
@@ -27,4 +28,12 @@ public void setCode(int code) {
  public int getCode() {
  return this.code;
  }
+
+ public byte[] getRawResponse() {
+ return rawResponse;
+ }
+
+ public void setRawResponse(byte[] rawResponse) {
+ this.rawResponse = rawResponse;
+ }
 }
diff --git a/src/test/java/com/github/yeriomin/playstoreapi/OkHttpClientAdapter.java b/src/test/java/com/github/yeriomin/playstoreapi/OkHttpClientAdapter.java
@@ -100,17 +100,19 @@ byte[] request(Request.Builder requestBuilder, Map<String, String> headers) thro
  int code = response.code();
  byte[] content = response.body().bytes();
 
- if (code == 401 || code == 403) {
- AuthException e = new AuthException("Auth error", code);
- Map<String, String> authResponse = GooglePlayAPI.parseResponse(new String(content));
- if (authResponse.containsKey("Error") && authResponse.get("Error").equals("NeedsBrowser")) {
- e.setTwoFactorUrl(authResponse.get("Url"));
+ if (code >= 400) {
+ GooglePlayException e = new GooglePlayException("Malformed request", code);
+ if (code == 401 || code == 403) {
+ e = new AuthException("Auth error", code);
+ Map<String, String> authResponse = GooglePlayAPI.parseResponse(new String(content));
+ if (authResponse.containsKey("Error") && authResponse.get("Error").equals("NeedsBrowser")) {
+ ((AuthException) e).setTwoFactorUrl(authResponse.get("Url"));
+ }
+ } else if (code >= 500) {
+ e = new GooglePlayException("Server error", code);
  }
+ e.setRawResponse(content);
  throw e;
- } else if (code >= 500) {
- throw new GooglePlayException("Server error", code);
- } else if (code >= 400) {
- throw new GooglePlayException("Malformed request", code);
  }
 
  return content;