gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-06 14:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix emojis

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-06-27 08:14:12 +02:00
parent 3068ca4c2a
commit 1d8db226fa
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/api/NcApi.java
View File

@ -281,8 +281,8 @@ public interface NcApi {
@FormUrlEncoded @FormUrlEncoded
@POST @POST
Observable<GenericOverall> sendChatMessage(@Header("Authorization") String authorization, @Url String url, Observable<GenericOverall> sendChatMessage(@Header("Authorization") String authorization, @Url String url,
@FieldMap Map<String, String> fields); @Field("message") CharSequence message,
@Field("actorDisplayName") String actorDisplayName);
@GET @GET
Observable<MentionOverall> getMentionAutocompleteSuggestions(@Header("Authorization") String authorization, Observable<MentionOverall> getMentionAutocompleteSuggestions(@Header("Authorization") String authorization,

19
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

@ -92,7 +92,6 @@ import com.stfalcon.chatkit.messages.MessagesListAdapter;
import com.stfalcon.chatkit.utils.DateFormatter; import com.stfalcon.chatkit.utils.DateFormatter;
import com.webianks.library.PopupBubble; import com.webianks.library.PopupBubble;
import org.apache.commons.lang3.StringEscapeUtils;
import org.parceler.Parcels; import org.parceler.Parcels;
import java.io.IOException; import java.io.IOException;
@ -148,7 +147,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
private int globalLastKnownPastMessageId = -1; private int globalLastKnownPastMessageId = -1;
private MessagesListAdapter<ChatMessage> adapter; private MessagesListAdapter<ChatMessage> adapter;
private String myFirstMessage; private CharSequence myFirstMessage;
private Autocomplete mentionAutocomplete; private Autocomplete mentionAutocomplete;
private LinearLayoutManager layoutManager; private LinearLayoutManager layoutManager;
@ -375,7 +374,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
messageInputView.getInputEditText().setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI); messageInputView.getInputEditText().setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
messageInputView.setInputListener(input -> { messageInputView.setInputListener(input -> {
sendMessage(StringEscapeUtils.escapeJava(input.toString()), 1); sendMessage(input, 1);
return true; return true;
}); });
@ -556,13 +555,11 @@ public class ChatController extends BaseController implements MessagesListAdapte
} }
} }
private void sendMessage(String message, int attempt) { private void sendMessage(CharSequence message, int attempt) {
if (attempt < 4) { if (attempt < 4) {
Map<String, String> fieldMap = new HashMap<>();
fieldMap.put("message", message);
fieldMap.put("actorDisplayName", conversationUser.getDisplayName());
ncApi.sendChatMessage(credentials, ApiUtils.getUrlForChat(baseUrl, roomToken), fieldMap) ncApi.sendChatMessage(credentials, ApiUtils.getUrlForChat(baseUrl, roomToken), message, conversationUser
.getDisplayName())
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<GenericOverall>() { .subscribe(new Observer<GenericOverall>() {
@ -573,7 +570,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
@Override @Override
public void onNext(GenericOverall genericOverall) { public void onNext(GenericOverall genericOverall) {
if (conversationUser.getUserId().equals("?") && TextUtils.isEmpty(myFirstMessage)) { if (conversationUser.getUserId().equals("?") && TextUtils.isEmpty(myFirstMessage.toString())) {
myFirstMessage = message; myFirstMessage = message;
} }
@ -589,7 +586,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
if (e instanceof HttpException && ((HttpException) e).code() == 201) { if (e instanceof HttpException && ((HttpException) e).code() == 201) {
if (conversationUser.getUserId().equals("?") && TextUtils.isEmpty(myFirstMessage)) { if (conversationUser.getUserId().equals("?") && TextUtils.isEmpty(myFirstMessage.toString())) {
myFirstMessage = message; myFirstMessage = message;
} }
@ -714,7 +711,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
} else { } else {
for (int i = 0; i < chatMessageList.size(); i++) { for (int i = 0; i < chatMessageList.size(); i++) {
chatMessageList.get(i).setBaseUrl(conversationUser.getBaseUrl()); chatMessageList.get(i).setBaseUrl(conversationUser.getBaseUrl());
if (conversationUser.getUserId().equals("?") && !TextUtils.isEmpty(myFirstMessage)) { if (conversationUser.getUserId().equals("?") && !TextUtils.isEmpty(myFirstMessage.toString())) {
ChatMessage chatMessage = chatMessageList.get(i); ChatMessage chatMessage = chatMessageList.get(i);
if (chatMessage.getActorType().equals("guests") && if (chatMessage.getActorType().equals("guests") &&
chatMessage.getActorDisplayName().equals(conversationUser.getDisplayName())) { chatMessage.getActorDisplayName().equals(conversationUser.getDisplayName())) {

3
app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
View File

@ -26,7 +26,6 @@ import com.nextcloud.talk.utils.ApiUtils;
import com.stfalcon.chatkit.commons.models.IMessage; import com.stfalcon.chatkit.commons.models.IMessage;
import com.stfalcon.chatkit.commons.models.IUser; import com.stfalcon.chatkit.commons.models.IUser;
import org.apache.commons.lang3.StringEscapeUtils;
import org.parceler.Parcel; import org.parceler.Parcel;
import java.util.Date; import java.util.Date;
@ -115,6 +114,6 @@ public class ChatMessage implements IMessage {
} }
return StringEscapeUtils.unescapeJava(message); return message;
} }
} }