awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

remove 'server' part from asking about message deletion

Browse Source
This commit is contained in:
B. Petersen
2025-02-22 19:48:17 +01:00
committed by bjoern
parent de96a4dc6e
commit c0e45abd3d
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
+1 -6
View File
@@ -341,12 +341,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
return;
}
DcMsg dcMsg = dcContext.getMsg(mediaItem.msgId);
DcChat dcChat = dcContext.getChat(dcMsg.getChatId());
String text = getResources().getQuantityString(
dcChat.isDeviceTalk()? R.plurals.ask_delete_messages_simple : R.plurals.ask_delete_messages,
1, 1);
String text = getResources().getQuantityString(R.plurals.ask_delete_messages_simple, 1, 1);
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(text);
src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java
+1 -3
View File
@@ -63,9 +63,7 @@ public abstract class MessageSelectorFragment
protected void handleDeleteMessages(int chatId, final int[] messageIds) {
DcChat dcChat = DcHelper.getContext(getActivity()).getChat(chatId);
String text = getActivity().getResources().getQuantityString(
dcChat.isDeviceTalk()? R.plurals.ask_delete_messages_simple : R.plurals.ask_delete_messages,
messageIds.length, messageIds.length);
String text = getActivity().getResources().getQuantityString(R.plurals.ask_delete_messages_simple, messageIds.length, messageIds.length);
AlertDialog dialog = new AlertDialog.Builder(getActivity())
.setMessage(text)
src/main/res/values/strings.xml
+4 -3
View File
@@ -364,11 +364,12 @@
<!-- get confirmations -->
<string name="ask_leave_group">Are you sure you want to leave this group?</string>
<plurals name="ask_delete_chat">
<item quantity="one">Delete %d chat? It will no longer be shown in the chat list; its messages will remain on the server.</item>
<item quantity="other">Delete %d chats? They will no longer be shown in the chat list; their messages will remain on the server.</item>
<item quantity="one">Delete %d chat?</item>
<item quantity="other">Delete %d chats?</item>
</plurals>
<string name="ask_delete_named_chat">Delete chat \"%1$s\"? It will no longer be shown in the chat list; its messages will remain on the server.</string>
<string name="ask_delete_named_chat">Delete chat \"%1$s\"?</string>
<string name="ask_delete_message">Are you sure you want to delete this message?</string>
<!-- deprecated, use ask_delete_messages_simple -->
<plurals name="ask_delete_messages">
<item quantity="one">Delete %d message here and on the server?</item>
<item quantity="other">Delete %d messages here and on the server?</item>