Ignore status characters in front of nicks for the purpose of nick co…

…mpletion
am0c · Jun 9, 2011 · d4e22f3 · d4e22f3
1 parent 7c7ce7c
commit d4e22f3
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/application/src/org/yaaic/activity/ConversationActivity.java b/application/src/org/yaaic/activity/ConversationActivity.java
@@ -893,7 +893,8 @@ private void doNickCompletion(EditText input) {
             List<Integer> result = new ArrayList<Integer>();
 
             for (int i = 0; i < users.length; i++) {
-                if (users[i].toLowerCase().startsWith(word)) {
+                String nick = removeStatusChar(users[i].toLowerCase());
+                if (nick.startsWith(word)) {
                     result.add(Integer.valueOf(i));
                 }
             }
@@ -926,6 +927,7 @@ private void doNickCompletion(EditText input) {
     private void insertNickCompletion(EditText input, String nick) {
         int start = input.getSelectionStart();
         int end  = input.getSelectionEnd();
+        nick = removeStatusChar(nick);
 
         if (start == 0) {
             nick += ":";
@@ -953,4 +955,20 @@ public void run() {
     private void openSoftKeyboard(View view) {
         ((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE)).showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
     }
+
+    /**
+     * Remove the status char off the front of a nick if one is present
+     * 
+     * @param nick
+     * @return nick without statuschar
+     */
+    private String removeStatusChar(String nick)
+    {
+        /* Discard status characters */
+        if (nick.startsWith("@") || nick.startsWith("+")
+            || nick.startsWith("%")) {
+            nick = nick.substring(1);
+        }
+        return nick;
+    }
 }