Merge remote-tracking branch 'origin/120222_as_bug_fixes' into 4.0

astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java

@@ -61,7 +61,7 @@ public class TagSettingsActivity extends FragmentActivity {
     private static final int MENU_SAVE_ID = R.string.TEA_menu_save;
     private static final int MENU_DISCARD_ID = R.string.TEA_menu_discard;
 
-    protected static final int REQUEST_ACTFM_LOGIN = 3;
+    public static final int REQUEST_ACTFM_LOGIN = 3;
 
     private static final String MEMBERS_IN_PROGRESS = "members"; //$NON-NLS-1$
 

astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java

@@ -19,6 +19,7 @@ import android.view.LayoutInflater;
 import android.view.MenuInflater;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.View.OnTouchListener;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
@@ -29,7 +30,6 @@ import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
 import com.timsu.astrid.R;
-import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.AndroidUtilities;
@@ -193,22 +193,49 @@ public class TagUpdatesFragment extends ListFragment {
 
     private void refreshUpdatesList() {
 
+        Cursor cursor = null;
+        ListView listView = ((ListView) getView().findViewById(android.R.id.list));
         if(updateAdapter == null) {
-            TodorooCursor<Update> currentCursor = tagDataService.getUpdates(tagData);
+            cursor = tagDataService.getUpdates(tagData);
-            getActivity().startManagingCursor(currentCursor);
+            getActivity().startManagingCursor(cursor);
             String fromUpdateClass = (tagData == null) ? UpdateAdapter.FROM_RECENT_ACTIVITY_VIEW : UpdateAdapter.FROM_TAG_VIEW;
 
             updateAdapter = new UpdateAdapter(this, R.layout.update_adapter_row,
-                    currentCursor, false, fromUpdateClass);
+                    cursor, false, fromUpdateClass);
-            ListView listView = ((ListView) getView().findViewById(android.R.id.list));
             addHeaderToListView(listView);
             listView.setAdapter(updateAdapter);
         } else {
-            Cursor cursor = updateAdapter.getCursor();
+            cursor = updateAdapter.getCursor();
             cursor.requery();
             getActivity().startManagingCursor(cursor);
             populateListHeader(listHeader);
         }
+
+        View activityContainer = getView().findViewById(R.id.no_activity_container);
+        if (cursor.getCount() == 0) {
+            activityContainer.setVisibility(View.VISIBLE);
+            TextView textView = (TextView)activityContainer.findViewById(R.id.no_activity_message);
+            if(actFmPreferenceService.isLoggedIn()) {
+                textView.setText(getActivity().getString(R.string.ENA_no_comments));
+            }
+            else {
+                textView.setText(getActivity().getString(R.string.UpS_no_activity_log_in));
+                activityContainer.setOnClickListener(new OnClickListener() {
+
+                    @Override
+                    public void onClick(View v) {
+                        startActivityForResult(new Intent(getActivity(), ActFmLoginActivity.class),
+                                TagSettingsActivity.REQUEST_ACTFM_LOGIN);
+                    }
+                });
+            }
+            listView.setVisibility(View.GONE);
+        }
+        else {
+            activityContainer.setVisibility(View.GONE);
+            listView.setVisibility(View.VISIBLE);
+        }
+
         if (getActivity() instanceof TagUpdatesActivity)
             setLastViewed();
     }

astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitActivity.java

@@ -150,12 +150,9 @@ public class TaskRabbitActivity extends FragmentActivity {
     public static final String LOCATION_CONTAINER = "other_locations_attributes"; //$NON-NLS-1$
 
     // Non-production values
-    public static final String TASK_RABBIT_URL = "http://www.taskrabbit.com"; //$NON-NLS-1$
+    public static final String TASK_RABBIT_URL = "http://rs-astrid-api.taskrabbit.com"; //$NON-NLS-1$
-    public static final String TASK_RABBIT_CLIENT_ID = "RZUDrMuGn9Q3dXeq4nL24bM6LZmMCi1CEGgfP4ND"; //$NON-NLS-1$
+    public static final String TASK_RABBIT_CLIENT_ID = "fDTmGeR0uNCvoxopNyqsRWae8xOvbOBqC7jmHaxv"; //$NON-NLS-1$
-    public static final String TASK_RABBIT_CLIENT_APPLICATION_ID = "Va7FUIUTprsmyuwAq9eHSZvAgiRj8FVH1zeaM8Zt"; //$NON-NLS-1$
+    public static final String TASK_RABBIT_CLIENT_APPLICATION_ID = "XBpKshU8utH5eaNmhky9N8aAId5rSLTh04Hi60Co"; //$NON-NLS-1$
-    //    public static final String TASK_RABBIT_URL = "http://rs-astrid-api.taskrabbit.com"; //$NON-NLS-1$
-    //    public static final String TASK_RABBIT_CLIENT_ID = "fDTmGeR0uNCvoxopNyqsRWae8xOvbOBqC7jmHaxv"; //$NON-NLS-1$
-    //    public static final String TASK_RABBIT_CLIENT_APPLICATION_ID = "XBpKshU8utH5eaNmhky9N8aAId5rSLTh04Hi60Co"; //$NON-NLS-1$
     public static final String TASK_RABBIT_ID = "id"; //$NON-NLS-1$
     private TaskRabbitTaskContainer taskRabbitTask;
 
@@ -551,6 +548,7 @@ public class TaskRabbitActivity extends FragmentActivity {
     private HttpEntity getTaskBody()  {
 
         try {
+            Log.d("SENT JSON", localParamsToJSON().toString());
             return new StringEntity(localParamsToJSON().toString());
         }
         catch (Exception e) {
@@ -593,7 +591,6 @@ public class TaskRabbitActivity extends FragmentActivity {
                     Header contentType = new BasicHeader("Content-Type",  "application/json");
                     HttpEntity taskBody = getTaskBody();
                     String response = null;
-
                     try {
                         response = restClient.post(taskRabbitURL(urlCall), taskBody, contentType, authorization);
                         Log.e("The response", "The post response: " + response);
@@ -780,8 +777,12 @@ public class TaskRabbitActivity extends FragmentActivity {
 
                     result = result.substring(result.indexOf(key)+key.length());
                     Preferences.setString(TASK_RABBIT_TOKEN, result);
-                    String response = restClient.get(taskRabbitURL("account"));   //$NON-NLS-1$
+                    String url = String.format("%s?oauth_token=%s&client_application=",taskRabbitURL("account"), Preferences.getStringValue(TASK_RABBIT_TOKEN), TASK_RABBIT_CLIENT_APPLICATION_ID);
-                    saveUserInfo(response);
+                    Log.d("TASKRABBIT AUTHURL", url);
+
+
+                    String response = restClient.get(url);
+                    saveUserInfo(response);//;
                 }
                 catch (Exception e){
                     e.printStackTrace();
@@ -819,15 +820,15 @@ public class TaskRabbitActivity extends FragmentActivity {
 
     /* location calls */
     private boolean supportsSelectedLocation() {
-            for (TaskRabbitSetListener controlSet : controls) {
+        for (TaskRabbitSetListener controlSet : controls) {
-                if (TaskRabbitLocationControlSet.class.isAssignableFrom(controlSet.getClass())) {
+            if (TaskRabbitLocationControlSet.class.isAssignableFrom(controlSet.getClass())) {
-                    TaskRabbitLocationControlSet locationControlSet = (TaskRabbitLocationControlSet) controlSet;
+                TaskRabbitLocationControlSet locationControlSet = (TaskRabbitLocationControlSet) controlSet;
-                    if(!TaskRabbitLocationManager.supportsCurrentLocation(locationControlSet.location) && locationControlSet.getDisplayView().getParent() != null) {
+                if(!TaskRabbitLocationManager.supportsCurrentLocation(locationControlSet.location) && locationControlSet.getDisplayView().getParent() != null) {
-                        return false;
+                    return false;
-                    }
                 }
             }
-            return true;
+        }
+        return true;
     }
 
     public void updateControlSetLocation (Location location) {

astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitControlSet.java

@@ -19,6 +19,7 @@ import android.widget.Toast;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
+import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.RestClient;
 import com.todoroo.andlib.utility.Preferences;
@@ -143,7 +144,8 @@ public class TaskRabbitControlSet extends TaskEditControlSet implements Assigned
      * Show toast for task edit canceling
      */
     private void showSuccessToast() {
-        Toast.makeText(fragment.getActivity(), fragment.getString(R.string.tr_success_toast),
+        Toast.makeText(ContextManager.getContext(),
+                ContextManager.getString(R.string.tr_success_toast),
                 Toast.LENGTH_SHORT).show();
     }
 

astrid/plugin-src/com/todoroo/astrid/taskrabbit/TaskRabbitDeadlineControlSet.java

@@ -102,13 +102,13 @@ public class TaskRabbitDeadlineControlSet extends PopupControlSet implements Tas
 
     @Override
     public void saveToDatabase(JSONObject json, String key) throws JSONException {
-        json.put(key, dateAndTimePicker.constructDueDate());
+        json.put(key, dateAndTimePicker.constructDueDate()/1000);
 
     }
 
     @Override
     public void postToTaskRabbit(JSONObject json, String key) throws JSONException {
-        long dueDate = dateAndTimePicker.constructDueDate();
+        long dueDate = dateAndTimePicker.constructDueDate()/1000;
         json.put(key, dueDate);
     }
 

astrid/res/layout-land/widget_initialized.xml

@@ -11,8 +11,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingTop="2dp"
+        android:paddingLeft="5dp">
-        android:paddingLeft="40dp">
         
         <TextView
             android:id="@+id/widget_title"

astrid/res/layout-xlarge-land/widget_initialized.xml

@@ -11,7 +11,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingLeft="40dp">
+        android:paddingLeft="5dp">
         
         <TextView
             android:id="@+id/widget_title"

astrid/res/layout/tag_updates_fragment.xml

@@ -14,6 +14,32 @@
         android:layout_weight="1"
         android:visibility="gone" />
 
+    <RelativeLayout
+        android:id="@+id/no_activity_container"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_weight="100"
+        android:orientation="vertical"
+            android:layout_gravity="center"
+        android:visibility="gone">
+        <ImageView
+            android:id="@+id/no_activity_image"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:src="@drawable/welcome_activity" />
+
+        <TextView
+            android:id="@+id/no_activity_message"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_below="@id/no_activity_image"
+            android:textSize="20dip"
+            android:gravity="center"
+            style="@style/TextAppearance" />
+    </RelativeLayout>
+
     <ListView
         android:id="@android:id/list"
         android:layout_width="fill_parent"

astrid/res/layout/widget_initialized.xml

@@ -11,7 +11,8 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingLeft="40dp">
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp">
         
         <TextView
         	android:id="@+id/widget_title"

astrid/res/values/strings-core.xml

@@ -463,6 +463,9 @@
   <!-- Updates Window Title -->
   <string name="UpS_updates_title">Latest Astrid News</string>
   
+  <!-- Updats No Activity to show for offline users -->
+  <string name="UpS_no_activity_log_in">Log in to see a record of\nyour progress as well as\nactivity on shared lists.</string>
+  
   <!-- ================================================== EditPreferences == -->
     
   <!-- Preference Window Title -->

astrid/res/values/strings-welcome.xml

@@ -15,8 +15,8 @@
     
     <string name="welcome_title_7_return">That\'s it!</string>
     
-    <string name="welcome_body_1">The perfect to-do list that \nworks great with friends</string>
+    <string name="welcome_body_1">The perfect personal to-do list that \nworks great with friends</string>
-    <string name="welcome_body_2">Perfect for any list:\nread, watch, buy, visit!</string>
+    <string name="welcome_body_2">Great for any list:\nread, watch, buy, visit!</string>
     <string name="welcome_body_3">Tap the list title to see all your lists</string>
     <string name="welcome_body_4">Share lists with \nfriends, housemates,\nor your sweetheart!</string>
     <string name="welcome_body_5">Never wonder who\'s\nbringing dessert!</string>