Merge tag '5.3.3'

app/build.gradle

@@ -22,8 +22,8 @@ android {
     defaultConfig {
         testApplicationId "org.tasks.test"
         applicationId "org.tasks"
-        versionCode 504
-        versionName "5.3.2"
+        versionCode 505
+        versionName "5.3.3"
         targetSdkVersion 27
         minSdkVersion 15
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

app/src/main/java/org/tasks/data/AlarmDao.java

@@ -9,12 +9,12 @@ import java.util.List;
 
 @Dao
 public interface AlarmDao {
-    @Query("SELECT alarms.* FROM alarms INNER JOIN tasks ON tasks._id = alarms._id " +
+    @Query("SELECT alarms.* FROM alarms INNER JOIN tasks ON tasks._id = alarms.task " +
             "WHERE tasks.completed = 0 AND tasks.deleted = 0 AND tasks.lastNotified < alarms.time " +
             "ORDER BY time ASC")
     List<Alarm> getActiveAlarms();
 
-    @Query("SELECT alarms.* FROM alarms INNER JOIN tasks ON tasks._id = alarms._id " +
+    @Query("SELECT alarms.* FROM alarms INNER JOIN tasks ON tasks._id = alarms.task " +
             "WHERE tasks._id = :taskId AND tasks.completed = 0 AND tasks.deleted = 0 AND tasks.lastNotified < alarms.time " +
             "ORDER BY time ASC")
     List<Alarm> getActiveAlarms(long taskId);