From b06155d7b8ca1f4c04039df95ff12067dfa6b37b Mon Sep 17 00:00:00 2001 From: l3d00m Date: Sun, 23 Aug 2015 21:46:55 +0200 Subject: [PATCH] Fix for #142 Workaround for multiline mode with enter to send ( http://stackoverflow.com/a/6772713/4026792 ) --- .../ConversationListAdapter.java | 1 - .../ui/delivery/DeliveryReportHelper.java | 1 - .../QKSMS/ui/messagelist/MessageItem.java | 1 - .../com/moez/QKSMS/ui/view/ComposeView.java | 35 ++++++++----------- 4 files changed, 15 insertions(+), 23 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java index 43fb4ed9..910524e4 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java @@ -2,7 +2,6 @@ package com.moez.QKSMS.ui.conversationlist; import android.content.Context; import android.content.SharedPreferences; -import android.content.res.Resources; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.support.v4.content.ContextCompat; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java index bc1c6df7..a77b5c89 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java @@ -33,7 +33,6 @@ import com.moez.QKSMS.transaction.SmsHelper; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageItem.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageItem.java index 917ee105..4bf5ed2b 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageItem.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageItem.java @@ -36,7 +36,6 @@ import com.google.android.mms.pdu_alt.NotificationInd; import com.google.android.mms.pdu_alt.PduHeaders; import com.google.android.mms.pdu_alt.PduPersister; import com.google.android.mms.pdu_alt.RetrieveConf; -import com.google.android.mms.pdu_alt.SendReq; import com.moez.QKSMS.QKSMSApp; import com.moez.QKSMS.R; import com.moez.QKSMS.data.Contact; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java index 0207ff2d..9d792712 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java @@ -194,18 +194,23 @@ public class ComposeView extends LinearLayout implements View.OnClickListener, L switch (Integer.parseInt(mPrefs.getString(SettingsFragment.ENTER_BUTTON, "0"))) { case 0: // emoji break; - case 1: // return + case 1: // new line mReplyText.setInputType(InputType.TYPE_CLASS_TEXT | - InputType.TYPE_TEXT_VARIATION_LONG_MESSAGE | - InputType.TYPE_TEXT_FLAG_CAP_SENTENCES); + InputType.TYPE_TEXT_VARIATION_LONG_MESSAGE); mReplyText.setSingleLine(false); break; case 2: // send - mReplyText.setInputType( - InputType.TYPE_TEXT_FLAG_CAP_SENTENCES); - mReplyText.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI | - EditorInfo.IME_ACTION_SEND); + mReplyText.setInputType(InputType.TYPE_CLASS_TEXT); mReplyText.setSingleLine(false); + mReplyText.setOnKeyListener(new OnKeyListener() { //Workaround because ACTION_SEND does not support multiline mode + @Override + public boolean onKey(View v, int keyCode, KeyEvent event) { + if (keyCode == 66) { + sendSms(); + return true; + } + return false; + }}); break; } @@ -228,18 +233,6 @@ public class ComposeView extends LinearLayout implements View.OnClickListener, L } }); - mReplyText.setOnEditorActionListener(new android.widget.TextView.OnEditorActionListener() { - @Override - public boolean onEditorAction(android.widget.TextView v, int actionId, KeyEvent event) { - if (actionId == EditorInfo.IME_ACTION_SEND) { - sendSms(); - return true; - } - - return false; - } - }); - mProgressAnimator = new ValueAnimator(); mProgressAnimator.setInterpolator(new AccelerateDecelerateInterpolator()); mProgressAnimator.setDuration(mDelayDuration); @@ -460,7 +453,9 @@ public class ComposeView extends LinearLayout implements View.OnClickListener, L } long threadId = mConversation != null ? mConversation.getThreadId() : 0; - sendTransaction.sendNewMessage(message, threadId); + if (!message.toString().equals("")) { + sendTransaction.sendNewMessage(message, threadId); + } NotificationManager.update(mContext); if (mConversationLegacy != null) {