From 7547767d67644c2f6c9c0796ed0971028bea4f2b Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Fri, 6 Aug 2010 15:51:23 -0700
Subject: [PATCH] Made old shortcuts work

---
 .../andlib/utility/AndroidUtilities.java       | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/astrid/common-src/com/todoroo/andlib/utility/AndroidUtilities.java b/astrid/common-src/com/todoroo/andlib/utility/AndroidUtilities.java
index c6719d4d9..b4956414c 100644
--- a/astrid/common-src/com/todoroo/andlib/utility/AndroidUtilities.java
+++ b/astrid/common-src/com/todoroo/andlib/utility/AndroidUtilities.java
@@ -23,8 +23,8 @@ import android.text.InputType;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.OnTouchListener;
+import android.view.ViewGroup;
 import android.widget.TextView;
 
 import com.todoroo.andlib.service.Autowired;
@@ -195,9 +195,19 @@ public class AndroidUtilities {
 
         String[] pairs = string.split("=");
         ContentValues result = new ContentValues();
-        for(String item : pairs) {
-            String[] keyValue = item.split("=");
-            result.put(keyValue[0].trim(), keyValue[1].trim());
+        String key = null;
+        for(int i = 0; i < pairs.length; i++) {
+            String newKey = null;
+            int lastSpace = pairs[i].lastIndexOf(' ');
+            if(lastSpace != -1) {
+                newKey = pairs[i].substring(lastSpace + 1);
+                pairs[i] = pairs[i].substring(0, lastSpace);
+            } else {
+                newKey =  pairs[i];
+            }
+            if(key != null)
+                result.put(key.trim(), pairs[i].trim());
+            key = newKey;
         }
         return result;
     }