Fix logout bug

There's a Cloudflare cookie with a 30 min expiry, and our cookie code
was including those when calculating the expiry date for the actual site
cookies (which are like a year). Now it doesn't do that

Author: baka-kaba

Awful.apk/src/main/java/com/ferg/awfulapp/network/CookieController.java

@@ -153,6 +153,9 @@ public static synchronized boolean saveLoginCookies(Context ctx) {
         Date expires = null;
         Integer version = null;
 
+        Timber.d("Saving cookies - here's what we got:");
+        logCookies();
+
         for (HttpCookie cookie : cookieManager.getCookieStore().get(uri)) {
             switch (cookie.getName()) {
                 case Constants.COOKIE_NAME_USERID:
@@ -167,6 +170,9 @@ public static synchronized boolean saveLoginCookies(Context ctx) {
                 case Constants.COOKIE_NAME_SESSIONHASH:
                     sessionHash = cookie.getValue();
                     break;
+                default:
+                    // unrecognised cookie, ignore it! some cloudflare ones have a real short expiry
+                    continue;
             }
 
             // keep the soonest valid expiry in case they don't match
@@ -196,6 +202,7 @@ public static synchronized boolean saveLoginCookies(Context ctx) {
             edit.putString(Constants.COOKIE_PREF_SESSIONHASH, sessionHash);
         }
         if (expires != null) {
+            Timber.i("Storing login cookie, expires: %s", expires.toString());
             edit.putLong(Constants.COOKIE_PREF_EXPIRY_DATE, expires.getTime());
         }
         edit.putInt(Constants.COOKIE_PREF_VERSION, version);
@@ -218,7 +225,8 @@ public static void logCookies() {
             Timber.i("---BEGIN COOKIE DUMP---");
             List<HttpCookie> cookies = cookieManager.getCookieStore().getCookies();
             for (HttpCookie c : cookies) {
-                Timber.i(c.toString());
+                Timber.d("Name: %s\nSecure only: %b, expired: %b, max age: %d\nContent: %s\n",
+                        c.getName(), c.getSecure(), c.hasExpired(), c.getMaxAge(), c.toString());
             }
             Timber.i("---END COOKIE DUMP---");
         }