From c36a71caf2d77afb61fdf9ae3752de28d6447db8 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Mon, 1 Oct 2018 13:07:33 +0200
Subject: [PATCH] Avoid duplicated cookies

---
 .../owncloud/android/lib/common/http/HttpClient.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/src/com/owncloud/android/lib/common/http/HttpClient.java
index 4820fc1d..6a66cc28 100644
--- a/src/com/owncloud/android/lib/common/http/HttpClient.java
+++ b/src/com/owncloud/android/lib/common/http/HttpClient.java
@@ -36,7 +36,9 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLContext;
@@ -81,7 +83,13 @@ public class HttpClient {
                 CookieJar cookieJar = new CookieJar() {
                     @Override
                     public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {
-                        sCookieStore.put(url.host(), cookies);
+                        // Avoid duplicated cookies
+                        Set<Cookie> nonDuplicatedCookiesSet = new HashSet<>();
+                        nonDuplicatedCookiesSet.addAll(cookies);
+                        List<Cookie> nonDuplicatedCookiesList = new ArrayList<>();
+                        nonDuplicatedCookiesList.addAll(nonDuplicatedCookiesSet);
+
+                        sCookieStore.put(url.host(), nonDuplicatedCookiesList);
                     }
 
                     @Override