From 18381e06e5c86d4ddd2b537bf47ac8534f62d2c7 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Sun, 12 Sep 2010 18:35:28 +0800
Subject: [PATCH] Added a couple new events for usage feedback of various
 Astrid features: producteev login/signup and repeated task creation

---
 .../producteev/ProducteevLoginActivity.java      | 16 ++++++++++++++++
 .../todoroo/astrid/repeats/RepeatControlSet.java |  6 ++++++
 .../astrid/widget/WidgetConfigActivity.java      |  2 ++
 3 files changed, 24 insertions(+)

diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java
index 1c27050ff..dcc489d03 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java
@@ -31,6 +31,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.flurry.android.FlurryAgent;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
@@ -38,6 +39,7 @@ import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.producteev.api.ApiAuthenticationException;
 import com.todoroo.astrid.producteev.api.ProducteevInvoker;
 import com.todoroo.astrid.producteev.sync.ProducteevSyncProvider;
+import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.utility.Preferences;
 
 /**
@@ -142,6 +144,8 @@ public class ProducteevLoginActivity extends Activity {
                     Preferences.setString(R.string.producteev_PPr_password, password);
                     ProducteevUtilities.INSTANCE.setToken(invoker.getToken());
 
+                    FlurryAgent.onEvent("producteev-login");
+
                     synchronize();
                 } catch (ApiAuthenticationException e) {
                     errorMessage.append(getString(R.string.producteev_PLA_errorAuth));
@@ -181,6 +185,8 @@ public class ProducteevLoginActivity extends Activity {
                     Preferences.setString(R.string.producteev_PPr_password, password);
                     ProducteevUtilities.INSTANCE.setToken(invoker.getToken());
 
+                    FlurryAgent.onEvent("producteev-signup"); //$NON-NLS-1$
+
                     synchronize();
                 } catch (Exception e) {
                     errorMessage.append(e.getMessage());
@@ -207,4 +213,14 @@ public class ProducteevLoginActivity extends Activity {
                 this, ProducteevBackgroundService.class));
         finish();
     }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        FlurryAgent.onStartSession(this, Constants.FLURRY_KEY);
+    }
+
+    private void onEn() {
+        FlurryAgent.onEndSession(this);
+    }
 }
\ No newline at end of file
diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
index 8cbb667d9..f1546a224 100644
--- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
@@ -7,6 +7,7 @@ import java.util.Calendar;
 import java.util.Date;
 
 import android.app.Activity;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -20,6 +21,7 @@ import android.widget.Spinner;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 
+import com.flurry.android.FlurryAgent;
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.google.ical.values.Weekday;
@@ -239,6 +241,10 @@ public class RepeatControlSet implements TaskEditControlSet {
         if(!enabled.isChecked())
             result = "";
         else {
+            if(TextUtils.isEmpty(task.getValue(Task.RECURRENCE))) {
+                FlurryAgent.onEvent("repeat-task-create"); //$NON-NLS-1$
+            }
+
             RRule rrule = new RRule();
             rrule.setInterval((Integer)value.getTag());
             switch(interval.getSelectedItemPosition()) {
diff --git a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java
index 6f2284796..0c521409f 100644
--- a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java
+++ b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java
@@ -145,5 +145,7 @@ public class WidgetConfigActivity extends ExpandableListActivity {
         Preferences.setString(TasksWidget.PREF_TITLE + mAppWidgetId, title);
         Preferences.setString(TasksWidget.PREF_SQL + mAppWidgetId, sql);
         Preferences.setString(TasksWidget.PREF_VALUES + mAppWidgetId, contentValuesString);
+
+        FlurryAgent.onEvent("widget-config"); //$NON-NLS-1$
     }
 }