Temporarily disable calendar reminders for Android 2.1 users

pull/14/head
Sam Bosley 12 years ago
parent c0e0a27c18
commit 49fad99bd2

@ -16,6 +16,7 @@ import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.timsu.astrid.R; import com.timsu.astrid.R;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
@ -67,6 +68,9 @@ public class CalendarAlarmReceiver extends BroadcastReceiver {
ContentResolver cr = context.getContentResolver(); ContentResolver cr = context.getContentResolver();
Uri eventUri = Calendars.getCalendarContentUri(Calendars.CALENDAR_CONTENT_EVENTS); Uri eventUri = Calendars.getCalendarContentUri(Calendars.CALENDAR_CONTENT_EVENTS);
if (AndroidUtilities.getSdkVersion() <= 7)
return;
String[] eventArg = new String[] { Long.toString(eventId) }; String[] eventArg = new String[] { Long.toString(eventId) };
Cursor event = cr.query(eventUri, Cursor event = cr.query(eventUri,
EVENTS_PROJECTION, EVENTS_PROJECTION,

@ -651,14 +651,18 @@ public class EditPreferences extends TodorooPreferenceActivity {
} }
}); });
findPreference(getString(R.string.p_calendar_reminders)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() { if (AndroidUtilities.getSdkVersion() <= 7) {
@Override searchForAndRemovePreference(getPreferenceScreen(), getString(R.string.p_calendar_reminders));
public boolean onPreferenceChange(Preference preference, Object newValue) { } else {
if (newValue != null && ((Boolean) newValue)) findPreference(getString(R.string.p_calendar_reminders)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
CalendarStartupReceiver.scheduleCalendarAlarms(EditPreferences.this, true); @Override
return true; public boolean onPreferenceChange(Preference preference, Object newValue) {
} if (newValue != null && ((Boolean) newValue))
}); CalendarStartupReceiver.scheduleCalendarAlarms(EditPreferences.this, true);
return true;
}
});
}
findPreference(getString(R.string.p_statistics)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() { findPreference(getString(R.string.p_statistics)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override @Override

Loading…
Cancel
Save