Correct rating sort descriptions; handle expired session while upload…

…ing plays more aggressively
ccomeaux · May 12, 2014 · 4ca9808 · 4ca9808
1 parent ee7a71f
commit 4ca9808
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/BoardGameGeek/src/com/boardgamegeek/data/sort/GeekRatingSortData.java b/BoardGameGeek/src/com/boardgamegeek/data/sort/GeekRatingSortData.java
@@ -15,7 +15,7 @@ public class GeekRatingSortData extends CollectionSortData {
 	public GeekRatingSortData(Context context) {
 		super(context);
 		mOrderByClause = Collection.SORT_BY_RATING;
-		mDescriptionId = R.string.rating;
+        mDescriptionId = R.string.menu_collection_sort_rating;
 	}
 
 	@Override

diff --git a/BoardGameGeek/src/com/boardgamegeek/data/sort/MyRatingSortData.java b/BoardGameGeek/src/com/boardgamegeek/data/sort/MyRatingSortData.java
@@ -15,7 +15,7 @@ public class MyRatingSortData extends CollectionSortData {
 	public MyRatingSortData(Context context) {
 		super(context);
 		mOrderByClause = getClause(Collection.RATING, true);
-		mDescriptionId = R.string.rating;
+        mDescriptionId = R.string.menu_collection_sort_myrating;
 	}
 
 	@Override

diff --git a/BoardGameGeek/src/com/boardgamegeek/service/SyncPlaysUpload.java b/BoardGameGeek/src/com/boardgamegeek/service/SyncPlaysUpload.java
@@ -112,9 +112,6 @@ private void updatePendingPlays(String username, SyncResult syncResult) {
 					syncResult.stats.numAuthExceptions++;
 					Authenticator.clearPassword(mContext);
 					break;
-				} else if (response.hasBadIdError()) {
-					PlayPersister.delete(mContext.getContentResolver(), play);
-					notifyUser(mContext.getResources().getString(R.string.msg_play_update_bad_id));
 				} else {
 					syncResult.stats.numIoExceptions++;
 					notifyUser(response.error);
@@ -438,11 +435,9 @@ boolean hasError() {
 		}
 
 		boolean hasAuthError() {
-			return hasError() && error.contains("You must login to save plays");
-		}
-
-		boolean hasBadIdError() {
-			return hasError() && error.contains("You are not permitted to edit this play.");
+			return hasError()
+				&& (error.contains("You must login to save plays") || error
+					.contains("You are not permitted to edit this play."));
 		}
 	}
 }