From 130ceea9ad4b3c9c5da576d221aec0467847c815 Mon Sep 17 00:00:00 2001
From: ojiikun <ojiikun@gmail.com>
Date: Tue, 2 Jul 2013 08:58:41 +0000
Subject: [PATCH] Fixing bad merge.

---
 .../network/domain/NewsBlurResponse.java      | 35 -------------------
 .../network/domain/RegisterResponse.java      |  8 -----
 .../network/domain/ResponseErrors.java        | 15 --------
 3 files changed, 58 deletions(-)
 delete mode 100644 media/android/NewsBlur/src/com/newsblur/network/domain/NewsBlurResponse.java
 delete mode 100644 media/android/NewsBlur/src/com/newsblur/network/domain/RegisterResponse.java
 delete mode 100644 media/android/NewsBlur/src/com/newsblur/network/domain/ResponseErrors.java

diff --git a/media/android/NewsBlur/src/com/newsblur/network/domain/NewsBlurResponse.java b/media/android/NewsBlur/src/com/newsblur/network/domain/NewsBlurResponse.java
deleted file mode 100644
index 9ae639642..000000000
--- a/media/android/NewsBlur/src/com/newsblur/network/domain/NewsBlurResponse.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.newsblur.network.domain;
-
-/**
- * A generic response to an API call that only encapsuates success versus failure.
- */
-public class NewsBlurResponse {
-
-	public boolean authenticated;
-	public int code;
-    public String message;
-	public ResponseErrors errors;
-    public String result;
-
-    public boolean isError() {
-        if (message != null) return true;
-        if ((errors != null) && (errors.message.length > 0) && (errors.message[0] != null)) return true;
-        return false;
-    }
-
-    /**
-     * Gets the error message returned by the API, or defaultMessage if none was found.
-     */
-    public String getErrorMessage(String defaultMessage) {
-        if (message != null) return message;
-        if ((errors != null) && (errors.message.length > 0) && (errors.message[0] != null)) return errors.message[0];
-        return defaultMessage;
-    }
-
-    /**
-     * Gets the error message returned by the API, or a simple numeric error code if non was found.
-     */
-    public String getErrorMessage() {
-        return getErrorMessage(Integer.toString(code));
-    }
-}
diff --git a/media/android/NewsBlur/src/com/newsblur/network/domain/RegisterResponse.java b/media/android/NewsBlur/src/com/newsblur/network/domain/RegisterResponse.java
deleted file mode 100644
index 068c5e7da..000000000
--- a/media/android/NewsBlur/src/com/newsblur/network/domain/RegisterResponse.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.newsblur.network.domain;
-
-public class RegisterResponse extends NewsBlurResponse {
-
-	public String[] email;
-    public String[] username;
-
-}
diff --git a/media/android/NewsBlur/src/com/newsblur/network/domain/ResponseErrors.java b/media/android/NewsBlur/src/com/newsblur/network/domain/ResponseErrors.java
deleted file mode 100644
index e02782071..000000000
--- a/media/android/NewsBlur/src/com/newsblur/network/domain/ResponseErrors.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.newsblur.network.domain;
-
-import com.google.gson.annotations.SerializedName;
-
-public class ResponseErrors {
-
-	@SerializedName("__all__")
-	public String[] message;
-
-	@SerializedName("email")
-	public String[] email;
-
-	@SerializedName("username")
-	public String[] username;
-}