Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/talk-android.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Danic <mario@lovelyhq.com>2019-01-29 17:24:41 +0300
committerMario Danic <mario@lovelyhq.com>2019-01-29 17:24:41 +0300
commitac9cc87a3b969bf0349205879546cc06d47b2bfd (patch)
tree2d12c76db913b7e8ae1e06b860ab7667835ea3ff
parent7f8a31acd87ab3c09a79422d565539f8ac3dee1e (diff)
Fix bugs with autocompletev3.2.3
Signed-off-by: Mario Danic <mario@lovelyhq.com>
-rw-r--r--app/build.gradle4
-rw-r--r--app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java7
-rw-r--r--app/src/main/java/com/nextcloud/talk/utils/MagicCharPolicy.java1
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;