From 49fad99bd25af6145ac96aac121106a300156095 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 5 Nov 2012 17:40:47 -0800
Subject: [PATCH] Temporarily disable calendar reminders for Android 2.1 users

---
 .../astrid/gcal/CalendarAlarmReceiver.java    |  4 ++++
 .../astrid/activity/EditPreferences.java      | 20 +++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java
index 0ac147eef..51498cd30 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java
@@ -16,6 +16,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.timsu.astrid.R;
+import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
@@ -67,6 +68,9 @@ public class CalendarAlarmReceiver extends BroadcastReceiver {
         ContentResolver cr = context.getContentResolver();
         Uri eventUri = Calendars.getCalendarContentUri(Calendars.CALENDAR_CONTENT_EVENTS);
 
+        if (AndroidUtilities.getSdkVersion() <= 7)
+            return;
+
         String[] eventArg = new String[] { Long.toString(eventId) };
         Cursor event = cr.query(eventUri,
                 EVENTS_PROJECTION,
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index 421906613..f386266a7 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -651,14 +651,18 @@ public class EditPreferences extends TodorooPreferenceActivity {
             }
         });
 
-        findPreference(getString(R.string.p_calendar_reminders)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(Preference preference, Object newValue) {
-                if (newValue != null && ((Boolean) newValue))
-                    CalendarStartupReceiver.scheduleCalendarAlarms(EditPreferences.this, true);
-                return true;
-            }
-        });
+        if (AndroidUtilities.getSdkVersion() <= 7) {
+            searchForAndRemovePreference(getPreferenceScreen(), getString(R.string.p_calendar_reminders));
+        } else {
+            findPreference(getString(R.string.p_calendar_reminders)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+                @Override
+                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() {
             @Override