Merge branch 'hotfix/6.8.2'

ccomeaux · Jan 30, 2022 · 91b9655 · 91b9655
2 parents cd6c846 + cdaca1c
commit 91b9655
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+Version 6.8.2
+-------------
+Correct error 307 received when attempting to upload data to BGG
+
 Version 6.8.1
 -------------
 * Correct problem logging into BGG

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 
 def versionMajor = 6
 def versionMinor = 8
-def versionPatch = 1
+def versionPatch = 2
 def versionBuild = 0
 
 apply plugin: 'com.android.application'

diff --git a/app/src/main/java/com/boardgamegeek/auth/BggCookieJar.java b/app/src/main/java/com/boardgamegeek/auth/BggCookieJar.java
@@ -21,7 +21,8 @@ public void saveFromResponse(@NonNull HttpUrl url, @NonNull List<Cookie> cookies
 		Timber.w(url.toString());
 		Timber.w(cookies.toString());
 		for (Cookie cookie : cookies) {
-			if ("bggpassword".equalsIgnoreCase(cookie.name())) {
+			if ("bggpassword".equalsIgnoreCase(cookie.name()) &&
+				!"deleted".equalsIgnoreCase(cookie.value())) {
 				authToken = cookie.value();
 				authTokenExpiry = cookie.expiresAt();
 			}

diff --git a/app/src/main/java/com/boardgamegeek/io/Adapter.java b/app/src/main/java/com/boardgamegeek/io/Adapter.java
@@ -44,7 +44,7 @@ private static Retrofit.Builder createBuilderWithoutConverterFactory(Context con
 			httpClient = HttpUtils.getHttpClientWithAuth(context);
 		}
 		return new Retrofit.Builder()
-			.baseUrl("https://www.boardgamegeek.com/")
+			.baseUrl("https://boardgamegeek.com/")
 			.client(httpClient);
 	}
 }
diff --git a/app/src/main/java/com/boardgamegeek/service/CollectionTask.java b/app/src/main/java/com/boardgamegeek/service/CollectionTask.java
@@ -17,7 +17,7 @@
 import okhttp3.Response;
 
 public abstract class CollectionTask {
-	private static final String GEEK_COLLECTION_URL = "https://www.boardgamegeek.com/geekcollection.php";
+	private static final String GEEK_COLLECTION_URL = "https://boardgamegeek.com/geekcollection.php";
 	private static final String ERROR_DIV = "<div class='messagebox error'>";
 	private static final String AUTH_ERROR_TEXT = "login";
 	protected final OkHttpClient client;

diff --git a/app/src/main/java/com/boardgamegeek/service/SyncPlaysUpload.kt b/app/src/main/java/com/boardgamegeek/service/SyncPlaysUpload.kt
@@ -343,7 +343,7 @@ class SyncPlaysUpload(application: BggApplication, service: BggService, syncResu
     }
 
     companion object {
-        const val GEEK_PLAY_URL = "https://www.boardgamegeek.com/geekplay.php"
+        const val GEEK_PLAY_URL = "https://boardgamegeek.com/geekplay.php"
 
         private fun getMapKey(index: Int, key: String): String {
             return "players[$index][$key]"