From 8755a4c5618341d86116ea72656c7977a6ab72e4 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Sat, 12 Feb 2011 03:08:46 -0800
Subject: [PATCH] Fixed null pointer when subject of 'share with' is null

---
 .../astrid/activity/ShareLinkActivity.java     |  5 ++++-
 .../astrid/activity/TaskListActivity.java      | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/astrid/src/com/todoroo/astrid/activity/ShareLinkActivity.java b/astrid/src/com/todoroo/astrid/activity/ShareLinkActivity.java
index 07f97e5be..3fb09c68a 100644
--- a/astrid/src/com/todoroo/astrid/activity/ShareLinkActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/ShareLinkActivity.java
@@ -24,7 +24,10 @@ public final class ShareLinkActivity extends TaskListActivity {
 
         Intent callerIntent = getIntent();
 
-        Task task = quickAddTask(callerIntent.getStringExtra(Intent.EXTRA_SUBJECT), false);
+        String subject = callerIntent.getStringExtra(Intent.EXTRA_SUBJECT);
+        if(subject == null)
+            subject = "";
+        Task task = quickAddTask(subject, false);
         task.setValue(Task.NOTES, callerIntent.getStringExtra(Intent.EXTRA_TEXT));
         taskService.save(task);
         Intent intent = new Intent(this, TaskEditActivity.class);
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index cbcd010cc..bd306d2a5 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -4,9 +4,9 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Map.Entry;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.weloveastrid.rmilk.MilkPreferences;
@@ -33,28 +33,28 @@ import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnKeyListener;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.View.OnClickListener;
+import android.view.View.OnKeyListener;
 import android.view.inputmethod.EditorInfo;
 import android.widget.AbsListView;
-import android.widget.AbsListView.OnScrollListener;
-import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
+import android.widget.AbsListView.OnScrollListener;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.TextView.OnEditorActionListener;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.Property;
@@ -726,8 +726,10 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
     @SuppressWarnings("nls")
     protected Task quickAddTask(String title, boolean selectNewTask) {
         try {
+            if(title != null)
+                title = title.trim();
             Task task = createWithValues(filter.valuesForNewTasks,
-                    title.trim(), taskService, metadataService);
+                    title, taskService, metadataService);
 
             TextView quickAdd = (TextView)findViewById(R.id.quickAddText);
             quickAdd.setText(""); //$NON-NLS-1$