diff --git a/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java b/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java index e2f347f44..9d74fc122 100644 --- a/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/BaseConversationListFragment.java @@ -1,10 +1,10 @@ package org.thoughtcrime.securesms; -import static org.thoughtcrime.securesms.util.RelayUtil.acquireRelayMessageContent; -import static org.thoughtcrime.securesms.util.RelayUtil.getSharedText; -import static org.thoughtcrime.securesms.util.RelayUtil.getSharedUris; -import static org.thoughtcrime.securesms.util.RelayUtil.isForwarding; -import static org.thoughtcrime.securesms.util.RelayUtil.isRelayingMessageContent; +import static org.thoughtcrime.securesms.util.ShareUtil.acquireRelayMessageContent; +import static org.thoughtcrime.securesms.util.ShareUtil.getSharedText; +import static org.thoughtcrime.securesms.util.ShareUtil.getSharedUris; +import static org.thoughtcrime.securesms.util.ShareUtil.isForwarding; +import static org.thoughtcrime.securesms.util.ShareUtil.isRelayingMessageContent; import android.annotation.SuppressLint; import android.app.Activity; @@ -36,7 +36,7 @@ import org.thoughtcrime.securesms.components.registration.PulsingFloatingActionB import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.connect.DirectShareUtil; import org.thoughtcrime.securesms.recipients.Recipient; -import org.thoughtcrime.securesms.util.RelayUtil; +import org.thoughtcrime.securesms.util.ShareUtil; import org.thoughtcrime.securesms.util.SendRelayedMessageUtil; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.task.SnackbarAsyncTask; @@ -382,7 +382,7 @@ public abstract class BaseConversationListFragment extends Fragment implements A @Override public boolean onCreateActionMode(ActionMode mode, Menu menu) { if (isRelayingMessageContent(getActivity())) { - if (RelayUtil.getSharedContactId(getActivity()) != 0) { + if (ShareUtil.getSharedContactId(getActivity()) != 0) { return false; // no sharing of a contact to multiple recipients at the same time, we can reconsider when that becomes a real-world need } Context context = getContext(); diff --git a/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java index 4fdee4852..e7918ca01 100644 --- a/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms; -import static org.thoughtcrime.securesms.util.RelayUtil.isRelayingMessageContent; +import static org.thoughtcrime.securesms.util.ShareUtil.isRelayingMessageContent; import android.app.Activity; import android.content.Intent; diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java index 294326274..714bd764c 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java @@ -17,9 +17,9 @@ package org.thoughtcrime.securesms; import static org.thoughtcrime.securesms.TransportOption.Type; -import static org.thoughtcrime.securesms.util.RelayUtil.getSharedText; -import static org.thoughtcrime.securesms.util.RelayUtil.isForwarding; -import static org.thoughtcrime.securesms.util.RelayUtil.isSharing; +import static org.thoughtcrime.securesms.util.ShareUtil.getSharedText; +import static org.thoughtcrime.securesms.util.ShareUtil.isForwarding; +import static org.thoughtcrime.securesms.util.ShareUtil.isSharing; import android.Manifest; import android.annotation.SuppressLint; @@ -106,7 +106,7 @@ import org.thoughtcrime.securesms.scribbles.ScribbleActivity; import org.thoughtcrime.securesms.util.DynamicTheme; import org.thoughtcrime.securesms.util.MediaUtil; import org.thoughtcrime.securesms.util.Prefs; -import org.thoughtcrime.securesms.util.RelayUtil; +import org.thoughtcrime.securesms.util.ShareUtil; import org.thoughtcrime.securesms.util.SendRelayedMessageUtil; import org.thoughtcrime.securesms.util.ServiceUtil; import org.thoughtcrime.securesms.util.Util; @@ -742,8 +742,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } private void handleSharing() { - ArrayList uriList = RelayUtil.getSharedUris(this); - int sharedContactId = RelayUtil.getSharedContactId(this); + ArrayList uriList = ShareUtil.getSharedUris(this); + int sharedContactId = ShareUtil.getSharedContactId(this); if (uriList.size() > 1) { askSendingFiles(uriList, () -> SendRelayedMessageUtil.immediatelyRelay(this, chatId)); } else { @@ -768,7 +768,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity isEditing = false; final SettableFuture future = new SettableFuture<>(); DcMsg draft = dcContext.getDraft(chatId); - final String sharedText = RelayUtil.getSharedText(this); + final String sharedText = ShareUtil.getSharedText(this); if (!draft.isOk()) { if (TextUtils.isEmpty(sharedText)) { diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java index 724eb76d1..02f2f1271 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms; import static com.b44t.messenger.DcContact.DC_CONTACT_ID_SELF; -import static org.thoughtcrime.securesms.util.RelayUtil.setForwardingMessageIds; +import static org.thoughtcrime.securesms.util.ShareUtil.setForwardingMessageIds; import android.annotation.SuppressLint; import android.app.Activity; @@ -66,7 +66,6 @@ import org.thoughtcrime.securesms.util.StickyHeaderDecoration; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; import org.thoughtcrime.securesms.util.views.ConversationAdaptiveActionsToolbar; -import org.thoughtcrime.securesms.calls.CallUtil; import java.util.Collections; import java.util.LinkedList; diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java index 9dc319f92..1076889db 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java @@ -20,13 +20,13 @@ import static org.thoughtcrime.securesms.ConversationActivity.CHAT_ID_EXTRA; import static org.thoughtcrime.securesms.ConversationActivity.STARTING_POSITION_EXTRA; import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_ENABLED; import static org.thoughtcrime.securesms.connect.DcHelper.CONFIG_PROXY_URL; -import static org.thoughtcrime.securesms.util.RelayUtil.acquireRelayMessageContent; -import static org.thoughtcrime.securesms.util.RelayUtil.getDirectSharingChatId; -import static org.thoughtcrime.securesms.util.RelayUtil.getSharedTitle; -import static org.thoughtcrime.securesms.util.RelayUtil.isDirectSharing; -import static org.thoughtcrime.securesms.util.RelayUtil.isForwarding; -import static org.thoughtcrime.securesms.util.RelayUtil.isRelayingMessageContent; -import static org.thoughtcrime.securesms.util.RelayUtil.resetRelayingMessageContent; +import static org.thoughtcrime.securesms.util.ShareUtil.acquireRelayMessageContent; +import static org.thoughtcrime.securesms.util.ShareUtil.getDirectSharingChatId; +import static org.thoughtcrime.securesms.util.ShareUtil.getSharedTitle; +import static org.thoughtcrime.securesms.util.ShareUtil.isDirectSharing; +import static org.thoughtcrime.securesms.util.ShareUtil.isForwarding; +import static org.thoughtcrime.securesms.util.ShareUtil.isRelayingMessageContent; +import static org.thoughtcrime.securesms.util.ShareUtil.resetRelayingMessageContent; import android.Manifest; import android.content.Intent; @@ -74,7 +74,7 @@ import org.thoughtcrime.securesms.search.SearchFragment; import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme; import org.thoughtcrime.securesms.util.DynamicTheme; import org.thoughtcrime.securesms.util.Prefs; -import org.thoughtcrime.securesms.util.RelayUtil; +import org.thoughtcrime.securesms.util.ShareUtil; import org.thoughtcrime.securesms.util.SaveAttachmentTask; import org.thoughtcrime.securesms.util.SendRelayedMessageUtil; import org.thoughtcrime.securesms.util.StorageUtil; @@ -354,7 +354,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit if (isRelayingMessageContent(this)) { inflater.inflate(R.menu.forwarding_menu, menu); menu.findItem(R.id.menu_export_attachment).setVisible( - RelayUtil.isFromWebxdc(this) && RelayUtil.getSharedUris(this).size() == 1 + ShareUtil.isFromWebxdc(this) && ShareUtil.getSharedUris(this).size() == 1 ); } else { inflater.inflate(R.menu.text_secure_normal, menu); @@ -467,7 +467,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit } private void performSave() { - ArrayList uriList = RelayUtil.getSharedUris(this); + ArrayList uriList = ShareUtil.getSharedUris(this); Uri uri = uriList.get(0); String mimeType = PersistentBlobProvider.getMimeType(this, uri); String fileName = PersistentBlobProvider.getFileName(this, uri); diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java index b5e6ecdee..d7491f24b 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationListArchiveActivity.java @@ -2,9 +2,9 @@ package org.thoughtcrime.securesms; import static org.thoughtcrime.securesms.ConversationActivity.CHAT_ID_EXTRA; import static org.thoughtcrime.securesms.ConversationActivity.FROM_ARCHIVED_CHATS_EXTRA; -import static org.thoughtcrime.securesms.util.RelayUtil.acquireRelayMessageContent; -import static org.thoughtcrime.securesms.util.RelayUtil.isRelayingMessageContent; -import static org.thoughtcrime.securesms.util.RelayUtil.isSharing; +import static org.thoughtcrime.securesms.util.ShareUtil.acquireRelayMessageContent; +import static org.thoughtcrime.securesms.util.ShareUtil.isRelayingMessageContent; +import static org.thoughtcrime.securesms.util.ShareUtil.isSharing; import android.content.Intent; import android.os.Bundle; diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java index 74dc5bbf5..7d22831d1 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationListFragment.java @@ -48,7 +48,7 @@ import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.notifications.FcmReceiveService; import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.util.Prefs; -import org.thoughtcrime.securesms.util.RelayUtil; +import org.thoughtcrime.securesms.util.ShareUtil; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; @@ -264,7 +264,7 @@ public class ConversationListFragment extends BaseConversationListFragment int listflags = 0; if (archive) { listflags |= DcContext.DC_GCL_ARCHIVED_ONLY; - } else if (RelayUtil.isRelayingMessageContent(getActivity())) { + } else if (ShareUtil.isRelayingMessageContent(getActivity())) { listflags |= DcContext.DC_GCL_FOR_FORWARDING; } else { listflags |= DcContext.DC_GCL_ADD_ALLDONE_HINT; diff --git a/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java index d16a986fe..2421ef92d 100644 --- a/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java @@ -18,8 +18,8 @@ package org.thoughtcrime.securesms; import static org.thoughtcrime.securesms.ConversationActivity.CHAT_ID_EXTRA; import static org.thoughtcrime.securesms.ConversationActivity.TEXT_EXTRA; -import static org.thoughtcrime.securesms.util.RelayUtil.acquireRelayMessageContent; -import static org.thoughtcrime.securesms.util.RelayUtil.isRelayingMessageContent; +import static org.thoughtcrime.securesms.util.ShareUtil.acquireRelayMessageContent; +import static org.thoughtcrime.securesms.util.ShareUtil.isRelayingMessageContent; import android.content.Intent; import android.net.Uri; diff --git a/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java index 3b836106b..15e76e9d4 100644 --- a/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java @@ -28,7 +28,7 @@ import org.thoughtcrime.securesms.connect.DcEventCenter; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme; import org.thoughtcrime.securesms.util.Prefs; -import org.thoughtcrime.securesms.util.RelayUtil; +import org.thoughtcrime.securesms.util.ShareUtil; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; @@ -393,9 +393,9 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity Intent composeIntent = new Intent(); DcContact dcContact = dcContext.getContact(contactId); if (dcContact.isKeyContact()) { - RelayUtil.setSharedContactId(composeIntent, contactId); + ShareUtil.setSharedContactId(composeIntent, contactId); } else { - RelayUtil.setSharedText(composeIntent, dcContact.getAddr()); + ShareUtil.setSharedText(composeIntent, dcContact.getAddr()); } ConversationListRelayingActivity.start(this, composeIntent); } diff --git a/src/main/java/org/thoughtcrime/securesms/ShareActivity.java b/src/main/java/org/thoughtcrime/securesms/ShareActivity.java index 1493413ad..3cc0ed8c3 100644 --- a/src/main/java/org/thoughtcrime/securesms/ShareActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ShareActivity.java @@ -39,7 +39,7 @@ import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme; import org.thoughtcrime.securesms.util.MailtoUtil; import org.thoughtcrime.securesms.util.MediaUtil; -import org.thoughtcrime.securesms.util.RelayUtil; +import org.thoughtcrime.securesms.util.ShareUtil; import java.util.ArrayList; import java.util.List; @@ -269,12 +269,12 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity implement composeIntent = getBaseShareIntent(ConversationActivity.class); composeIntent.putExtra(ConversationActivity.CHAT_ID_EXTRA, chatId); composeIntent.putExtra(ConversationActivity.ACCOUNT_ID_EXTRA, accId); - RelayUtil.setSharedUris(composeIntent, resolvedExtras); + ShareUtil.setSharedUris(composeIntent, resolvedExtras); startActivity(composeIntent); } else { composeIntent = getBaseShareIntent(ConversationListRelayingActivity.class); - RelayUtil.setSharedUris(composeIntent, resolvedExtras); - RelayUtil.setIsFromWebxdc(composeIntent, RelayUtil.isFromWebxdc(this)); + ShareUtil.setSharedUris(composeIntent, resolvedExtras); + ShareUtil.setIsFromWebxdc(composeIntent, ShareUtil.isFromWebxdc(this)); ConversationListRelayingActivity.start(this, composeIntent); } finish(); @@ -283,9 +283,9 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity implement private Intent getBaseShareIntent(final @NonNull Class target) { final Intent intent = new Intent(this, target); - String title = RelayUtil.getSharedTitle(this); + String title = ShareUtil.getSharedTitle(this); if (title != null) { - RelayUtil.setSharedTitle(intent, title); + ShareUtil.setSharedTitle(intent, title); } String text = getIntent().getStringExtra(Intent.EXTRA_TEXT); @@ -297,7 +297,7 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity implement } if (text != null) { - RelayUtil.setSharedText(intent, text.toString()); + ShareUtil.setSharedText(intent, text.toString()); } if (resolvedExtras.size() > 0) { Uri data = resolvedExtras.get(0); diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java index b32c27ec0..e98f468d9 100644 --- a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java +++ b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java @@ -35,7 +35,7 @@ import org.thoughtcrime.securesms.qr.QrActivity; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.FileUtils; import org.thoughtcrime.securesms.util.MediaUtil; -import org.thoughtcrime.securesms.util.RelayUtil; +import org.thoughtcrime.securesms.util.ShareUtil; import org.thoughtcrime.securesms.util.Util; import java.io.File; @@ -298,19 +298,19 @@ public class DcHelper { public static void sendToChat(Context activity, byte[] data, String mimeType, String fileName, String text) { Intent intent = new Intent(activity, ShareActivity.class); intent.setAction(Intent.ACTION_SEND); - RelayUtil.setIsFromWebxdc(intent, true); + ShareUtil.setIsFromWebxdc(intent, true); if (data != null) { Uri uri = PersistentBlobProvider.getInstance().create(activity, data, mimeType, fileName); intent.setType(mimeType); intent.putExtra(Intent.EXTRA_STREAM, uri); - RelayUtil.setSharedTitle(intent, activity.getString(R.string.send_file_to, fileName)); + ShareUtil.setSharedTitle(intent, activity.getString(R.string.send_file_to, fileName)); } if (text != null) { intent.putExtra(Intent.EXTRA_TEXT, text); if (data == null) { - RelayUtil.setSharedTitle(intent, activity.getString(R.string.send_message_to)); + ShareUtil.setSharedTitle(intent, activity.getString(R.string.send_message_to)); } } diff --git a/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java b/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java index 486c3451d..b6a2b0c5a 100644 --- a/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/search/SearchFragment.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.search; -import static org.thoughtcrime.securesms.util.RelayUtil.isRelayingMessageContent; +import static org.thoughtcrime.securesms.util.ShareUtil.isRelayingMessageContent; import android.content.res.Configuration; import android.os.Bundle; diff --git a/src/main/java/org/thoughtcrime/securesms/util/SendRelayedMessageUtil.java b/src/main/java/org/thoughtcrime/securesms/util/SendRelayedMessageUtil.java index 6fab33ced..3a1531a30 100644 --- a/src/main/java/org/thoughtcrime/securesms/util/SendRelayedMessageUtil.java +++ b/src/main/java/org/thoughtcrime/securesms/util/SendRelayedMessageUtil.java @@ -1,11 +1,11 @@ package org.thoughtcrime.securesms.util; -import static org.thoughtcrime.securesms.util.RelayUtil.getForwardedMessageIDs; -import static org.thoughtcrime.securesms.util.RelayUtil.getSharedText; -import static org.thoughtcrime.securesms.util.RelayUtil.getSharedUris; -import static org.thoughtcrime.securesms.util.RelayUtil.isForwarding; -import static org.thoughtcrime.securesms.util.RelayUtil.isSharing; -import static org.thoughtcrime.securesms.util.RelayUtil.resetRelayingMessageContent; +import static org.thoughtcrime.securesms.util.ShareUtil.getForwardedMessageIDs; +import static org.thoughtcrime.securesms.util.ShareUtil.getSharedText; +import static org.thoughtcrime.securesms.util.ShareUtil.getSharedUris; +import static org.thoughtcrime.securesms.util.ShareUtil.isForwarding; +import static org.thoughtcrime.securesms.util.ShareUtil.isSharing; +import static org.thoughtcrime.securesms.util.ShareUtil.resetRelayingMessageContent; import android.app.Activity; import android.content.ContentResolver; diff --git a/src/main/java/org/thoughtcrime/securesms/util/RelayUtil.java b/src/main/java/org/thoughtcrime/securesms/util/ShareUtil.java similarity index 99% rename from src/main/java/org/thoughtcrime/securesms/util/RelayUtil.java rename to src/main/java/org/thoughtcrime/securesms/util/ShareUtil.java index 119cf6dfb..628b80799 100644 --- a/src/main/java/org/thoughtcrime/securesms/util/RelayUtil.java +++ b/src/main/java/org/thoughtcrime/securesms/util/ShareUtil.java @@ -10,7 +10,7 @@ import androidx.annotation.NonNull; import java.util.ArrayList; -public class RelayUtil { +public class ShareUtil { private static final String FORWARDED_MESSAGE_IDS = "forwarded_message_ids"; private static final String SHARED_URIS = "shared_uris"; private static final String SHARED_CONTACT_ID = "shared_contact_id"; diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index a7cb3ab76..ae5bba016 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -338,8 +338,6 @@ Save Log More Options Learn Spelling - - Chat Audit Log Jump to Message Jump to Original Message Copy JSON @@ -348,7 +346,7 @@ Device Messages Locally generated messages Messages in this chat are generated on your device to inform about app updates and problems during usage. - Get in contact!\n\n🙌 Tap \"QR code\" on the main screen of both devices. Choose \"Scan QR Code\" on one device, and point it at the other\n\n🌍 If not in the same room, scan via video call or share an invite link from \"Scan QR code\"\n\nThen: Enjoy your messenger experience over the largest decentralized network that ever existed: Email. And in contrast to other popular apps, without central control or tracking or selling you, friends, colleagues or family out to large organizations. + Get in contact!\n\n🙌 Tap \"QR code\" on the main screen of both devices. Choose \"Scan QR Code\" on one device, and point it at the other\n\n🌍 If not in the same room, scan via video call or share an invite link from \"Scan QR code\"\n\nThen: Enjoy your decentralized messenger experience. In contrast to other popular apps, without central control or tracking or selling you, friends, colleagues or family out to large organizations. Edit Contact Pin Chat @@ -433,8 +431,6 @@ Contacts - - Enter name or email address Type email address above @@ -506,12 +502,6 @@ Show traces Send point of interest - - System messages for this chat appear here - - Chat Audit Log for %1$s - - Shows only system and info messages; useful for finding the last chat actions without scrolling through many messages. @@ -544,8 +534,6 @@ You must be a member of the group to perform this action. Encryption Chats in Common - - Related Chats Past Members Contact @@ -612,7 +600,7 @@ Sending… Last message sent successfully. Not supported by your provider. - + Messages %1$s of %2$s used @@ -623,8 +611,8 @@ Create New Profile I Already Have a Profile - - Use Classic Email as Transport + + Use Classic Email as Relay Your Profile @@ -649,10 +637,6 @@ Scan Invitation Code Log In This login is for advanced users:\n\n• Do not use an account you\'re using in another app.\n\n• Classic email server allow chats without end-to-end encryption marked by a mail icon. - - Log into your Email Account - - Log in with an existing email account Inbox IMAP Login Name IMAP Server @@ -679,15 +663,16 @@ Share Link Proxy Enabled You are using a proxy. If you\'re having trouble connecting, try a different proxy. - - Transports - Add Transport - Remove Transport - Edit Transport - - Add this transport? - The scanned QR code does not contain a valid transport. - Remove transport \"%1$s\"?\n\nYour contacts can only reach you if you\'ve previously contacted them via another transport.\n\nIf in doubt, remove the transport later. + + Relays + Add Relay + Remove Relay + Edit Relay + + Add this relay? + The scanned QR code does not contain a valid relay. + + Remove relay \"%1$s\"?\n\nYour contacts can only reach you if you\'ve previously contacted them via another relay.\n\nIf in doubt, remove the relay later. Certificate Checks Please enter a valid email address @@ -737,8 +722,6 @@ Profile Image Blocked Contacts Blocked contacts will appear here. - - Password and Account Your profile image, name and bio will be sent together with your messages when communicating with other users. Your Name @@ -782,10 +765,6 @@ Server Encryption Manage Keys - - Read System Address Book - - Offer to create chats with contacts from the address book. Chats In-Chat Sounds View Log @@ -801,12 +780,6 @@ Export all %1$d profiles Start Backup Backup written successfully to \"%1$s\". - - Export Secret Keys - - Export secret keys to \"%1$s\"? - - Secret keys written successfully to \"%1$s\". Wallpaper Use Default Image @@ -829,10 +802,6 @@ Experimental Features These features may be unstable and may be changed or removed On-demand Location Streaming - - Developer Mode - - Activates debugging options and can make the app less stable. For developers only. Default image Default color Custom image @@ -904,17 +873,6 @@ After 5 weeks After 1 year - - Send Autocrypt Setup Message - - An Autocrypt Setup Message securely shares your end-to-end setup with other Autocrypt-compliant apps.\n\nIf you use Delta Chat on the other device as well, use \"Settings / Add Second Device\" instead. - - Send Autocrypt Setup Message - - Your setup has been sent to yourself. Switch to the other device and open the setup message. You should be asked for a setup code. Enter the following digits: - - Prefer End-To-End Encryption - Message from %1$s Failed to send message to %1$s. @@ -1025,7 +983,9 @@ This QR code can be scanned by others to join the channel \"%1$s\".\n\nYou can reset it, so that the existing QR code or invite link will no longer work. Reset QR Code This QR code has been reset and is no longer active. + This QR code to join group \"%1$s\" has been reset and is no longer active. + This QR code to join channel \"%1$s\" has been reset and is no longer active. Activate QR Code QR Invite Code @@ -1142,9 +1102,6 @@ Name Select Group Image Export Backup - - Autocrypt setup transferred. - Delete this profile? Everything will be deleted, including your end-to-end setup, contacts, chats, messages and media. This action cannot be undone. sent received Open the Log Folder