From fc78685bed01c86b79c3d7121f462ae47860be22 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 10 Feb 2012 21:08:50 -0800
Subject: [PATCH] Fixed a task rabbit crash, updated some copy

---
 .../astrid/taskrabbit/TaskRabbitActivity.java | 20 +++++++++----------
 .../taskrabbit/TaskRabbitControlSet.java      | 10 +++++++---
 astrid/res/values/strings-tags.xml            |  3 +++
 .../astrid/activity/TaskEditFragment.java     |  2 +-
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java
index 0b9fc9c09..cf593a7eb 100644
--- a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java
@@ -261,10 +261,10 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
 
 
     private void setupForDialogOrFullscreen() {
-        isDialog = AndroidUtilities.isTabletSized(this);
-        if (isDialog)
-            setTheme(ThemeService.getDialogTheme());
-        else
+//        isDialog = AndroidUtilities.isTabletSized(this);
+//        if (isDialog)
+//            setTheme(ThemeService.getDialogTheme());
+//        else
             ThemeService.applyTheme(this);
     }
 
@@ -410,13 +410,13 @@ public class TaskRabbitActivity extends FragmentActivity implements LocationList
                 actionBar.setCustomView(R.layout.task_rabbit_header_view);
 
 
-            View customView = actionBar.getCustomView();
-            menuNav = customView.findViewById(R.id.menu_nav);
-            menuNavDisclosure = (ImageView) customView.findViewById(R.id.menu_disclosure_arrow);
+                View customView = actionBar.getCustomView();
+                menuNav = customView.findViewById(R.id.menu_nav);
+                menuNavDisclosure = (ImageView) customView.findViewById(R.id.menu_disclosure_arrow);
 
-            menuTitle = (TextView) customView.findViewById(R.id.task_rabbit_title);
-            menuNav.setOnClickListener(menuClickListener);
-            createMenuPopover();
+                menuTitle = (TextView) customView.findViewById(R.id.task_rabbit_title);
+                menuNav.setOnClickListener(menuClickListener);
+                createMenuPopover();
             }
 
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java
index 1b99ca5a6..47b582d4e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java
@@ -263,9 +263,13 @@ public class TaskRabbitControlSet extends TaskEditControlSet implements Assigned
         locationManager = (LocationManager) fragment.getActivity().getSystemService(Context.LOCATION_SERVICE);
         currentLocation = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
         if (currentLocation == null) {
-            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, this);
-        }
-        else {
+            try {
+                locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, this);
+            } catch (IllegalArgumentException e) {
+                // No gps
+                isEnabledForTRLocation = false;
+            }
+        } else {
             isEnabledForTRLocation = supportsCurrentLocation(currentLocation);
         }
     }
diff --git a/astrid/res/values/strings-tags.xml b/astrid/res/values/strings-tags.xml
index 8e804c821..b723980c8 100644
--- a/astrid/res/values/strings-tags.xml
+++ b/astrid/res/values/strings-tags.xml
@@ -9,6 +9,9 @@
   <!-- Tags label -->
   <string name="TEA_tags_label">Lists</string>
   
+  <!-- Tags label long version -->
+  <string name="TEA_tags_label_long">Put task on one or more lists</string>
+  
   <!-- Tags none -->
   <string name="TEA_tags_none">None</string>
 
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index 4511dfdec..ce104ff8b 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -499,7 +499,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
         tagsControlSet = new TagsControlSet(getActivity(),
                 R.layout.control_set_tags,
-                R.layout.control_set_default_display, R.string.TEA_tags_label);
+                R.layout.control_set_default_display, R.string.TEA_tags_label_long);
         controls.add(tagsControlSet);
         controlSetMap.put(getString(R.string.TEA_ctrl_lists_pref),
                 tagsControlSet);