Merge branch 'hotfix/6.5.6'

CHANGELOG.md

@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+Version 6.5.6
+-------------
+ * Bug fixes
+
 Version 6.5.5
 -------------
  * Bug fixes

app/build.gradle

@@ -11,8 +11,8 @@ buildscript {
 
 def versionMajor = 6
 def versionMinor = 5
-def versionPatch = 5
-def versionBuild = 2
+def versionPatch = 6
+def versionBuild = 3
 
 apply plugin: 'com.android.application'
 apply plugin: 'io.fabric'
@@ -106,15 +106,15 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
 
-    compile 'com.android.support:appcompat-v7:26.0.2'
-    compile 'com.android.support:cardview-v7:26.0.2'
-    compile 'com.android.support:design:26.0.2'
-    compile 'com.android.support:palette-v7:26.0.2'
-    compile 'com.android.support:percent:26.0.2'
-    compile 'com.android.support:recyclerview-v7:26.0.2'
-    implementation 'com.android.support:support-annotations:26.0.2'
+    compile 'com.android.support:appcompat-v7:26.1.0'
+    compile 'com.android.support:cardview-v7:26.1.0'
+    compile 'com.android.support:design:26.1.0'
+    compile 'com.android.support:palette-v7:26.1.0'
+    compile 'com.android.support:percent:26.1.0'
+    compile 'com.android.support:recyclerview-v7:26.1.0'
+    implementation 'com.android.support:support-annotations:26.1.0'
 
-    compile 'com.google.code.gson:gson:2.8.1'
+    compile 'com.google.code.gson:gson:2.8.2'
 
     compile 'com.squareup.retrofit2:retrofit:2.3.0'
     compile 'com.squareup.retrofit2:converter-gson:2.3.0'
@@ -124,8 +124,8 @@ dependencies {
         exclude group: 'xpp3', module: 'xpp3'
     }
 
-    compile 'com.squareup.okhttp3:okhttp:3.8.1'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.8.1'
+    compile 'com.squareup.okhttp3:okhttp:3.9.0'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.9.0'
 
     compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
 
@@ -140,7 +140,7 @@ dependencies {
 
     compile 'com.github.chrisbanes.photoview:library:1.2.4'
 
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
+    compile('com.crashlytics.sdk.android:crashlytics:2.7.1@aar') {
         transitive = true
     }
 
@@ -164,11 +164,11 @@ dependencies {
 
     compile 'org.jsoup:jsoup:1.10.3'
 
-    provided "com.google.auto.value:auto-value:1.5"
-    annotationProcessor "com.google.auto.value:auto-value:1.5"
+    provided "com.google.auto.value:auto-value:1.5.2"
+    annotationProcessor "com.google.auto.value:auto-value:1.5.2"
 
     compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'io.reactivex:rxjava:1.3.0'
+    compile 'io.reactivex:rxjava:1.3.3'
 
     compile 'frankiesardo:icepick:3.2.0'
     provided 'frankiesardo:icepick-processor:3.2.0'

app/src/main/java/com/boardgamegeek/model/ThingResponse.java

@@ -1,5 +1,7 @@
 package com.boardgamegeek.model;
 
+import android.support.annotation.NonNull;
+
 import org.simpleframework.xml.ElementList;
 
 import java.util.ArrayList;
@@ -11,6 +13,7 @@ public class ThingResponse {
 	@ElementList(name = "items", inline = true, required = false)
 	private List<Game> games;
 
+	@NonNull
 	public List<Game> getGames() {
 		if (games == null) {
 			return new ArrayList<>();

app/src/main/java/com/boardgamegeek/model/persister/GamePersister.java

@@ -60,7 +60,7 @@ public int save(List<Game> games, String debugMessage) {
 		boolean avoidBatching = PreferencesUtils.getAvoidBatching(context);
 		int recordCount = 0;
 		ArrayList<ContentProviderOperation> batch = new ArrayList<>();
-		if (games != null) {
+		if (games != null && games.size() > 0) {
 
 			DesignerPersister designerPersister = new DesignerPersister();
 			ArtistPersister artistPersister = new ArtistPersister();

app/src/main/java/com/boardgamegeek/provider/CollectionProvider.java

@@ -39,17 +39,11 @@ protected SelectionBuilder buildExpandedSelection(Uri uri, String[] projection)
 							GameSuggestedPlayerCountPollPollResults.GAME_ID,
 							playerCount));
 				}
-				if (TextUtils.isEmpty(groupBy)) {
-					groupBy = Collection.GAME_ID;
-				}
+				if (TextUtils.isEmpty(groupBy)) groupBy = Collection.GAME_ID;
 			}
 		}
 
-		if (!TextUtils.isEmpty(groupBy)) {
-			builder.groupBy(groupBy);
-		} else {
-			builder.groupBy(Collection.COLLECTION_ID);
-		}
+		if (!TextUtils.isEmpty(groupBy)) builder.groupBy(groupBy);
 
 		String having = uri.getQueryParameter(BggContract.QUERY_KEY_HAVING);
 		builder.having(having);

app/src/main/java/com/boardgamegeek/service/SyncGames.java

@@ -8,12 +8,18 @@
 
 import com.boardgamegeek.R;
 import com.boardgamegeek.io.BggService;
-import com.boardgamegeek.io.ThingRequest;
-import com.boardgamegeek.io.ThingResponse;
+import com.boardgamegeek.model.Game;
+import com.boardgamegeek.model.ThingResponse;
 import com.boardgamegeek.model.persister.GamePersister;
 import com.boardgamegeek.provider.BggContract.Games;
 import com.boardgamegeek.service.model.GameList;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import retrofit2.Call;
+import retrofit2.Response;
 import timber.log.Timber;
 
 public abstract class SyncGames extends SyncTask {
@@ -43,17 +49,54 @@ public void execute(Account account, @NonNull SyncResult syncResult) {
 					}
 					updateProgressNotification(detail);
 
-					ThingResponse response = new ThingRequest(service, gameList.getIds()).execute();
-					if (response.hasError()) {
-						showError(response.getError());
+					Call<ThingResponse> call = service.thing(gameList.getIds(), 1);
+					try {
+						Response<ThingResponse> response = call.execute();
+						if (response.isSuccessful()) {
+							final List<Game> games = response.body() == null ? new ArrayList<Game>(0) : response.body().getGames();
+							if (games.size() > 0) {
+								int count = new GamePersister(context).save(games, detail);
+								syncResult.stats.numUpdates += games.size();
+								Timber.i("...saved %,d rows for %,d games", count, games.size());
+							} else {
+								Timber.i("...no games returned");
+								break;
+							}
+						} else {
+							Timber.w("Received response %s while syncing games.", response.code());
+							if (response.code() >= 500) {
+								showError(context.getString(R.string.msg_sync_response_500, response.code()));
+								return;
+							} else if (response.code() == 429) {
+								showError(context.getString(R.string.msg_sync_response_429));
+								if (wasSleepInterrupted(5000)) return;
+							} else {
+								showError(context.getString(R.string.msg_sync_unsuccessful_response,
+									context.getString(R.string.game),
+									response.code()));
+								return;
+							}
+						}
+					} catch (IOException e) {
+						showError(e.getLocalizedMessage());
 						syncResult.stats.numIoExceptions++;
 						break;
-					} else if (response.getNumberOfGames() > 0) {
-						int count = new GamePersister(context).save(response.getGames(), detail);
-						syncResult.stats.numUpdates += response.getNumberOfGames();
-						Timber.i("...saved %,d rows for %,d games", count, response.getNumberOfGames());
-					} else {
-						Timber.i("...no games returned ");
+					} catch (RuntimeException e) {
+						Throwable cause = e.getCause();
+						if (cause instanceof ClassNotFoundException &&
+							cause.getMessage().startsWith("Didn't find class \"messagebox error\" on path")) {
+							syncResult.stats.numParseExceptions++;
+							Timber.i("Invalid list of game IDs: %s", gameList.getIds());
+							for (int i = 0; i < gameList.getSize(); i++) {
+								final boolean shouldBreak = syncGame(gameList.getId(i), syncResult, gameList.getName(i));
+								if (shouldBreak) break;
+							}
+						} else {
+							Timber.w(e);
+							showError(e.getLocalizedMessage());
+							syncResult.stats.numParseExceptions++;
+							break;
+						}
 					}
 				} else {
 					Timber.i(getExitLogMessage());
@@ -65,6 +108,39 @@ public void execute(Account account, @NonNull SyncResult syncResult) {
 		}
 	}
 
+	private boolean syncGame(Integer id, @NonNull SyncResult syncResult, String gameName) {
+		Call<ThingResponse> call = service.thing(id, 1);
+		try {
+			Response<ThingResponse> response = call.execute();
+			if (response.isSuccessful()) {
+				final List<Game> games = response.body() == null ? new ArrayList<Game>(0) : response.body().getGames();
+				String detail = context.getResources().getQuantityString(R.plurals.sync_notification_games, 1, 1, gameName);
+				int count = new GamePersister(context).save(games, detail);
+				syncResult.stats.numUpdates += games.size();
+				Timber.i("...saved %,d rows for %,d games", count, games.size());
+			} else {
+				Timber.w("Received response %s while syncing games.", response.code());
+				if (response.code() >= 500) {
+					showError(context.getString(R.string.msg_sync_response_500, response.code()));
+					return true;
+				} else if (response.code() == 429) {
+					showError(context.getString(R.string.msg_sync_response_429));
+					if (wasSleepInterrupted(5000)) return true;
+				} else {
+					showError(context.getString(R.string.msg_sync_unsuccessful_response,
+						context.getString(R.string.game),
+						response.code()));
+					return true;
+				}
+			}
+		} catch (IOException e) {
+			showError(e.getLocalizedMessage());
+			syncResult.stats.numIoExceptions++;
+			return true;
+		}
+		return false;
+	}
+
 	protected int getMaxFetchCount() {
 		return 1;
 	}

app/src/main/java/com/boardgamegeek/service/model/GameList.java

@@ -36,4 +36,12 @@ public String getIds() {
 	public List<Integer> getIdList() {
 		return gameIds;
 	}
+
+	public Integer getId(int i) {
+		return gameIds.get(i);
+	}
+
+	public String getName(int i) {
+		return gameNames.get(i);
+	}
 }

app/src/main/java/com/boardgamegeek/ui/CollectionFragment.java

@@ -443,12 +443,8 @@ private String buildDefaultWhereClause() {
 		}
 		StringBuilder where = new StringBuilder();
 		for (String status : statuses) {
-			if (TextUtils.isEmpty(status)) {
-				continue;
-			}
-			if (where.length() > 0) {
-				where.append(" OR ");
-			}
+			if (TextUtils.isEmpty(status)) continue;
+			if (where.length() > 0) where.append(" OR ");
 			switch (status) {
 				case "own":
 					where.append(Collection.STATUS_OWN).append("=1");

app/src/main/java/com/boardgamegeek/ui/LoginActivity.java

@@ -230,11 +230,14 @@ private void createAccount(BggCookieJar bggCookieJar) {
 		if (isRequestingNewAccount) {
 			if (!accountManager.addAccountExplicitly(account, password, userData)) {
 				Account existingAccount = Authenticator.getAccount(accountManager);
-				if (existingAccount != null && existingAccount.name.equals(account.name)) {
-					accountManager.setPassword(account, password);
-				} else {
+				if (existingAccount == null) {
 					passwordContainer.setError(getString(R.string.error_account_not_added));
 					return;
+				} else if (!existingAccount.name.equals(account.name)) {
+					passwordContainer.setError(getString(R.string.error_account_name_mismatch, existingAccount.name, account.name));
+					return;
+				} else {
+					accountManager.setPassword(account, password);
 				}
 			}
 		} else {

app/src/main/res/layout/fragment_geeklist_description.xml

@@ -25,7 +25,7 @@
 
 		<FrameLayout style="@style/WebViewContainer">
 
-			<WebView
+			<com.boardgamegeek.ui.widget.NestedScrollWebView
 				android:id="@+id/body"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"/>