fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

obtain the repeat interval from db

This commit is contained in:
tibbi 2016-09-11 11:08:52 +02:00
parent 58f252f180
commit 6780f6f250
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/com/simplemobiletools/calendar/DBHelper.java
View File

@ -5,6 +5,7 @@ import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
import android.database.sqlite.SQLiteQueryBuilder;
import android.text.TextUtils; import android.text.TextUtils;
import com.simplemobiletools.calendar.models.Event; import com.simplemobiletools.calendar.models.Event;
@ -151,10 +152,10 @@ public class DBHelper extends SQLiteOpenHelper {
public void getEvents(int fromTS, int toTS) { public void getEvents(int fromTS, int toTS) {
List<Event> events = new ArrayList<>(); List<Event> events = new ArrayList<>();
final String[] projection = getAllColumns();
final String selection = COL_START_TS + " <= ? AND " + COL_END_TS + " >= ?"; final String selection = COL_START_TS + " <= ? AND " + COL_END_TS + " >= ?";
final String[] selectionArgs = {String.valueOf(toTS), String.valueOf(fromTS)}; final String[] selectionArgs = {String.valueOf(toTS), String.valueOf(fromTS)};
final Cursor cursor = mDb.query(MAIN_TABLE_NAME, projection, selection, selectionArgs, null, null, COL_START_TS); final Cursor cursor = getEventsCursor(selection, selectionArgs);
if (cursor != null) { if (cursor != null) {
events = fillEvents(cursor); events = fillEvents(cursor);
} }
@ -165,18 +166,27 @@ public class DBHelper extends SQLiteOpenHelper {
public List<Event> getEventsAtReboot() { public List<Event> getEventsAtReboot() {
List<Event> events = new ArrayList<>(); List<Event> events = new ArrayList<>();
final String[] projection = getAllColumns();
final String selection = COL_START_TS + " > ? AND " + COL_REMINDER_MINUTES + " != ?"; final String selection = COL_START_TS + " > ? AND " + COL_REMINDER_MINUTES + " != ?";
final String[] selectionArgs = {String.valueOf(DateTime.now().getMillis() / 1000), "-1"}; final String[] selectionArgs = {String.valueOf(DateTime.now().getMillis() / 1000), "-1"};
final Cursor cursor = mDb.query(MAIN_TABLE_NAME, projection, selection, selectionArgs, null, null, null); final Cursor cursor = getEventsCursor(selection, selectionArgs);
if (cursor != null) { if (cursor != null) {
events = fillEvents(cursor); events = fillEvents(cursor);
} }
return events; return events;
} }
private Cursor getEventsCursor(String selection, String[] selectionArgs) {
final SQLiteQueryBuilder builder = new SQLiteQueryBuilder();
builder.setTables(MAIN_TABLE_NAME + " LEFT OUTER JOIN " + META_TABLE_NAME + " ON " + COL_EVENT_ID + " = " + MAIN_TABLE_NAME + "."
+ COL_ID);
final String[] projection = getAllColumns();
return builder.query(mDb, projection, selection, selectionArgs, MAIN_TABLE_NAME + "." + COL_ID, null, COL_START_TS);
}
private String[] getAllColumns() { private String[] getAllColumns() {
return new String[]{COL_ID, COL_START_TS, COL_END_TS, COL_TITLE, COL_DESCRIPTION, COL_REMINDER_MINUTES}; return new String[]{MAIN_TABLE_NAME + "." + COL_ID, COL_START_TS, COL_END_TS, COL_TITLE, COL_DESCRIPTION, COL_REMINDER_MINUTES,
COL_REPEAT_INTERVAL};
} }
private List<Event> fillEvents(Cursor cursor) { private List<Event> fillEvents(Cursor cursor) {
@ -189,7 +199,8 @@ public class DBHelper extends SQLiteOpenHelper {
final String title = cursor.getString(cursor.getColumnIndex(COL_TITLE)); final String title = cursor.getString(cursor.getColumnIndex(COL_TITLE));
final String description = cursor.getString(cursor.getColumnIndex(COL_DESCRIPTION)); final String description = cursor.getString(cursor.getColumnIndex(COL_DESCRIPTION));
final int reminderMinutes = cursor.getInt(cursor.getColumnIndex(COL_REMINDER_MINUTES)); final int reminderMinutes = cursor.getInt(cursor.getColumnIndex(COL_REMINDER_MINUTES));
events.add(new Event(id, startTS, endTS, title, description, reminderMinutes, 0)); final int repeatInterval = cursor.getInt(cursor.getColumnIndex(COL_REPEAT_INTERVAL));
events.add(new Event(id, startTS, endTS, title, description, reminderMinutes, repeatInterval));
} while (cursor.moveToNext()); } while (cursor.moveToNext());
} }
cursor.close(); cursor.close();

8
app/src/main/java/com/simplemobiletools/calendar/activities/EventActivity.java
View File

@ -133,16 +133,16 @@ public class EventActivity extends SimpleActivity implements DBHelper.DBOperatio
private void setupRepetition() { private void setupRepetition() {
switch (mEvent.getRepeatInterval()) { switch (mEvent.getRepeatInterval()) {
case DAILY: case DAILY:
mReminder.setSelection(1); mRepetition.setSelection(1);
break; break;
case WEEKLY: case WEEKLY:
mReminder.setSelection(2); mRepetition.setSelection(2);
break; break;
case YEARLY: case YEARLY:
mReminder.setSelection(3); mRepetition.setSelection(3);
break; break;
default: default:
mReminder.setSelection(0); mRepetition.setSelection(0);
break; break;
} }
} }