diff options
34 files changed, 10 insertions, 167 deletions
diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java index f50ec1b4..256c48de 100644 --- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java @@ -41,9 +41,6 @@ public abstract class AbstractGenerator { "urn:xmpp:chat-markers:0", "urn:xmpp:receipts" }; - private final String[] MESSAGE_CORRECTION_FEATURES = { - "urn:xmpp:message-correct:0" - }; protected final String IDENTITY_TYPE = "phone"; private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US); @@ -76,9 +73,6 @@ public abstract class AbstractGenerator { if (Settings.CONFIRM_MESSAGE_RECEIVED) { features.addAll(Arrays.asList(MESSAGE_CONFIRMATION_FEATURES)); } - if (ConversationsPlusPreferences.allowMessageCorrection()) { - features.addAll(Arrays.asList(MESSAGE_CORRECTION_FEATURES)); - } Collections.sort(features); return features; } diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java index 1ad28c40..6e07396e 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java @@ -394,41 +394,6 @@ public class MessageParser extends AbstractParser implements updateLastseen(timestamp, account, packet.getFrom(), true); } - if (replacementId != null && ConversationsPlusPreferences.allowMessageCorrection()) { - Message replacedMessage = conversation.findMessageWithRemoteIdAndCounterpart(replacementId, - counterpart, - message.getStatus() == Message.STATUS_RECEIVED, - message.isCarbon()); - if (replacedMessage != null) { - final boolean fingerprintsMatch = replacedMessage.getAxolotlFingerprint() == null - || replacedMessage.getAxolotlFingerprint().equals(message.getAxolotlFingerprint()); - final boolean trueCountersMatch = replacedMessage.getTrueCounterpart() != null - && replacedMessage.getTrueCounterpart().equals(message.getTrueCounterpart()); - if (fingerprintsMatch && (trueCountersMatch || conversation.getMode() == Conversation.MODE_SINGLE)) { - Log.d(Config.LOGTAG, "replaced message '" + replacedMessage.getBody() + "' with '" + message.getBody() + "'"); - final String uuid = replacedMessage.getUuid(); - replacedMessage.setUuid(UUID.randomUUID().toString()); - replacedMessage.setBody(message.getBody()); - replacedMessage.setEdited(replacedMessage.getRemoteMsgId()); - replacedMessage.setRemoteMsgId(remoteMsgId); - replacedMessage.setEncryption(message.getEncryption()); - if (replacedMessage.getStatus() == Message.STATUS_RECEIVED) { - replacedMessage.markUnread(); - } - mXmppConnectionService.updateMessage(replacedMessage, uuid); - if (mXmppConnectionService.confirmMessages() && remoteMsgId != null && !isForwarded && !isTypeGroupChat) { - sendMessageReceipts(account, packet); - } - if (replacedMessage.getEncryption() == Message.ENCRYPTION_PGP) { - conversation.getAccount().getPgpDecryptionService().add(replacedMessage); - } - return; - } else { - Log.d(Config.LOGTAG,account.getJid().toBareJid()+": received message correction but verification didn't check out"); - } - } - } - boolean checkForDuplicates = query != null || (isTypeGroupChat && packet.hasChild("delay","urn:xmpp:delay")) || message.getType() == Message.TYPE_PRIVATE; diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 9b49ea4d..53d34b95 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -219,14 +219,8 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa activity.attachFile(ConversationActivity.ATTACHMENT_CHOICE_CHOOSE_IMAGE); break; case CANCEL: - if (conversation != null) { - if (conversation.getCorrectingMessage() != null) { - conversation.setCorrectingMessage(null); - mEditMessage.getEditableText().clear(); - } - if (conversation.getMode() == Conversation.MODE_MULTI) { - conversation.setNextCounterpart(null); - } + if (conversation != null && conversation.getMode() == Conversation.MODE_MULTI) { + conversation.setNextCounterpart(null); updateChatMsgHint(); updateSendButton(); } @@ -261,21 +255,12 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa if (body.length() == 0 || this.conversation == null) { return; } - final Message message; - if (conversation.getCorrectingMessage() == null) { - message = new Message(conversation, body, conversation.getNextEncryption()); - if (conversation.getMode() == Conversation.MODE_MULTI) { - if (conversation.getNextCounterpart() != null) { - message.setCounterpart(conversation.getNextCounterpart()); - message.setType(Message.TYPE_PRIVATE); - } + Message message = new Message(conversation, body, conversation.getNextEncryption()); + if (conversation.getMode() == Conversation.MODE_MULTI) { + if (conversation.getNextCounterpart() != null) { + message.setCounterpart(conversation.getNextCounterpart()); + message.setType(Message.TYPE_PRIVATE); } - } else { - message = conversation.getCorrectingMessage(); - message.setBody(body); - message.setEdited(message.getUuid()); - message.setUuid(UUID.randomUUID().toString()); - conversation.setCorrectingMessage(null); } switch (conversation.getNextEncryption()) { case Message.ENCRYPTION_OTR: @@ -296,9 +281,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa public void updateChatMsgHint() { final boolean multi = conversation.getMode() == Conversation.MODE_MULTI; - if (conversation.getCorrectingMessage() != null) { - this.mEditMessage.setHint(R.string.send_corrected_message); - } else if (multi && conversation.getNextCounterpart() != null) { + if (multi && conversation.getNextCounterpart() != null) { this.mEditMessage.setHint(getString( R.string.send_private_message_to, conversation.getNextCounterpart().getResourcepart())); @@ -554,7 +537,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa activity.getMenuInflater().inflate(R.menu.message_context, menu); menu.setHeaderTitle(R.string.message_options); MenuItem copyText = menu.findItem(R.id.copy_text); - MenuItem correctMessage = menu.findItem(R.id.correct_message); MenuItem shareWith = menu.findItem(R.id.share_with); MenuItem sendAgain = menu.findItem(R.id.send_again); MenuItem copyUrl = menu.findItem(R.id.copy_url); @@ -566,10 +548,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa && m.treatAsDownloadable() != Message.Decision.MUST) { copyText.setVisible(true); } - if (relevantForCorrection.getType() == Message.TYPE_TEXT - && relevantForCorrection.isLastCorrectableMessage()) { - correctMessage.setVisible(true); - } if ((m.getType() != Message.TYPE_TEXT && m.getType() != Message.TYPE_PRIVATE && m.getTransferable() == null) @@ -606,9 +584,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa case R.id.copy_text: copyText(selectedMessage); return true; - case R.id.correct_message: - correctMessage(selectedMessage); - return true; case R.id.send_again: resendMessage(selectedMessage); return true; @@ -710,16 +685,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa updateSendButton(); } - private void correctMessage(Message message) { - while(message.mergeable(message.next())) { - message = message.next(); - } - this.conversation.setCorrectingMessage(message); - this.mEditMessage.getEditableText().clear(); - this.mEditMessage.getEditableText().append(message.getBody()); - - } - protected void highlightInConference(String nick) { String oldString = mEditMessage.getText().toString(); if (oldString.isEmpty() || mEditMessage.getSelectionStart() == 0) { @@ -1026,9 +991,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa final String text = this.mEditMessage == null ? "" : this.mEditMessage.getText().toString(); final boolean empty = text.length() == 0; final boolean conference = c.getMode() == Conversation.MODE_MULTI; - if (c.getCorrectingMessage() != null && (empty || text.equals(c.getCorrectingMessage().getBody()))) { - action = SendButtonAction.CANCEL; - } else if (conference && !c.getAccount().httpUploadAvailable()) { + if (conference && !c.getAccount().httpUploadAvailable()) { if (empty && c.getNextCounterpart() != null) { action = SendButtonAction.CANCEL; } else { @@ -1299,13 +1262,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa updateSendButton(); } - @Override - public void onTextChanged() { - if (conversation != null && conversation.getCorrectingMessage() != null) { - updateSendButton(); - } - } - private int completionIndex = 0; private int lastCompletionLength = 0; private String incomplete; diff --git a/src/main/java/eu/siacs/conversations/ui/EditMessage.java b/src/main/java/eu/siacs/conversations/ui/EditMessage.java index 8cc59cde..06868a98 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditMessage.java +++ b/src/main/java/eu/siacs/conversations/ui/EditMessage.java @@ -69,7 +69,6 @@ public class EditMessage extends EmojiconEditText { this.isUserTyping = false; this.keyboardListener.onTextDeleted(); } - this.keyboardListener.onTextChanged(); } } @@ -85,7 +84,6 @@ public class EditMessage extends EmojiconEditText { void onTypingStarted(); void onTypingStopped(); void onTextDeleted(); - void onTextChanged(); boolean onTabPressed(boolean repeated); } diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java index 49deab38..83ab83e7 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java @@ -165,8 +165,7 @@ public class SettingsActivity extends XmppActivity implements xmppConnectionService.toggleForegroundService(); } else if (name.equals("confirm_messages") || name.equals("xa_on_silent_mode") - || name.equals("away_when_screen_off") - || name.equals("allow_message_correction")) { + || name.equals("away_when_screen_off")) { if (xmppConnectionServiceBound) { if (name.equals("away_when_screen_off")) { xmppConnectionService.toggleScreenEventReceiver(); diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 62caaa2d..444c217d 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -125,15 +125,6 @@ public class MessageAdapter extends ArrayAdapter<Message> { viewHolder.indicatorReceived.setVisibility(View.GONE); } - if (viewHolder.edit_indicator != null) { - if (message.edited()) { - viewHolder.edit_indicator.setVisibility(View.VISIBLE); - viewHolder.edit_indicator.setImageResource(darkBackground ? R.drawable.ic_mode_edit_white_18dp : R.drawable.ic_mode_edit_black_18dp); - viewHolder.edit_indicator.setAlpha(darkBackground ? 0.7f : 0.57f); - } else { - viewHolder.edit_indicator.setVisibility(View.GONE); - } - } boolean multiReceived = message.getConversation().getMode() == Conversation.MODE_MULTI && message.getMergedStatus() <= Message.STATUS_RECEIVED; if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE || message.getTransferable() != null) { @@ -463,7 +454,6 @@ public class MessageAdapter extends ArrayAdapter<Message> { .findViewById(R.id.download_button); viewHolder.indicator = (ImageView) view .findViewById(R.id.security_indicator); - viewHolder.edit_indicator = (ImageView) view.findViewById(R.id.edit_indicator); viewHolder.image = (ImageView) view .findViewById(R.id.message_image); viewHolder.messageBody = (TextView) view @@ -484,7 +474,6 @@ public class MessageAdapter extends ArrayAdapter<Message> { .findViewById(R.id.download_button); viewHolder.indicator = (ImageView) view .findViewById(R.id.security_indicator); - viewHolder.edit_indicator = (ImageView) view.findViewById(R.id.edit_indicator); viewHolder.image = (ImageView) view .findViewById(R.id.message_image); viewHolder.messageBody = (TextView) view @@ -675,7 +664,6 @@ public class MessageAdapter extends ArrayAdapter<Message> { protected ImageView contact_picture; protected TextView status_message; protected TextView encryption; - public ImageView edit_indicator; } class BitmapWorkerTask extends AsyncTask<Message, Void, Bitmap> { diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png Binary files differdeleted file mode 100644 index 00e7d074..00000000 --- a/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png Binary files differdeleted file mode 100644 index 558f0ea3..00000000 --- a/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png Binary files differdeleted file mode 100644 index ebd96073..00000000 --- a/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png Binary files differdeleted file mode 100644 index e23c42db..00000000 --- a/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png Binary files differdeleted file mode 100644 index b33c964d..00000000 --- a/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png Binary files differdeleted file mode 100644 index 3ee3e172..00000000 --- a/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png Binary files differdeleted file mode 100644 index 66d25296..00000000 --- a/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png Binary files differdeleted file mode 100644 index 9d7f2ff9..00000000 --- a/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png Binary files differdeleted file mode 100644 index 827b6848..00000000 --- a/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png Binary files differdeleted file mode 100644 index 34ec7092..00000000 --- a/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png +++ /dev/null diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index 9362a74a..93ab095b 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -95,16 +95,6 @@ android:gravity="center_vertical" android:src="@drawable/ic_lock_white_18dp" /> - <ImageView - android:id="@+id/edit_indicator" - android:layout_width="?attr/TextSizeInfo" - android:layout_height="?attr/TextSizeInfo" - android:layout_gravity="center_vertical" - android:layout_marginRight="4sp" - android:alpha="0.70" - android:gravity="center_vertical" - android:src="@drawable/ic_mode_edit_white_18dp" /> - <TextView android:id="@+id/message_time" android:layout_width="wrap_content" diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index e5365a66..909ae9c7 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -95,16 +95,6 @@ android:src="@drawable/ic_lock_black_18dp" /> <ImageView - android:id="@+id/edit_indicator" - android:layout_width="?attr/TextSizeInfo" - android:layout_height="?attr/TextSizeInfo" - android:layout_gravity="center_vertical" - android:layout_marginLeft="4sp" - android:alpha="0.54" - android:gravity="center_vertical" - android:src="@drawable/ic_mode_edit_black_18dp" /> - - <ImageView android:id="@+id/indicator_received" android:layout_width="?attr/TextSizeInfo" android:layout_height="?attr/TextSizeInfo" diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml index a1df670a..2fe1ca22 100644 --- a/src/main/res/menu/message_context.xml +++ b/src/main/res/menu/message_context.xml @@ -9,10 +9,6 @@ android:title="@string/copy_text" android:visible="false"/> <item - android:id="@+id/correct_message" - android:title="@string/correct_message" - android:visible="false"/> - <item android:id="@+id/share_with" android:title="@string/share_with" android:visible="false"/> diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index 3944a4e6..a2acb210 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -558,6 +558,4 @@ <string name="selection_too_large">Избраната област е твърде голяма</string> <string name="no_accounts">(Няма активирани профили)</string> <string name="this_field_is_required">Това поле е задължително</string> - <string name="correct_message">Поправяне на съобщението</string> - <string name="send_corrected_message">Изпращане на поправеното съобщение</string> </resources> diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 28987d04..69f132b6 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -563,6 +563,4 @@ <string name="selection_too_large">Vybraný obsah je příliš dlouhý</string> <string name="no_accounts">(Žádné aktivované účty)</string> <string name="this_field_is_required">Toto pole je vyžadováno</string> - <string name="correct_message">Opravit zprávu</string> - <string name="send_corrected_message">Odeslat opravenou zprávu</string> </resources> diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 4cbc0d8e..68a3750c 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -620,6 +620,4 @@ <string name="selection_too_large">Der ausgewählte Bereich ist zu groß</string> <string name="no_accounts">(Keine aktivierten Konten)</string> <string name="this_field_is_required">Dieses Feld ist erforderlich</string> - <string name="correct_message">Nachricht korrigieren</string> - <string name="send_corrected_message">Korrigierte Nachricht senden</string> </resources> diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 996c5eb0..6d6ca48f 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -558,6 +558,4 @@ <string name="selection_too_large">El área seleccionada es demasiado grande</string> <string name="no_accounts">(No hay cuentas activas)</string> <string name="this_field_is_required">Este campo es requerido</string> - <string name="correct_message">Corregir mensaje</string> - <string name="send_corrected_message">Enviar mensaje corregido</string> </resources> diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index d080cfd4..9065217d 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -558,6 +558,4 @@ <string name="selection_too_large">Hautatutako zatia handiegia da</string> <string name="no_accounts">(Ez dago kontu aktiborik)</string> <string name="this_field_is_required">Datu hau beharrezkoa da</string> - <string name="correct_message">Mezua zuzendu</string> - <string name="send_corrected_message">Mezu zuzendua bidali</string> </resources> diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index f0677756..2d50465e 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -558,6 +558,4 @@ <string name="selection_too_large">La zone sélectionnée est trop grande</string> <string name="no_accounts">(Aucun compte activé)</string> <string name="this_field_is_required">Ce champ est requis</string> - <string name="correct_message">Corriger le message</string> - <string name="send_corrected_message">Envoyer le message corrigé</string> </resources> diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 6545dd1e..63a08fb4 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -555,6 +555,4 @@ <string name="selection_too_large">選択した範囲が大きすぎます</string> <string name="no_accounts">(アクティベートしたアカウントはありません)</string> <string name="this_field_is_required">このフィールドは必須です</string> - <string name="correct_message">メッセージを修正</string> - <string name="send_corrected_message">修正したメッセージを送信</string> </resources> diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index a0df7b2c..77435034 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -558,6 +558,4 @@ <string name="selection_too_large">Het gekozen vlak is te groot</string> <string name="no_accounts">(Geen actieve accounts)</string> <string name="this_field_is_required">Dit veld is vereist</string> - <string name="correct_message">Bericht verbeteren</string> - <string name="send_corrected_message">Verbeterd bericht sturen</string> </resources> diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 148dc22b..00828057 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -562,6 +562,4 @@ <string name="selection_too_large">A área selecionada é muito grande</string> <string name="no_accounts">(Nenhuma conta ativa)</string> <string name="this_field_is_required">Este campo é necessário</string> - <string name="correct_message">Corrigir a mensagem</string> - <string name="send_corrected_message">Enviar a mensagem corrigida</string> </resources> diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml index a39ad3f8..76a9fe69 100644 --- a/src/main/res/values-ro-rRO/strings.xml +++ b/src/main/res/values-ro-rRO/strings.xml @@ -562,6 +562,4 @@ Emitent</string> <string name="selection_too_large">Zona selectata este prea mare</string> <string name="no_accounts">(Nici un cont activat)</string> <string name="this_field_is_required">Acest camp este obligatoriu</string> - <string name="correct_message">Corectie mesaj</string> - <string name="send_corrected_message">Trimite text corectat</string> </resources> diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 2a62af40..ae952762 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -558,6 +558,4 @@ <string name="selection_too_large">The valda området är för stort</string> <string name="no_accounts">(Inget konto aktiverat)</string> <string name="this_field_is_required">Detta fält måste fyllas i</string> - <string name="correct_message">Korrigera meddelanden</string> - <string name="send_corrected_message">Skicka korrigerat meddelande</string> </resources> diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml index 7d8c4992..b2478e7b 100644 --- a/src/main/res/values-tr-rTR/strings.xml +++ b/src/main/res/values-tr-rTR/strings.xml @@ -555,6 +555,4 @@ <string name="selection_too_large">Seçilen alan çok büyük</string> <string name="no_accounts">(Aktif hesap bulunmuyor)</string> <string name="this_field_is_required">Bu alan zorunludur</string> - <string name="correct_message">ileti düzelt</string> - <string name="send_corrected_message">Düzeltilmiş iletiyi gönder</string> </resources> diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 775abaea..e6f1dd3b 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -557,6 +557,4 @@ <string name="selection_too_large">选择区域过大</string> <string name="no_accounts">(没有激活的账户)</string> <string name="this_field_is_required">必填</string> - <string name="correct_message">更正消息</string> - <string name="send_corrected_message">发送更正后的消息</string> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index b5bba166..daffdbf4 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -651,6 +651,4 @@ <string name="selection_too_large">The selected area is too large</string> <string name="no_accounts">(No activated accounts)</string> <string name="this_field_is_required">This field is required</string> - <string name="correct_message">Correct message</string> - <string name="send_corrected_message">Send corrected message</string> </resources> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 98982c2b..190c2167 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -194,11 +194,6 @@ android:key="remove_trusted_certificates" android:summary="@string/pref_remove_trusted_certificates_summary" android:title="@string/pref_remove_trusted_certificates_title"/> - <CheckBoxPreference - android:defaultValue="true" - android:key="allow_message_correction" - android:title="@string/pref_allow_message_correction" - android:summary="@string/pref_allow_message_correction_summary"/> </PreferenceCategory> <PreferenceCategory android:key="connection_options" |
