From 113d1dc7d2c97f00e211cceeba922e78856a5b3c Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Fri, 4 Mar 2016 16:13:44 -0600
Subject: [PATCH] Fix crashes

---
 .../com/todoroo/astrid/gtasks/GtasksPreferenceService.java    | 4 +++-
 src/main/java/com/todoroo/astrid/tags/TagsControlSet.java     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java
index 2058f4ce2..4a3b78544 100644
--- a/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java
+++ b/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java
@@ -17,6 +17,8 @@ import org.tasks.preferences.Preferences;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import static com.google.common.base.Strings.isNullOrEmpty;
+
 /**
  * Methods for working with GTasks preferences
  *
@@ -69,7 +71,7 @@ public class GtasksPreferenceService {
     public boolean isLoggedIn() {
         return context.getResources().getBoolean(R.bool.sync_enabled) &&
                 preferences.getBoolean(R.string.sync_gtasks, false) &&
-                preferences.getStringValue(PREF_USER_NAME) != null &&
+                !isNullOrEmpty(preferences.getStringValue(PREF_USER_NAME)) &&
                 permissionChecker.canAccessAccounts();
     }
 
diff --git a/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java b/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
index 7a8773954..6bf6cf085 100644
--- a/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
+++ b/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
@@ -55,9 +55,11 @@ import javax.inject.Inject;
 import butterknife.Bind;
 import butterknife.OnClick;
 
+import static com.google.common.base.Predicates.notNull;
 import static com.google.common.collect.Iterables.transform;
 import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.Sets.difference;
+import static com.google.common.collect.Sets.filter;
 import static com.google.common.collect.Sets.newHashSet;
 
 /**
@@ -376,7 +378,7 @@ public final class TagsControlSet extends TaskEditControlFragment {
         Set<TagData> selectedTags = getSelectedTags(true);
         Sets.SetView<TagData> added = difference(selectedTags, existingTags);
         Sets.SetView<TagData> removed = difference(existingTags, selectedTags);
-        deleteLinks(taskId, taskUuid, removed);
+        deleteLinks(taskId, taskUuid, filter(removed, notNull()));
         for (TagData tagData : added) {
             Metadata newLink = TaskToTagMetadata.newTagMetadata(taskId, taskUuid, tagData.getName(), tagData.getUuid());
             metadataDao.createNew(newLink);