Made expand->select only happen in certain circumstances. Fixed the notification icon to be clickable multiple times. Added survey option

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.timsu.astrid"
-      android:versionCode="75"
+      android:versionCode="80"
-      android:versionName="2.2.5">
+      android:versionName="2.2.9">
       
     <meta-data android:name="com.a0soft.gphone.aTrackDog.webURL"
                android:value="http://www.weloveastrid.com" />

res/values/strings.xml

@@ -102,7 +102,7 @@
         <string name="taskList_completedPrefix">Finished</string>
 		<string name="taskList_estimatedTimePrefix">Estimated:</string>
         <string name="taskList_elapsedTimePrefix">Spent:</string>
-        <string name="taskList_periodicReminderPrefix">Reminder Every</string>
+        <string name="taskList_periodicReminderPrefix">Poke Every</string>
         <string name="taskList_repeatPrefix">Repeats Every</string>
         <string name="taskList_alarmPrefix">Next Alarm:</string>
         <string name="taskList_tagsPrefix">Tags:</string>
@@ -117,6 +117,7 @@
         <string name="taskList_menu_sync">Synchronization</string>
         <string name="taskList_menu_settings">Settings</string>
         <string name="taskList_menu_help">Help</string>
+        <string name="taskList_menu_survey">Take Astrid\'s Survey!</string>
         
         <string name="taskList_context_edit">Edit Task</string>
         <string name="taskList_context_delete">Delete Task</string>

src/com/timsu/astrid/activities/TaskListAdapter.java

@@ -163,7 +163,13 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
 
             if(view != null) {
                 setFieldContentsAndVisibility(view, task);
-                ((ListView)view.getParent()).setSelection(objects.indexOf(task));
+
+                // if the item is near the bottom of the list, we need to give
+                // it focus so that the list knows there's new stuff down there
+                int position = objects.indexOf(task);
+                if(objects.size() - position < 2)
+                    ((ListView)view.getParent()).setSelection(position);
+                view.requestFocus();
             }
         } catch (Exception e) {
             Log.e("astrid", "Error in setExpanded", e);

src/com/timsu/astrid/activities/TaskListNotify.java

@@ -16,4 +16,15 @@ public class TaskListNotify extends Activity {
 
         finish();
     }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+
+        Intent taskListIntent = new Intent(this, TaskList.class);
+        taskListIntent.putExtra(TaskList.VARIABLES_TAG, intent.getExtras());
+        startActivity(taskListIntent);
+
+        finish();
+    }
 }

src/com/timsu/astrid/activities/TaskListSubActivity.java

@@ -98,6 +98,7 @@ public class TaskListSubActivity extends SubActivity {
     private static final int       OPTIONS_SYNC_ID       = Menu.FIRST + 10;
     private static final int       OPTIONS_SETTINGS_ID   = Menu.FIRST + 11;
     private static final int       OPTIONS_HELP_ID       = Menu.FIRST + 12;
+    private static final int       OPTIONS_SURVEY_ID     = Menu.FIRST + 13;
 
     private static final int       CONTEXT_FILTER_HIDDEN = Menu.FIRST + 20;
     private static final int       CONTEXT_FILTER_DONE   = Menu.FIRST + 21;
@@ -250,6 +251,10 @@ public class TaskListSubActivity extends SubActivity {
                 R.string.taskList_menu_help);
         item.setAlphabeticShortcut('h');
 
+        item = menu.add(Menu.NONE, OPTIONS_SURVEY_ID, Menu.NONE,
+                R.string.taskList_menu_survey);
+        item.setAlphabeticShortcut('h');
+
         return true;
     }
 
@@ -755,6 +760,11 @@ public class TaskListSubActivity extends SubActivity {
                     Uri.parse(Constants.HELP_URL));
             launchActivity(browserIntent, 0);
             return true;
+        case OPTIONS_SURVEY_ID:
+            browserIntent = new Intent(Intent.ACTION_VIEW,
+                    Uri.parse(Constants.SURVEY_URL));
+            launchActivity(browserIntent, 0);
+            return true;
 
         // --- list context menu items
         case TaskListAdapter.CONTEXT_EDIT_ID:

src/com/timsu/astrid/utilities/Constants.java

@@ -7,8 +7,12 @@ public class Constants {
 
     // application constants
 
+    /** URL of Astrid Help Page */
     public static final String HELP_URL = "http://code.google.com/p/android-astrid/wiki/UserGuide";
 
+    /** URL of Astrid Feature Survey */
+    public static final String SURVEY_URL = "http://www.haveasec.com/survey/m/detail/welcome/bf25e0/";
+
     // result codes
 
     /** Return to the task list view */

src/com/timsu/astrid/utilities/Notifications.java

@@ -449,7 +449,7 @@ public class Notifications extends BroadcastReceiver {
         notifyIntent.putExtra(TaskListSubActivity.LOAD_INSTANCE_TOKEN, taskId.getId());
         notifyIntent.putExtra(TaskListSubActivity.FROM_NOTIFICATION_TOKEN, true);
         PendingIntent pendingIntent = PendingIntent.getActivity(context,
-                (int)taskId.getId(), notifyIntent, PendingIntent.FLAG_ONE_SHOT);
+                (int)taskId.getId(), notifyIntent, 0);
 
         // create notification object
         String appName = r.getString(R.string.app_name);