Merge branch 'master' of https://github.com/jacobminer/TokenAutoComplete

Author: Rafael Dominiquini

library/src/main/java/com/tokenautocomplete/FilteredArrayAdapter.java

@@ -98,6 +98,11 @@ public Filter getFilter() {
         return filter;
     }
 
+    public void setOriginalObjects(List<T> objects)  {
+        originalObjects = objects;
+        notifyDataSetChanged();
+    }
+
     /**
      * Filter method used by the adapter. Return true if the object should remain in the list
      *

library/src/main/java/com/tokenautocomplete/TokenCompleteTextView.java

@@ -473,7 +473,7 @@ public boolean enoughToFilter() {
     public void performCompletion() {
         if (getListSelection() == ListView.INVALID_POSITION && enoughToFilter()) {
             Object bestGuess;
-            if (getAdapter().getCount() > 0 && performBestGuess) {
+            if (getAdapter() != null && getAdapter().getCount() > 0 && performBestGuess) {
                 bestGuess = getAdapter().getItem(0);
             } else {
                 bestGuess = defaultObject(currentCompletionText());
@@ -795,7 +795,7 @@ protected void replaceText(CharSequence text) {
         clearComposingText();
 
         // Don't build a token for an empty String
-        if (selectedObject == null || selectedObject.toString().equals("")) return;
+        if (selectedObject == null || selectedObject.toString() == null || selectedObject.toString().equals("")) return;
 
         SpannableStringBuilder ssb = buildSpannableForText(text);
         TokenImageSpan tokenSpan = buildSpanForObject(selectedObject);