From e3ad95da74af7787aa9c7f8710ba7316831ded45 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 29 Jan 2019 15:24:41 +0100
Subject: [PATCH] Fix bugs with autocomplete

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 app/build.gradle                                           | 4 ++--
 .../talk/callbacks/MentionAutocompleteCallback.java        | 7 +++----
 .../java/com/nextcloud/talk/utils/MagicCharPolicy.java     | 1 -
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 101b794f2..e0ba3da4f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         targetSdkVersion 28
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        versionCode 81
-        versionName "3.2.2"
+        versionCode 82
+        versionName "3.2.3"
 
         flavorDimensions "default"
         renderscriptTargetApi 19
diff --git a/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java b/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java
index 2ab795fc0..c8e89c780 100644
--- a/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java
+++ b/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java
@@ -21,17 +21,16 @@
 package com.nextcloud.talk.callbacks;
 
 import android.text.Editable;
-
 import com.nextcloud.talk.models.json.mention.Mention;
+import com.nextcloud.talk.utils.MagicCharPolicy;
 import com.otaliastudios.autocomplete.AutocompleteCallback;
-import com.otaliastudios.autocomplete.CharPolicy;
 
 public class MentionAutocompleteCallback implements AutocompleteCallback<Mention> {
     @Override
     public boolean onPopupItemClicked(Editable editable, Mention item) {
-        int[] range = CharPolicy.getQueryRange(editable);
+        int[] range = MagicCharPolicy.getQueryRange(editable);
         if (range == null) return false;
-        int start = range[0];
+        int start = range[0] + 1;
         int end = range[1];
         String replacement = item.getId() + " ";
         editable.replace(start, end, replacement);
diff --git a/app/src/main/java/com/nextcloud/talk/utils/MagicCharPolicy.java b/app/src/main/java/com/nextcloud/talk/utils/MagicCharPolicy.java
index b93142449..a5840d356 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/MagicCharPolicy.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/MagicCharPolicy.java
@@ -22,7 +22,6 @@ package com.nextcloud.talk.utils;
 
 import android.text.Spannable;
 import android.text.Spanned;
-import android.util.Log;
 import androidx.annotation.Nullable;
 import com.otaliastudios.autocomplete.AutocompletePolicy;