Merge remote-tracking branch 'stingerAJ/2011-08-19-patches'

astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java

@@ -12,12 +12,16 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceScreen;
 
 import com.timsu.astrid.R;
+import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
+import com.todoroo.andlib.sql.Criterion;
+import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.TodorooPreferenceActivity;
 import com.todoroo.astrid.data.Task;
+import com.todoroo.astrid.gcal.GCalHelper;
 import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.TaskService;
 
@@ -73,6 +77,19 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
                         runWithDialog(new Runnable() {
                             @Override
                             public void run() {
+                                TodorooCursor<Task> cursor = taskService.query(Query.select(Task.ID, Task.CALENDAR_URI).where(
+                                        Criterion.and(Task.COMPLETION_DATE.gt(0), Task.CALENDAR_URI.isNotNull())));
+                                try {
+                                    Task task = new Task();
+                                    int length = cursor.getCount();
+                                    for(int i = 0; i < length; i++) {
+                                        cursor.moveToNext();
+                                        task.readFromCursor(cursor);
+                                        GCalHelper.deleteTaskEvent(task);
+                                    }
+                                } finally {
+                                    cursor.close();
+                                }
                                 Task template = new Task();
                                 template.setValue(Task.DELETION_DATE,
                                         DateUtilities.now());
@@ -99,6 +116,19 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
                         runWithDialog(new Runnable() {
                             @Override
                             public void run() {
+                                TodorooCursor<Task> cursor = taskService.query(Query.select(Task.ID, Task.TITLE, Task.CALENDAR_URI).where(
+                                        Criterion.and(Task.DELETION_DATE.gt(0), Task.CALENDAR_URI.isNotNull())));
+                                try {
+                                    Task task = new Task();
+                                    int length = cursor.getCount();
+                                    for(int i = 0; i < length; i++) {
+                                        cursor.moveToNext();
+                                        task.readFromCursor(cursor);
+                                        GCalHelper.deleteTaskEvent(task);
+                                    }
+                                } finally {
+                                    cursor.close();
+                                }
                                 int result = taskService.deleteWhere(Task.DELETION_DATE.gt(0));
                                 metadataService.cleanup();
                                 showResult(

astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java

@@ -25,6 +25,7 @@ import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.utility.DateUtilities;
+import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.activity.TaskEditActivity.TaskEditControlSet;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.gcal.Calendars.CalendarResult;
@@ -146,7 +147,9 @@ public class GCalControlSet implements TaskEditControlSet {
     @SuppressWarnings("nls")
     @Override
     public String writeToModel(Task task) {
-        if(addToCalendar.isChecked() && calendarUri == null) {
+        if (((Preferences.getBoolean(R.string.p_default_addtocalendar_key, false) && !task.isSaved())
+                || addToCalendar.isChecked()) &&
+                calendarUri == null) {
             StatisticsService.reportEvent("create-calendar-event");
 
             try{
@@ -166,13 +169,19 @@ public class GCalControlSet implements TaskEditControlSet {
                 createStartAndEndDate(task, values);
 
                 calendarUri = cr.insert(uri, values);
+                cr.notifyChange(uri, null);
                 task.setValue(Task.CALENDAR_URI, calendarUri.toString());
 
+                // if the default-setting says so, create the gcal-event silently
+                if (!Preferences.getBoolean(R.string.p_default_addtocalendar_key, false) ||
+                        (addToCalendar.isChecked() && addToCalendar.isShown())) {
                     // pop up the new event
                     Intent intent = new Intent(Intent.ACTION_EDIT, calendarUri);
                     intent.putExtra("beginTime", values.getAsLong("dtstart"));
                     intent.putExtra("endTime", values.getAsLong("dtend"));
                     activity.startActivity(intent);
+                }
+
             } catch (Exception e) {
                 exceptionService.displayAndReportError(activity,
                         activity.getString(R.string.gcal_TEA_error), e);
@@ -205,6 +214,7 @@ public class GCalControlSet implements TaskEditControlSet {
     @SuppressWarnings("nls")
     private void createStartAndEndDate(Task task, ContentValues values) {
         long dueDate = task.getValue(Task.DUE_DATE);
+        // FIXME: doesnt respect timezones, see story 17443653
         if(task.hasDueDate()) {
             if(task.hasDueTime()) {
                 long estimatedTime = task.getValue(Task.ESTIMATED_SECONDS);

astrid/plugin-src/com/todoroo/astrid/gcal/GCalHelper.java

@@ -0,0 +1,40 @@
+package com.todoroo.astrid.gcal;
+
+import android.content.ContentResolver;
+import android.database.Cursor;
+import android.net.Uri;
+import android.text.TextUtils;
+
+import com.todoroo.andlib.service.ContextManager;
+import com.todoroo.astrid.core.PluginServices;
+import com.todoroo.astrid.data.Task;
+
+public class GCalHelper {
+    public static void deleteTaskEvent(Task task) {
+        String uri = task.getValue(Task.CALENDAR_URI);
+        Uri calendarUri = null;
+
+        if (TextUtils.isEmpty(uri)) {
+            task = PluginServices.getTaskService().fetchById(task.getId(), Task.ID, Task.CALENDAR_URI);
+            uri = task.getValue(Task.CALENDAR_URI);
+        }
+
+        if(!TextUtils.isEmpty(uri)) {
+            try {
+                calendarUri = Uri.parse(uri);
+
+                // try to load calendar
+                ContentResolver cr = ContextManager.getContext().getContentResolver();
+                Cursor cursor = cr.query(calendarUri, new String[] { "dtstart" }, null, null, null); //$NON-NLS-1$
+                boolean deleted = cursor.getCount() == 0;
+                cursor.close();
+
+                if (!deleted) {
+                    cr.delete(calendarUri, null, null);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}

astrid/res/values-de/strings.xml

@@ -693,9 +693,12 @@
   
   <!-- Preference: Default Reminders Title -->
   <string name="EPr_default_reminders_title">Standarderinnerungen</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
+  <!-- Preference: Default Reminders Description (%s => setting) -->
   <string name="EPr_default_reminders_desc">Momentan: %s</string>
   
+  <!-- Preference: Default Add To Calendar Title -->
+  <string name="EPr_default_addtocalendar_title">Standard Kalendereintrag</string>
+
   <string-array name="EPr_default_importance">
       <!-- importance: labels for "Task Defaults" preference item. -->
       <item>!!!! (Höchste)</item>

astrid/res/values/keys.xml

@@ -241,6 +241,9 @@
   <!-- default reminders setting (corresponds to reminder flags) -->
   <string name="p_default_reminders_key">p_def_reminders</string>
   
+  <!-- default Add To Calendar setting (corresponds to entry in gcal_TEA_addToCalendar) -->
+  <string name="p_default_addtocalendar_key">p_def_addtocalendar</string>
+  
   <!-- ============================================================ SYNC == -->
   
     <string-array name="sync_SPr_interval_values">

astrid/res/values/strings-core.xml

@@ -393,9 +393,12 @@
   
   <!-- Preference: Default Reminders Title -->
   <string name="EPr_default_reminders_title">Default Reminders</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
+  <!-- Preference: Default Reminders Description (%s => setting) -->
   <string name="EPr_default_reminders_desc">Currently: %s</string>
   
+  <!-- Preference: Default Add To Calendar Title -->
+  <string name="EPr_default_addtocalendar_title">Default Add To Calendar</string>
+  
   <string-array name="EPr_default_importance">
       <!-- importance: labels for "Task Defaults" preference item. -->
       <item>!!!! (Highest)</item>

astrid/res/xml/preferences_defaults.xml

@@ -26,6 +26,9 @@
         android:key="@string/p_rmd_default_random_hours"
         android:title="@string/rmd_EPr_defaultRemind_title"
         android:entries="@array/EPr_reminder_random"
-        android:entryValues="@array/EPr_reminder_random_hours"/>
+        android:entryValues="@array/EPr_reminder_random_hours" />
-        
+    <CheckBoxPreference
+        android:title="@string/EPr_default_addtocalendar_title"
+        android:key="@string/p_default_addtocalendar_key"
+        android:defaultValue="false"/>
 </PreferenceScreen>

astrid/src/com/todoroo/astrid/service/TaskService.java

@@ -24,6 +24,7 @@ import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.Task;
+import com.todoroo.astrid.gcal.GCalHelper;
 import com.todoroo.astrid.gtasks.GtasksMetadata;
 import com.todoroo.astrid.opencrx.OpencrxCoreUtils;
 import com.todoroo.astrid.producteev.ProducteevUtilities;
@@ -151,12 +152,14 @@ public class TaskService {
         if(!item.isSaved())
             return;
         else if(item.containsValue(Task.TITLE) && item.getValue(Task.TITLE).length() == 0) {
+            GCalHelper.deleteTaskEvent(item);
             taskDao.delete(item.getId());
             item.setId(Task.NO_ID);
         } else {
             long id = item.getId();
             item.clear();
             item.setId(id);
+            GCalHelper.deleteTaskEvent(item);
             item.setValue(Task.DELETION_DATE, DateUtilities.now());
             taskDao.save(item);
         }