Skip to content

Fix Alarm Join Query Projection Mapping #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gx-bangsong merged 1 commit into from
Mar 29, 2026
Merged

Fix Alarm Join Query Projection Mapping #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions alarm_patch.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<<<<<<< SEARCH
ClockDatabaseHelper.INSTANCES_TABLE_NAME + "." + ClockContract.InstancesColumns.CRESCENDO_DURATION,
ClockDatabaseHelper.INSTANCES_TABLE_NAME + "." + ClockContract.InstancesColumns.ALARM_VOLUME,
HOLIDAY_OPTION
};
=======
ClockDatabaseHelper.INSTANCES_TABLE_NAME + "." + ClockContract.InstancesColumns.CRESCENDO_DURATION,
ClockDatabaseHelper.INSTANCES_TABLE_NAME + "." + ClockContract.InstancesColumns.ALARM_VOLUME
};
>>>>>>> REPLACE
<<<<<<< SEARCH
public static final int INSTANCE_CRESCENDO_DURATION_INDEX = 35;
public static final int INSTANCE_ALARM_VOLUME_INDEX = 36;
public static final int INSTANCE_HOLIDAY_OPTION_INDEX = 37;

private static final int COLUMN_COUNT = HOLIDAY_OPTION_INDEX + 1;
private static final int ALARM_JOIN_INSTANCE_COLUMN_COUNT = INSTANCE_HOLIDAY_OPTION_INDEX + 1;
=======
public static final int INSTANCE_CRESCENDO_DURATION_INDEX = 35;
public static final int INSTANCE_ALARM_VOLUME_INDEX = 36;

private static final int COLUMN_COUNT = HOLIDAY_OPTION_INDEX + 1;
private static final int ALARM_JOIN_INSTANCE_COLUMN_COUNT = INSTANCE_ALARM_VOLUME_INDEX + 1;
>>>>>>> REPLACE
15 changes: 7 additions & 8 deletions app/src/main/java/com/best/deskclock/provider/Alarm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,13 @@ public Alarm[] newArray(int size) {
ClockDatabaseHelper.INSTANCES_TABLE_NAME + "." + ClockContract.InstancesColumns.MISSED_ALARM_REPEAT_COUNT,
ClockDatabaseHelper.INSTANCES_TABLE_NAME + "." + ClockContract.InstancesColumns.MISSED_ALARM_REPEAT_LIMIT,
ClockDatabaseHelper.INSTANCES_TABLE_NAME + "." + ClockContract.InstancesColumns.CRESCENDO_DURATION,
ClockDatabaseHelper.INSTANCES_TABLE_NAME + "." + ClockContract.InstancesColumns.ALARM_VOLUME,
HOLIDAY_OPTION
ClockDatabaseHelper.INSTANCES_TABLE_NAME + "." + ClockContract.InstancesColumns.ALARM_VOLUME
};
/**
* These save calls to cursor.getColumnIndexOrThrow()
* THEY MUST BE KEPT IN SYNC WITH ABOVE QUERY COLUMNS
*/
private static final int ID_INDEX = 0;
public static final int ID_INDEX = 0;
private static final int YEAR_INDEX = 1;
private static final int MONTH_INDEX = 2;
private static final int DAY_INDEX = 3;
Expand All @@ -189,16 +188,16 @@ public Alarm[] newArray(int size) {
private static final int VIBRATION_PATTERN_INDEX = 9;
private static final int FLASH_INDEX = 10;
private static final int LABEL_INDEX = 11;
private static final int RINGTONE_INDEX = 12;
public static final int RINGTONE_INDEX = 12;
private static final int DELETE_AFTER_USE_INDEX = 13;
private static final int AUTO_SILENCE_DURATION_INDEX = 14;
private static final int SNOOZE_DURATION_INDEX = 15;
private static final int MISSED_ALARM_REPEAT_LIMIT_INDEX = 16;
private static final int CRESCENDO_DURATION_INDEX = 17;
private static final int ALARM_VOLUME_INDEX = 18;
private static final int HOLIDAY_OPTION_INDEX = 19;
public static final int HOLIDAY_OPTION_INDEX = 19;

private static final int INSTANCE_STATE_INDEX = 20;
public static final int INSTANCE_STATE_INDEX = 20;
public static final int INSTANCE_ID_INDEX = 21;
public static final int INSTANCE_YEAR_INDEX = 22;
public static final int INSTANCE_MONTH_INDEX = 23;
Expand All @@ -215,10 +214,10 @@ public Alarm[] newArray(int size) {
public static final int INSTANCE_MISSED_ALARM_REPEAT_LIMIT_INDEX = 34;
public static final int INSTANCE_CRESCENDO_DURATION_INDEX = 35;
public static final int INSTANCE_ALARM_VOLUME_INDEX = 36;
public static final int INSTANCE_HOLIDAY_OPTION_INDEX = 37;
public static final int INSTANCE_HOLIDAY_OPTION_INDEX = HOLIDAY_OPTION_INDEX;

private static final int COLUMN_COUNT = HOLIDAY_OPTION_INDEX + 1;
private static final int ALARM_JOIN_INSTANCE_COLUMN_COUNT = INSTANCE_HOLIDAY_OPTION_INDEX + 1;
private static final int ALARM_JOIN_INSTANCE_COLUMN_COUNT = INSTANCE_ALARM_VOLUME_INDEX + 1;
// Public fields
public long id;
public boolean enabled;
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/java/com/best/deskclock/provider/ClockProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,12 @@ public class ClockProvider extends ContentProvider {
ALARMS_TABLE_NAME + "." + AlarmsColumns.VIBRATE);
sAlarmsWithInstancesProjection.put(ALARMS_TABLE_NAME + "." + AlarmsColumns.VIBRATION_PATTERN,
ALARMS_TABLE_NAME + "." + AlarmsColumns.VIBRATION_PATTERN);
sAlarmsWithInstancesProjection.put(AlarmsColumns.VIBRATION_PATTERN,
ALARMS_TABLE_NAME + "." + AlarmsColumns.VIBRATION_PATTERN);
sAlarmsWithInstancesProjection.put(ALARMS_TABLE_NAME + "." + AlarmsColumns.HOLIDAY_OPTION,
ALARMS_TABLE_NAME + "." + AlarmsColumns.HOLIDAY_OPTION);
sAlarmsWithInstancesProjection.put(AlarmsColumns.HOLIDAY_OPTION,
ALARMS_TABLE_NAME + "." + AlarmsColumns.HOLIDAY_OPTION);
sAlarmsWithInstancesProjection.put(ALARMS_TABLE_NAME + "." + AlarmsColumns.FLASH,
ALARMS_TABLE_NAME + "." + AlarmsColumns.FLASH);
sAlarmsWithInstancesProjection.put(ALARMS_TABLE_NAME + "." + AlarmsColumns.LABEL,
Expand All @@ -95,6 +99,8 @@ public class ClockProvider extends ContentProvider {
ALARMS_TABLE_NAME + "." + AlarmsColumns.SNOOZE_DURATION);
sAlarmsWithInstancesProjection.put(ALARMS_TABLE_NAME + "." + AlarmsColumns.MISSED_ALARM_REPEAT_LIMIT,
ALARMS_TABLE_NAME + "." + AlarmsColumns.MISSED_ALARM_REPEAT_LIMIT);
sAlarmsWithInstancesProjection.put(AlarmsColumns.MISSED_ALARM_REPEAT_LIMIT,
ALARMS_TABLE_NAME + "." + AlarmsColumns.MISSED_ALARM_REPEAT_LIMIT);
sAlarmsWithInstancesProjection.put(ALARMS_TABLE_NAME + "." + AlarmsColumns.CRESCENDO_DURATION,
ALARMS_TABLE_NAME + "." + AlarmsColumns.CRESCENDO_DURATION);
sAlarmsWithInstancesProjection.put(ALARMS_TABLE_NAME + "." + AlarmsColumns.ALARM_VOLUME,
Expand Down
Loading