From 5a666a6a9d5977e664d921691cee5f6ed2024c23 Mon Sep 17 00:00:00 2001
From: Mark Anderson <manderson23@gmail.com>
Date: Tue, 31 Mar 2015 22:03:56 +0100
Subject: [PATCH] Minor cleanup in APIManager.

---
 .../src/com/newsblur/network/APIManager.java  | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/clients/android/NewsBlur/src/com/newsblur/network/APIManager.java b/clients/android/NewsBlur/src/com/newsblur/network/APIManager.java
index 4562072a4..285d1414b 100644
--- a/clients/android/NewsBlur/src/com/newsblur/network/APIManager.java
+++ b/clients/android/NewsBlur/src/com/newsblur/network/APIManager.java
@@ -513,15 +513,11 @@ public class APIManager {
         int tryCount = 0;
         do {
             backoffSleep(tryCount++);
-            response = get_single(urlString);
+            response = get_single(urlString, HttpStatus.SC_OK);
         } while ((response.isError()) && (tryCount < AppConstants.MAX_API_TRIES));
         return response;
     }
 
-    private APIResponse get_single(final String urlString) {
-        return get_single(urlString, HttpStatus.SC_OK);
-    }
-
 	private APIResponse get_single(final String urlString, int expectedReturnCode) {
 		if (!NetworkUtils.isOnline(context)) {
 			return new APIResponse(context);
@@ -532,16 +528,20 @@ public class APIManager {
 		}
 
 		Request.Builder requestBuilder = new Request.Builder().url(urlString);
+		addCookieHeader(requestBuilder);
+		requestBuilder.header("User-Agent", this.customUserAgent);
+
+		return new APIResponse(context, httpClient, requestBuilder.build(), expectedReturnCode);
+	}
+
+	private void addCookieHeader(Request.Builder requestBuilder) {
 		SharedPreferences preferences = context.getSharedPreferences(PrefConstants.PREFERENCES, 0);
 		String cookie = preferences.getString(PrefConstants.PREF_COOKIE, null);
 		if (cookie != null) {
 			requestBuilder.header("Cookie", cookie);
 		}
-		requestBuilder.header("User-Agent", this.customUserAgent);
-
-		return new APIResponse(context, httpClient, requestBuilder.build(), expectedReturnCode);
 	}
-	
+
 	private APIResponse get(final String urlString, final ContentValues values) {
         return this.get(urlString + "?" + builderGetParametersString(values));
 	}
@@ -583,11 +583,7 @@ public class APIManager {
 		}
 
 		Request.Builder requestBuilder = new Request.Builder().url(urlString);
-		SharedPreferences preferences = context.getSharedPreferences(PrefConstants.PREFERENCES, 0);
-		String cookie = preferences.getString(PrefConstants.PREF_COOKIE, null);
-		if (cookie != null) {
-			requestBuilder.header("Cookie", cookie);
-		}
+		addCookieHeader(requestBuilder);
 		requestBuilder.post(formBody);
 
 		return new APIResponse(context, httpClient, requestBuilder.build());