Update tag activities

astrid/src/main/java/com/todoroo/astrid/tags/DeleteTagActivity.java

@@ -1,6 +1,5 @@
 package com.todoroo.astrid.tags;
 
-import android.content.Context;
 import android.content.Intent;
 import android.widget.Toast;
 
@@ -32,21 +31,17 @@ public class DeleteTagActivity extends TagActivity {
 
     @Override
     protected Intent ok() {
-        return deleteOrLeaveTag(this, tag, uuid);
-    }
-
-    private Intent deleteOrLeaveTag(Context context, String tag, String uuid) {
         int deleted = deleteTagMetadata(uuid);
         TagData tagData = tagDataDao.fetch(uuid, TagData.ID, TagData.UUID, TagData.DELETION_DATE, TagData.MEMBER_COUNT, TagData.USER_ID);
         Intent tagDeleted = new Intent(AstridApiConstants.BROADCAST_EVENT_TAG_DELETED);
-        if(tagData != null) {
+        if (tagData != null) {
             tagData.setDeletionDate(DateUtilities.now());
             tagDataService.save(tagData);
             tagDeleted.putExtra(TagViewFragment.EXTRA_TAG_UUID, tagData.getUuid());
         }
-        Toast.makeText(context, context.getString(R.string.TEA_tags_deleted, tag, deleted), Toast.LENGTH_SHORT).show();
+        Toast.makeText(this, getString(R.string.TEA_tags_deleted, tag, deleted), Toast.LENGTH_SHORT).show();
 
-        context.sendBroadcast(tagDeleted);
+        sendBroadcast(tagDeleted);
         return tagDeleted;
     }
 

astrid/src/main/java/com/todoroo/astrid/tags/RenameTagActivity.java

@@ -11,10 +11,14 @@ import com.todoroo.astrid.api.AstridApiConstants;
 
 import org.tasks.R;
 
+import javax.inject.Inject;
+
 public class RenameTagActivity extends TagActivity {
 
     private EditText editor;
 
+    @Inject TagService tagService;
+
     @Override
     protected void showDialog() {
         editor = new EditText(this);

astrid/src/main/java/com/todoroo/astrid/tags/TagActivity.java

@@ -11,15 +11,11 @@ import com.todoroo.astrid.data.RemoteModel;
 import org.tasks.R;
 import org.tasks.injection.InjectingActivity;
 
-import javax.inject.Inject;
-
 public abstract class TagActivity extends InjectingActivity {
 
     String tag;
     String uuid;
 
-    @Inject TagService tagService;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);