From e7a0e30a2773a4de694e37b3f8882db158b137cd Mon Sep 17 00:00:00 2001
From: masensio <masensio@solidgear.es>
Date: Thu, 12 Jun 2014 11:07:49 +0200
Subject: [PATCH] Add getCookiesString method in OwnCloudClient

---
 .../android/lib/common/OwnCloudClient.java    | 25 +++++++++++++++++
 .../lib/common/SingleSessionManager.java      | 27 ++++---------------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/src/com/owncloud/android/lib/common/OwnCloudClient.java
index 615f1b20..521e68ba 100644
--- a/src/com/owncloud/android/lib/common/OwnCloudClient.java
+++ b/src/com/owncloud/android/lib/common/OwnCloudClient.java
@@ -415,6 +415,31 @@ public class OwnCloudClient extends HttpClient {
         }
         
 	}
+	
+	public String getCookiesString(){
+		Cookie[] cookies = getState().getCookies(); 
+		String cookiesString ="";
+		for (Cookie cookie: cookies) {
+			cookiesString = cookiesString + cookie.toString() + ";";
+			
+			logCookie(cookie);
+		}
+		
+		return cookiesString;
+		
+	}
+	
+	private void logCookie(Cookie cookie) {
+    	Log.d(TAG, "Cookie name: "+ cookie.getName() );
+    	Log.d(TAG, "       value: "+ cookie.getValue() );
+    	Log.d(TAG, "       domain: "+ cookie.getDomain());
+    	Log.d(TAG, "       path: "+ cookie.getPath() );
+    	Log.d(TAG, "       version: "+ cookie.getVersion() );
+    	Log.d(TAG, "       expiryDate: " + 
+    			(cookie.getExpiryDate() != null ? cookie.getExpiryDate().toString() : "--"));
+    	Log.d(TAG, "       comment: "+ cookie.getComment() );
+    	Log.d(TAG, "       secure: "+ cookie.getSecure() );
+    }
 
 
 }
diff --git a/src/com/owncloud/android/lib/common/SingleSessionManager.java b/src/com/owncloud/android/lib/common/SingleSessionManager.java
index 4c636513..d1bea6ec 100644
--- a/src/com/owncloud/android/lib/common/SingleSessionManager.java
+++ b/src/com/owncloud/android/lib/common/SingleSessionManager.java
@@ -166,16 +166,11 @@ public class SingleSessionManager implements OwnCloudClientManager {
 	    		OwnCloudClient client = clientsPerAccount.get(credentials);
 	    		
 	    		if (client != null) {
-
-		    		Cookie[] cookies = client.getState().getCookies(); 
-		    		String cookiesString ="";
-		    		for (Cookie cookie: cookies) {
-		    			cookiesString = cookiesString + cookie.toString() + ";";
-		    			
-		    			logCookie(cookie);
-		    		}
-		    		ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString); 
-		    		Log.d(TAG, "Saving Cookies: "+ cookiesString );
+	    			String cookiesString = client.getCookiesString();
+	    			if (cookiesString != "") {
+	    				ac.setUserData(savedAccount, Constants.KEY_COOKIES, cookiesString); 
+	    				Log.d(TAG, "Saving Cookies: "+ cookiesString );
+	    			}
 	    		}
     		}
     	}
@@ -197,18 +192,6 @@ public class SingleSessionManager implements OwnCloudClientManager {
     	}
     	
     }
-    
-    private void logCookie(Cookie cookie) {
-    	Log.d(TAG, "Cookie name: "+ cookie.getName() );
-    	Log.d(TAG, "       value: "+ cookie.getValue() );
-    	Log.d(TAG, "       domain: "+ cookie.getDomain());
-    	Log.d(TAG, "       path: "+ cookie.getPath() );
-    	Log.d(TAG, "       version: "+ cookie.getVersion() );
-    	Log.d(TAG, "       expiryDate: " + 
-    			(cookie.getExpiryDate() != null ? cookie.getExpiryDate().toString() : "--"));
-    	Log.d(TAG, "       comment: "+ cookie.getComment() );
-    	Log.d(TAG, "       secure: "+ cookie.getSecure() );
-    }
 
 
 }