Merge branch 'fix-12.4'

UweTrottmann · Mar 27, 2014 · 0dd18b8 · 0dd18b8
2 parents d7f8edb + 29c590f
commit 0dd18b8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ Changelog
 
 All dates are in the European Central timezone.
 
+Version 12.4 *(2014-03-27)*
+---------------------------
+
+* FIX Full trakt sync not downloading unwatched and uncollected episodes correctly.
+* FIX Crash when adding movie.
+
 Version 12.3 *(2014-03-08)*
 ---------------------------
 

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/MovieTools.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/MovieTools.java
@@ -352,10 +352,9 @@ protected Integer doInBackground(Integer... params) {
 
         @Override
         protected void onPostExecute(Integer movieTmdbId) {
-            // Guarding against odd NPE, https://github.com/UweTrottmann/SeriesGuide/issues/371
-            EventBus bus = EventBus.getDefault();
-            if (bus != null) {
-                bus.post(new MovieChangedEvent(movieTmdbId));
+            // guard against NPE https://github.com/UweTrottmann/SeriesGuide/issues/371
+            if (movieTmdbId != null) {
+                EventBus.getDefault().post(new MovieChangedEvent(movieTmdbId));
             }
         }
     }

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktTools.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktTools.java
@@ -187,15 +187,13 @@ public static void applyEpisodeFlagChanges(Context context,
                 episodeFlag = EpisodeFlags.WATCHED;
                 episodeDefaultFlag = EpisodeFlags.UNWATCHED;
                 // do not remove flag of skipped episodes, only for watched ones
-                clearSelection = SeriesGuideContract.Episodes.SEASON + "=? AND "
-                        + SeriesGuideContract.Episodes.WATCHED + "=" + EpisodeFlags.WATCHED;
+                clearSelection = SeriesGuideContract.Episodes.WATCHED + "=" + EpisodeFlags.WATCHED;
                 break;
             case SeriesGuideContract.Episodes.COLLECTED:
                 episodeFlag = 1;
                 episodeDefaultFlag = 0;
                 // only remove flags for already collected episodes
-                clearSelection = SeriesGuideContract.Episodes.SEASON + "=? AND "
-                        + SeriesGuideContract.Episodes.COLLECTED + "=1";
+                clearSelection = SeriesGuideContract.Episodes.COLLECTED + "=1";
                 break;
             default:
                 return;

diff --git a/build.gradle b/build.gradle
@@ -32,8 +32,8 @@ ext {
     compileSdkVersion = 19
     buildToolsVersion = '19.0.3'
 
-    versionCode = 240
-    versionName = '12.3'
+    versionCode = 244
+    versionName = '12.4'
 }
 
 ext.libraries = [