From 35b65e01194dcf3d1118f30ba159d75351475a19 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Mon, 26 Apr 2021 12:49:49 +0300 Subject: [PATCH 01/14] Added an ability to see basic msg details.| #1191 --- .../com/flowcrypt/email/extensions/ViewExt.kt | 21 +++ .../javax/mail/internet/InternetAddressExt.kt | 16 ++- .../fragment/MessageDetailsFragment.kt | 130 ++++++++++++++++-- .../adapter/MsgDetailsRecyclerViewAdapter.kt | 57 ++++++++ .../VerticalSpaceMarginItemDecoration.kt | 37 +++++ .../src/main/res/drawable/bg_mime_headers.xml | 20 +++ .../res/layout/fragment_message_details.xml | 97 ++++++++++--- .../src/main/res/layout/item_mime_header.xml | 41 ++++++ FlowCrypt/src/main/res/values/dimens.xml | 2 + FlowCrypt/src/main/res/values/strings.xml | 6 + 10 files changed, 393 insertions(+), 34 deletions(-) create mode 100644 FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgDetailsRecyclerViewAdapter.kt create mode 100644 FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/recyclerview/itemdecoration/VerticalSpaceMarginItemDecoration.kt create mode 100644 FlowCrypt/src/main/res/drawable/bg_mime_headers.xml create mode 100644 FlowCrypt/src/main/res/layout/item_mime_header.xml diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/ViewExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/ViewExt.kt index 436181ab52..31fd343d32 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/ViewExt.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/ViewExt.kt @@ -23,4 +23,25 @@ fun View.showKeyboard() { fun View.hideKeyboard() { val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager imm.hideSoftInputFromWindow(windowToken, 0) +} + +fun View.gone() { + if (visibility != View.GONE) { + visibility = View.GONE + } +} + + +fun View.visible() { + if (visibility != View.VISIBLE) { + visibility = View.VISIBLE + } +} + +fun View.visibleOrGone(isVisible: Boolean) { + if (isVisible) { + visible() + } else { + gone() + } } \ No newline at end of file diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/javax/mail/internet/InternetAddressExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/javax/mail/internet/InternetAddressExt.kt index a04489e876..41b08c1bcb 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/javax/mail/internet/InternetAddressExt.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/javax/mail/internet/InternetAddressExt.kt @@ -5,6 +5,10 @@ package com.flowcrypt.email.extensions.javax.mail.internet +import android.graphics.Typeface +import android.text.SpannableString +import android.text.Spanned +import android.text.style.StyleSpan import javax.mail.internet.InternetAddress /** @@ -14,4 +18,14 @@ import javax.mail.internet.InternetAddress * E-mail: DenBond7@gmail.com */ val InternetAddress.domain: String - get() = address.substring(address.indexOf('@') + 1) \ No newline at end of file + get() = address.substring(address.indexOf('@') + 1) + +fun InternetAddress.getFormattedString(): CharSequence { + return if (personal.isNullOrEmpty()) { + SpannableString(address) + } else { + SpannableString("$personal <$address>").apply { + setSpan(StyleSpan(Typeface.BOLD), 0, personal.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) + } + } +} \ No newline at end of file diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt index f4ea869700..9b7049e6b8 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt @@ -12,8 +12,9 @@ import android.content.Intent import android.content.pm.PackageManager import android.os.Build import android.os.Bundle +import android.text.SpannableStringBuilder import android.text.TextUtils -import android.text.format.DateFormat +import android.text.format.DateUtils import android.transition.TransitionManager import android.view.LayoutInflater import android.view.Menu @@ -32,6 +33,8 @@ import android.widget.Toast import androidx.appcompat.widget.PopupMenu import androidx.core.content.ContextCompat import androidx.core.content.FileProvider +import androidx.core.text.toSpannable +import androidx.core.view.isVisible import androidx.fragment.app.viewModels import androidx.navigation.fragment.navArgs import androidx.recyclerview.widget.LinearLayoutManager @@ -56,8 +59,10 @@ import com.flowcrypt.email.database.entity.AccountEntity import com.flowcrypt.email.database.entity.MessageEntity import com.flowcrypt.email.extensions.decrementSafely import com.flowcrypt.email.extensions.incrementSafely +import com.flowcrypt.email.extensions.javax.mail.internet.getFormattedString import com.flowcrypt.email.extensions.showTwoWayDialog import com.flowcrypt.email.extensions.toast +import com.flowcrypt.email.extensions.visibleOrGone import com.flowcrypt.email.jetpack.viewmodel.ContactsViewModel import com.flowcrypt.email.jetpack.viewmodel.LabelsViewModel import com.flowcrypt.email.jetpack.viewmodel.MsgDetailsViewModel @@ -75,7 +80,9 @@ import com.flowcrypt.email.ui.activity.fragment.base.ProgressBehaviour import com.flowcrypt.email.ui.activity.fragment.dialog.ChoosePublicKeyDialogFragment import com.flowcrypt.email.ui.activity.fragment.dialog.TwoWayDialogFragment import com.flowcrypt.email.ui.adapter.AttachmentsRecyclerViewAdapter +import com.flowcrypt.email.ui.adapter.MsgDetailsRecyclerViewAdapter import com.flowcrypt.email.ui.adapter.recyclerview.itemdecoration.MarginItemDecoration +import com.flowcrypt.email.ui.adapter.recyclerview.itemdecoration.VerticalSpaceMarginItemDecoration import com.flowcrypt.email.ui.widget.EmailWebView import com.flowcrypt.email.util.DateTimeUtil import com.flowcrypt.email.util.GeneralUtil @@ -88,7 +95,10 @@ import com.google.android.material.snackbar.Snackbar import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException import java.io.File import java.nio.charset.StandardCharsets +import java.util.* import javax.mail.AuthenticationFailedException +import javax.mail.internet.InternetAddress +import kotlin.collections.ArrayList /** * This fragment describe msgEntity of some message. @@ -131,11 +141,13 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi private var textViewSenderAddress: TextView? = null private var textViewDate: TextView? = null private var textViewSubject: TextView? = null + private var tVTo: TextView? = null private var viewFooterOfHeader: View? = null private var layoutMsgParts: ViewGroup? = null private var layoutContent: View? = null private var imageBtnReplyAll: ImageButton? = null private var imageBtnMoreOptions: View? = null + private var iBShowDetails: View? = null private var layoutReplyButton: View? = null private var layoutFwdButton: View? = null private var layoutReplyBtns: View? = null @@ -144,12 +156,13 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi private var textViewActionProgress: TextView? = null private var progressBarActionProgress: ProgressBar? = null private var rVAttachments: RecyclerView? = null + private var rVMsgDetails: RecyclerView? = null - private var dateFormat: java.text.DateFormat? = null private var msgInfo: IncomingMessageInfo? = null private var folderType: FoldersManager.FolderType? = null private val labelsViewModel: LabelsViewModel by viewModels() private val contactsViewModel: ContactsViewModel by viewModels() + private val msgDetailsAdapter = MsgDetailsRecyclerViewAdapter() private var isAdditionalActionEnabled: Boolean = false private var isDeleteActionEnabled: Boolean = false @@ -163,8 +176,6 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setHasOptionsMenu(true) - dateFormat = DateFormat.getTimeFormat(requireContext()) - updateActionsVisibility(args.localFolder, null) } @@ -551,6 +562,7 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi textViewSenderAddress = view.findViewById(R.id.textViewSenderAddress) textViewDate = view.findViewById(R.id.textViewDate) textViewSubject = view.findViewById(R.id.textViewSubject) + tVTo = view.findViewById(R.id.tVTo) viewFooterOfHeader = view.findViewById(R.id.layoutFooterOfHeader) layoutMsgParts = view.findViewById(R.id.layoutMessageParts) layoutReplyBtns = view.findViewById(R.id.layoutReplyButtons) @@ -561,15 +573,27 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi imageBtnReplyAll?.setOnClickListener(this) imageBtnMoreOptions = view.findViewById(R.id.imageButtonMoreOptions) imageBtnMoreOptions?.setOnClickListener(this) + iBShowDetails = view.findViewById(R.id.iBShowDetails) rVAttachments = view.findViewById(R.id.rVAttachments) + rVMsgDetails = view.findViewById(R.id.rVMsgDetails) } private fun updateViews() { - rVAttachments?.layoutManager = LinearLayoutManager(requireContext()) - rVAttachments?.adapter = attachmentsRecyclerViewAdapter - rVAttachments?.addItemDecoration( - MarginItemDecoration(marginBottom = resources.getDimensionPixelSize(R.dimen.default_margin_content_small))) + iBShowDetails?.setOnClickListener { + rVMsgDetails?.visibleOrGone(!(rVMsgDetails?.isVisible ?: false)) + textViewDate?.visibleOrGone(!(rVMsgDetails?.isVisible ?: false)) + } + + updateMsgDetails() + + rVAttachments?.apply { + layoutManager = LinearLayoutManager(context) + addItemDecoration(MarginItemDecoration( + marginBottom = resources.getDimensionPixelSize(R.dimen.default_margin_content_small)) + ) + adapter = attachmentsRecyclerViewAdapter + } val subject = if (TextUtils.isEmpty(args.messageEntity.subject)) getString(R.string.no_subject) else args.messageEntity.subject @@ -581,15 +605,99 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi } textViewSubject?.text = subject if (JavaEmailConstants.FOLDER_OUTBOX.equals(args.messageEntity.folder, ignoreCase = true)) { - textViewDate?.text = DateTimeUtil.formatSameDayTime(context, args.messageEntity.sentDate ?: 0) + textViewDate?.text = + DateTimeUtil.formatSameDayTime(context, args.messageEntity.sentDate ?: 0) } else { - textViewDate?.text = DateTimeUtil.formatSameDayTime(context, args.messageEntity.receivedDate - ?: 0) + textViewDate?.text = + DateTimeUtil.formatSameDayTime(context, args.messageEntity.receivedDate ?: 0) } updateMsgBody() } + private fun updateMsgDetails() { + rVMsgDetails?.apply { + layoutManager = LinearLayoutManager(context) + addItemDecoration(VerticalSpaceMarginItemDecoration( + marginTop = 0, + marginBottom = 0, + marginInternal = resources.getDimensionPixelSize(R.dimen.default_margin_content_small)) + ) + adapter = msgDetailsAdapter + } + + tVTo?.text = prepareToText() + + val headers = mutableListOf() + + headers.add(MsgDetailsRecyclerViewAdapter.Header( + name = getString(R.string.from), + value = formatAddresses(args.messageEntity.from) + )) + + if (args.messageEntity.replyToAddress.isNotEmpty()) { + headers.add(MsgDetailsRecyclerViewAdapter.Header( + name = getString(R.string.reply_to), + value = formatAddresses(args.messageEntity.replyToAddress) + )) + } + + headers.add(MsgDetailsRecyclerViewAdapter.Header( + name = getString(R.string.to), + value = formatAddresses(args.messageEntity.to) + )) + + if (args.messageEntity.cc.isNotEmpty()) { + headers.add(MsgDetailsRecyclerViewAdapter.Header( + name = getString(R.string.cc), + value = formatAddresses(args.messageEntity.cc) + )) + } + + val dateInMilliseconds: Long + if (JavaEmailConstants.FOLDER_OUTBOX.equals(args.messageEntity.folder, ignoreCase = true)) { + dateInMilliseconds = args.messageEntity.sentDate ?: 0 + } else { + dateInMilliseconds = args.messageEntity.receivedDate ?: 0 + } + + val flags = DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_TIME or + DateUtils.FORMAT_SHOW_YEAR + val datetime = DateUtils.formatDateTime(context, dateInMilliseconds, flags) + + headers.add(MsgDetailsRecyclerViewAdapter.Header( + name = getString(R.string.date), + value = datetime + )) + + msgDetailsAdapter.submitList(headers) + } + + private fun prepareToText(): String { + val receiver: String + val currentAccount = account?.email + if (currentAccount != null) { + if (args.messageEntity.toAddress?.contains(currentAccount, true) == true) { + receiver = getString(R.string.to_receiver, getString(R.string.me)) + } else { + receiver = getString(R.string.to_receiver, args.messageEntity.to.firstOrNull()?.address + ?: "") + } + } else { + receiver = getString(R.string.to_receiver, getString(R.string.me)) + } + return receiver + } + + private fun formatAddresses(addresses: List) = + addresses.foldIndexed(SpannableStringBuilder()) { index, builder, it -> + builder.append(it.getFormattedString()) + if (index != addresses.size - 1) { + builder.append("\n") + } + builder + }.toSpannable() + private fun updateMsgView() { val inlineEncryptedAtts = mutableListOf() emailWebView?.loadUrl("about:blank") diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgDetailsRecyclerViewAdapter.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgDetailsRecyclerViewAdapter.kt new file mode 100644 index 0000000000..b7456f0b4a --- /dev/null +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgDetailsRecyclerViewAdapter.kt @@ -0,0 +1,57 @@ +/* + * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com + * Contributors: DenBond7 + */ + +package com.flowcrypt.email.ui.adapter + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.ListAdapter +import androidx.recyclerview.widget.RecyclerView +import com.flowcrypt.email.R + +/** + * @author Denis Bondarenko + * Date: 4/23/21 + * Time: 4:02 PM + * E-mail: DenBond7@gmail.com + */ +class MsgDetailsRecyclerViewAdapter : + ListAdapter(DiffUtilCallBack()) { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { + return ViewHolder( + LayoutInflater.from(parent.context).inflate(R.layout.item_mime_header, parent, false)) + } + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + holder.bindTo(getItem(position)) + } + + inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + private val tVHeaderName: TextView = itemView.findViewById(R.id.tVHeaderName) + private val tVHeaderValue: TextView = itemView.findViewById(R.id.tVHeaderValue) + + fun bindTo(item: Header?) { + tVHeaderName.text = item?.name + tVHeaderValue.text = item?.value + } + } + + data class Header(val name: String, val value: CharSequence) + + class DiffUtilCallBack : DiffUtil.ItemCallback
() { + override fun areItemsTheSame(oldItem: Header, newItem: Header): Boolean { + return oldItem.name == newItem.name + } + + override fun areContentsTheSame(oldItem: Header, newItem: Header): Boolean { + return oldItem.name == newItem.name && oldItem.value.equals(newItem.value) + } + } +} \ No newline at end of file diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/recyclerview/itemdecoration/VerticalSpaceMarginItemDecoration.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/recyclerview/itemdecoration/VerticalSpaceMarginItemDecoration.kt new file mode 100644 index 0000000000..6e671b727e --- /dev/null +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/recyclerview/itemdecoration/VerticalSpaceMarginItemDecoration.kt @@ -0,0 +1,37 @@ +/* + * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com + * Contributors: DenBond7 + */ + +package com.flowcrypt.email.ui.adapter.recyclerview.itemdecoration + +import android.graphics.Rect +import android.view.View +import androidx.recyclerview.widget.RecyclerView + +/** + * @author Denis Bondarenko + * Date: 4/23/21 + * Time: 3:59 PM + * E-mail: DenBond7@gmail.com + */ +class VerticalSpaceMarginItemDecoration( + private val marginTop: Int, + private val marginBottom: Int, + private val marginInternal: Int) : RecyclerView.ItemDecoration() { + override fun getItemOffsets(outRect: Rect, view: View, + parent: RecyclerView, state: RecyclerView.State) { + val position = parent.getChildLayoutPosition(view) + val adapter = parent.adapter + + if (adapter != null && position == adapter.itemCount - 1) { + outRect.bottom = marginBottom + } + + if (position == 0) { + outRect.top = marginTop + } else { + outRect.top = marginInternal + } + } +} \ No newline at end of file diff --git a/FlowCrypt/src/main/res/drawable/bg_mime_headers.xml b/FlowCrypt/src/main/res/drawable/bg_mime_headers.xml new file mode 100644 index 0000000000..f7c88b5356 --- /dev/null +++ b/FlowCrypt/src/main/res/drawable/bg_mime_headers.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/FlowCrypt/src/main/res/layout/fragment_message_details.xml b/FlowCrypt/src/main/res/layout/fragment_message_details.xml index cda4959312..ddd4463543 100644 --- a/FlowCrypt/src/main/res/layout/fragment_message_details.xml +++ b/FlowCrypt/src/main/res/layout/fragment_message_details.xml @@ -26,23 +26,22 @@ android:id="@+id/layoutHeader" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/default_margin_medium" - android:layout_marginTop="@dimen/margin_top_bottom_message" - android:layout_marginRight="@dimen/default_margin_medium"> + android:layout_marginStart="@dimen/default_margin_medium" + android:layout_marginTop="@dimen/default_margin_content" + android:layout_marginEnd="@dimen/default_margin_medium" + android:animateLayoutChanges="true"> @@ -50,12 +49,13 @@ android:id="@+id/imageButtonReplyAll" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="16dp" + android:layout_marginTop="@dimen/default_margin_content_small" + android:layout_marginEnd="@dimen/default_margin_content_small" android:background="?android:attr/selectableItemBackgroundBorderless" android:contentDescription="@string/reply_all" android:visibility="invisible" app:layout_constraintEnd_toStartOf="@+id/imageButtonMoreOptions" - app:layout_constraintTop_toTopOf="parent" + app:layout_constraintTop_toBottomOf="@+id/view" app:layout_goneMarginRight="@dimen/default_margin_medium" app:srcCompat="@mipmap/ic_reply_all_red" tools:visibility="visible" /> @@ -64,11 +64,12 @@ android:id="@+id/imageButtonMoreOptions" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/default_margin_content_small" android:background="?android:attr/selectableItemBackgroundBorderless" android:contentDescription="@string/reply_all" android:visibility="invisible" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" + app:layout_constraintTop_toBottomOf="@+id/view" app:layout_goneMarginRight="@dimen/default_margin_medium" app:srcCompat="@drawable/ic_more_vert_gray_32dp" tools:visibility="visible" /> @@ -77,30 +78,82 @@ android:id="@+id/textViewSubject" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/margin_top_message_subject" - android:layout_marginEnd="@dimen/default_margin_medium" android:ellipsize="end" - android:maxLines="2" - android:textColor="@color/gray" - android:textSize="@dimen/default_text_size_medium" - app:layout_constraintEnd_toStartOf="@+id/textViewDate" - app:layout_constraintHorizontal_bias="0.0" + android:maxLines="5" + android:textAlignment="textStart" + android:textColor="@color/dark" + android:textSize="@dimen/default_text_size_very_big" + android:textStyle="italic" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.487" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textViewSenderAddress" + app:layout_constraintTop_toTopOf="parent" app:layout_goneMarginLeft="@dimen/default_margin_medium" - tools:text="Lorem ipsum subject subject subject subject subject" /> + tools:text="[FlowCrypt/flowcrypt-security] Unlimited unauthenticated file storage via password protected attachments (#126)" /> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FlowCrypt/src/main/res/values/dimens.xml b/FlowCrypt/src/main/res/values/dimens.xml index c726738304..c7dabc96bf 100644 --- a/FlowCrypt/src/main/res/values/dimens.xml +++ b/FlowCrypt/src/main/res/values/dimens.xml @@ -27,8 +27,10 @@ 20dp 40dp + 22sp 18sp 16sp + 14sp 12sp 10sp diff --git a/FlowCrypt/src/main/res/values/strings.xml b/FlowCrypt/src/main/res/values/strings.xml index c09a5ca37a..0962a18ba3 100644 --- a/FlowCrypt/src/main/res/values/strings.xml +++ b/FlowCrypt/src/main/res/values/strings.xml @@ -496,4 +496,10 @@ Stored pass phrase: matched Stored pass phrase: mismatch Could not check the pass phrase + Details + Reply To + To + Cc + Date + To %1$s From 733b7e542ea1723395bfc3faca75d5c9a44cd334 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Mon, 26 Apr 2021 13:09:14 +0300 Subject: [PATCH 02/14] Refactored code.| #1191 --- .../fragment/MessageDetailsFragment.kt | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt index 9b7049e6b8..431cbad832 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt @@ -628,32 +628,41 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi tVTo?.text = prepareToText() - val headers = mutableListOf() + val headers = mutableListOf().apply { + add(MsgDetailsRecyclerViewAdapter.Header( + name = getString(R.string.from), + value = formatAddresses(args.messageEntity.from) + )) - headers.add(MsgDetailsRecyclerViewAdapter.Header( - name = getString(R.string.from), - value = formatAddresses(args.messageEntity.from) - )) + if (args.messageEntity.replyToAddress.isNotEmpty()) { + add(MsgDetailsRecyclerViewAdapter.Header( + name = getString(R.string.reply_to), + value = formatAddresses(args.messageEntity.replyToAddress) + )) + } - if (args.messageEntity.replyToAddress.isNotEmpty()) { - headers.add(MsgDetailsRecyclerViewAdapter.Header( - name = getString(R.string.reply_to), - value = formatAddresses(args.messageEntity.replyToAddress) + add(MsgDetailsRecyclerViewAdapter.Header( + name = getString(R.string.to), + value = formatAddresses(args.messageEntity.to) )) - } - headers.add(MsgDetailsRecyclerViewAdapter.Header( - name = getString(R.string.to), - value = formatAddresses(args.messageEntity.to) - )) + if (args.messageEntity.cc.isNotEmpty()) { + add(MsgDetailsRecyclerViewAdapter.Header( + name = getString(R.string.cc), + value = formatAddresses(args.messageEntity.cc) + )) + } - if (args.messageEntity.cc.isNotEmpty()) { - headers.add(MsgDetailsRecyclerViewAdapter.Header( - name = getString(R.string.cc), - value = formatAddresses(args.messageEntity.cc) + add(MsgDetailsRecyclerViewAdapter.Header( + name = getString(R.string.date), + value = prepareDateHeaderValue() )) } + msgDetailsAdapter.submitList(headers) + } + + private fun prepareDateHeaderValue(): String { val dateInMilliseconds: Long if (JavaEmailConstants.FOLDER_OUTBOX.equals(args.messageEntity.folder, ignoreCase = true)) { dateInMilliseconds = args.messageEntity.sentDate ?: 0 @@ -663,14 +672,7 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi val flags = DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_TIME or DateUtils.FORMAT_SHOW_YEAR - val datetime = DateUtils.formatDateTime(context, dateInMilliseconds, flags) - - headers.add(MsgDetailsRecyclerViewAdapter.Header( - name = getString(R.string.date), - value = datetime - )) - - msgDetailsAdapter.submitList(headers) + return DateUtils.formatDateTime(context, dateInMilliseconds, flags) } private fun prepareToText(): String { From 9e557527d29d7c5c1e3f8858985ad3373a257e1d Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Mon, 26 Apr 2021 16:12:31 +0300 Subject: [PATCH 03/14] Improved displaying 'to' info.| #1191 --- .../javax/mail/internet/InternetAddressExt.kt | 4 +++ .../fragment/MessageDetailsFragment.kt | 34 +++++++++++++------ .../res/layout/fragment_message_details.xml | 8 ++--- FlowCrypt/src/main/res/values/dimens.xml | 1 + 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/javax/mail/internet/InternetAddressExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/javax/mail/internet/InternetAddressExt.kt index 41b08c1bcb..0961f86b23 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/javax/mail/internet/InternetAddressExt.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/javax/mail/internet/InternetAddressExt.kt @@ -28,4 +28,8 @@ fun InternetAddress.getFormattedString(): CharSequence { setSpan(StyleSpan(Typeface.BOLD), 0, personal.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) } } +} + +fun InternetAddress.getPersonalElseEmail(): CharSequence { + return if (personal.isNullOrEmpty()) address else personal } \ No newline at end of file diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt index 431cbad832..19a9b9f025 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt @@ -60,6 +60,7 @@ import com.flowcrypt.email.database.entity.MessageEntity import com.flowcrypt.email.extensions.decrementSafely import com.flowcrypt.email.extensions.incrementSafely import com.flowcrypt.email.extensions.javax.mail.internet.getFormattedString +import com.flowcrypt.email.extensions.javax.mail.internet.getPersonalElseEmail import com.flowcrypt.email.extensions.showTwoWayDialog import com.flowcrypt.email.extensions.toast import com.flowcrypt.email.extensions.visibleOrGone @@ -676,19 +677,30 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi } private fun prepareToText(): String { - val receiver: String - val currentAccount = account?.email - if (currentAccount != null) { - if (args.messageEntity.toAddress?.contains(currentAccount, true) == true) { - receiver = getString(R.string.to_receiver, getString(R.string.me)) - } else { - receiver = getString(R.string.to_receiver, args.messageEntity.to.firstOrNull()?.address - ?: "") - } + val stringBuilder = SpannableStringBuilder() + val meAddress = args.messageEntity.to.firstOrNull { + it.address.equals(args.messageEntity.email, true) + } + val leftAddresses: List + if (meAddress == null) { + leftAddresses = args.messageEntity.to } else { - receiver = getString(R.string.to_receiver, getString(R.string.me)) + stringBuilder.append(getString(R.string.me)) + leftAddresses = ArrayList(args.messageEntity.to) - meAddress + if (leftAddresses.isNotEmpty()) { + stringBuilder.append(", ") + } } - return receiver + + val to = leftAddresses.foldIndexed(stringBuilder) { index, builder, it -> + builder.append(it.getPersonalElseEmail()) + if (index != leftAddresses.size - 1) { + builder.append(",") + } + builder + }.toSpannable() + + return getString(R.string.to_receiver, to) } private fun formatAddresses(addresses: List) = diff --git a/FlowCrypt/src/main/res/layout/fragment_message_details.xml b/FlowCrypt/src/main/res/layout/fragment_message_details.xml index ddd4463543..ed75207183 100644 --- a/FlowCrypt/src/main/res/layout/fragment_message_details.xml +++ b/FlowCrypt/src/main/res/layout/fragment_message_details.xml @@ -132,27 +132,25 @@ android:id="@+id/iBShowDetails" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/default_margin_content_small" android:background="?android:attr/selectableItemBackgroundBorderless" android:contentDescription="@string/details" android:src="@mipmap/ic_arrow_drop_down_grey" app:layout_constraintBottom_toBottomOf="@+id/tVTo" - app:layout_constraintEnd_toStartOf="@+id/imageButtonReplyAll" - app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@+id/tVTo" app:layout_constraintTop_toTopOf="@+id/tVTo" /> + tools:text="To me" /> diff --git a/FlowCrypt/src/main/res/values/dimens.xml b/FlowCrypt/src/main/res/values/dimens.xml index c7dabc96bf..5c0588b083 100644 --- a/FlowCrypt/src/main/res/values/dimens.xml +++ b/FlowCrypt/src/main/res/values/dimens.xml @@ -72,4 +72,5 @@ 48dp 150dp 100dp + 200dp From 0bcd7ae143d477efaaa1d7926349f52497f900f1 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Mon, 26 Apr 2021 16:30:07 +0300 Subject: [PATCH 04/14] Added a restriction to show only first 10 recipients in the message details.| #1191 --- .../ui/activity/fragment/MessageDetailsFragment.kt | 11 ++++++++--- FlowCrypt/src/main/res/values/strings.xml | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt index 19a9b9f025..e4a88707c1 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt @@ -705,9 +705,13 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi private fun formatAddresses(addresses: List) = addresses.foldIndexed(SpannableStringBuilder()) { index, builder, it -> - builder.append(it.getFormattedString()) - if (index != addresses.size - 1) { - builder.append("\n") + if (index < MAX_ALLOWED_RECEPIENTS_IN_HEADER_VALUE) { + builder.append(it.getFormattedString()) + if (index != addresses.size - 1) { + builder.append("\n") + } + } else if (index == MAX_ALLOWED_RECEPIENTS_IN_HEADER_VALUE + 1) { + builder.append(getString(R.string.and_others)) } builder }.toSpannable() @@ -1226,5 +1230,6 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi private const val REQUEST_CODE_SHOW_DIALOG_WITH_SEND_KEY_OPTION = 102 private const val REQUEST_CODE_DELETE_MESSAGE_DIALOG = 103 private const val CONTENT_MAX_ALLOWED_LENGTH = 50000 + private const val MAX_ALLOWED_RECEPIENTS_IN_HEADER_VALUE = 10 } } diff --git a/FlowCrypt/src/main/res/values/strings.xml b/FlowCrypt/src/main/res/values/strings.xml index 0962a18ba3..5544838b7c 100644 --- a/FlowCrypt/src/main/res/values/strings.xml +++ b/FlowCrypt/src/main/res/values/strings.xml @@ -502,4 +502,5 @@ Cc Date To %1$s + and others… From 085863fb3aa5472d0ad0c829934830a6ddd7ecb4 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Mon, 26 Apr 2021 21:35:24 +0300 Subject: [PATCH 05/14] Added some tests.| #1191 --- ..._info_plain_text_single_to_replyto_cc.json | 53 ++++++++++++ ...d_msg_info_plain_text_to_2_recipients.json | 52 ++++++++++++ ...nfo_plain_text_single_to_replyto_to_cc.txt | 48 +++++++++++ ...rd_msg_info_plain_text_to_2_recipients.txt | 47 +++++++++++ .../ui/activity/MessageDetailsActivityTest.kt | 81 +++++++++++++++++++ .../adapter/MsgDetailsRecyclerViewAdapter.kt | 4 +- 6 files changed, 283 insertions(+), 2 deletions(-) create mode 100644 FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plain_text_single_to_replyto_cc.json create mode 100644 FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plain_text_to_2_recipients.json create mode 100644 FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plain_text_single_to_replyto_to_cc.txt create mode 100644 FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plain_text_to_2_recipients.txt diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plain_text_single_to_replyto_cc.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plain_text_single_to_replyto_cc.json new file mode 100644 index 0000000000..2fa751bc79 --- /dev/null +++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plain_text_single_to_replyto_cc.json @@ -0,0 +1,53 @@ +{ + "encryptionType": "STANDARD", + "inlineSubject": "Standard message - plane text", + "msgBlocks": [ + { + "complete": true, + "content": "\n \u003c!DOCTYPE html\u003e\u003chtml\u003e\n \u003chead\u003e\n \u003cmeta name\u003d\"viewport\" content\u003d\"width\u003ddevice-width\" /\u003e\n \u003cstyle\u003e\n body { word-wrap: break-word; word-break: break-word; hyphens: auto; margin-left: 0px; padding-left: 0px; }\n body img { display: inline !important; height: auto !important; max-width: 95% !important; }\n body pre { white-space: pre-wrap !important; }\n body \u003e div.MsgBlock \u003e table { zoom: 75% } /* table layouts tend to overflow - eg emails from fb */\n \u003c/style\u003e\n \u003c/head\u003e\n \u003cbody\u003e\u003cdiv class\u003d\"MsgBlock plain\" style\u003d\"background: white;padding-left: 8px;min-height: 50px;padding-top: 4px;padding-bottom: 4px;width: 100%;border: none;\"\u003e\n\n \n \n \n \u003cpre\u003eIt\u0027s a standard message with plane text\u003c/pre\u003e\u003c/div\u003e\u003c!-- next MsgBlock --\u003e\n\u003c/body\u003e\n \u003c/html\u003e", + "type": "plainHtml" + } + ], + "msgEntity": { + "cc": [ + { + "address": "ccuser@test" + } + ], + "ccAddress": "ccuser@test", + "email": "default@denbond7.com", + "flags": "\\SEEN", + "folder": "INBOX", + "from": [ + { + "address": "denbond7@denbond7.com", + "encodedPersonal": "Denis Bondarenko", + "personal": "Denis Bondarenko" + } + ], + "fromAddress": "Denis Bondarenko \u003cdenbond7@denbond7.com\u003e", + "hasAttachments": false, + "id": 50, + "isSeen": true, + "msgState": "NONE", + "receivedDate": 1601886754000, + "replyTo": "Denis Bondarenko \u003cdenbond7@denbond7.com\u003e", + "replyToAddress": [ + { + "address": "denbond7@denbond7.com", + "encodedPersonal": "Denis Bondarenko" + } + ], + "sentDate": 1601886754000, + "subject": "Standard message - plane text", + "to": [ + { + "address": "default@denbond7.com" + } + ], + "toAddress": "default@denbond7.com", + "uid": 5 + }, + "origMsgHeaders": "Return-Path: \u003cdenbond7@denbond7.com\u003e\r\nDelivered-To: default@denbond7.com\r\nReceived: from mail.denbond7.com\r\n\tby mail.denbond7.com with LMTP\r\n\tid WF4PDSLael+dCQAAZlazJA\r\n\t(envelope-from \u003cdenbond7@denbond7.com\u003e)\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 05 Oct 2020 08:32:34 +0000\r\nReceived: from localhost (localhost [127.0.0.1])\r\n\tby mail.denbond7.com (Postfix) with ESMTP id 347E7A20940\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 5 Oct 2020 08:32:34 +0000 (UTC)\r\nTo: default@denbond7.com\r\nFrom: Denis Bondarenko \u003cdenbond7@denbond7.com\u003e\r\nX-Pep-Version: 2.0\r\nMessage-ID: \u003c8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@denbond7.com\u003e\r\nDate: Mon, 5 Oct 2020 11:32:34 +0300\r\nMime-Version: 1.0\r\nSubject: Standard message - plane text\r\nContent-Type: multipart/alternative;\r\n boundary\u003d\"------------D3F69D95534F587EC1BE35A3\"\r\nContent-Language: en-US", + "text": "It\u0027s a standard message with plane text" +} \ No newline at end of file diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plain_text_to_2_recipients.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plain_text_to_2_recipients.json new file mode 100644 index 0000000000..6d101a6da4 --- /dev/null +++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plain_text_to_2_recipients.json @@ -0,0 +1,52 @@ +{ + "encryptionType": "STANDARD", + "inlineSubject": "Standard message - plane text", + "msgBlocks": [ + { + "complete": true, + "content": "\n \u003c!DOCTYPE html\u003e\u003chtml\u003e\n \u003chead\u003e\n \u003cmeta name\u003d\"viewport\" content\u003d\"width\u003ddevice-width\" /\u003e\n \u003cstyle\u003e\n body { word-wrap: break-word; word-break: break-word; hyphens: auto; margin-left: 0px; padding-left: 0px; }\n body img { display: inline !important; height: auto !important; max-width: 95% !important; }\n body pre { white-space: pre-wrap !important; }\n body \u003e div.MsgBlock \u003e table { zoom: 75% } /* table layouts tend to overflow - eg emails from fb */\n \u003c/style\u003e\n \u003c/head\u003e\n \u003cbody\u003e\u003cdiv class\u003d\"MsgBlock plain\" style\u003d\"background: white;padding-left: 8px;min-height: 50px;padding-top: 4px;padding-bottom: 4px;width: 100%;border: none;\"\u003e\n\n \n \n \n \u003cpre\u003eIt\u0027s a standard message with plane text\u003c/pre\u003e\u003c/div\u003e\u003c!-- next MsgBlock --\u003e\n\u003c/body\u003e\n \u003c/html\u003e", + "type": "plainHtml" + } + ], + "msgEntity": { + "cc": [], + "email": "default@denbond7.com", + "flags": "\\SEEN", + "folder": "INBOX", + "from": [ + { + "address": "denbond7@denbond7.com", + "encodedPersonal": "Denis Bondarenko", + "personal": "Denis Bondarenko" + } + ], + "fromAddress": "Denis Bondarenko \u003cdenbond7@denbond7.com\u003e", + "hasAttachments": false, + "id": 50, + "isSeen": true, + "msgState": "NONE", + "receivedDate": 1601886754000, + "replyTo": "Denis Bondarenko \u003cdenbond7@denbond7.com\u003e", + "replyToAddress": [ + { + "address": "denbond7@denbond7.com", + "encodedPersonal": "Denis Bondarenko" + } + ], + "sentDate": 1601886754000, + "subject": "Standard message - plane text", + "to": [ + { + "address": "default@denbond7.com" + }, + { + "personal": "User", + "address": "user@test" + } + ], + "toAddress": "default@denbond7.com, User ", + "uid": 5 + }, + "origMsgHeaders": "Return-Path: \u003cdenbond7@denbond7.com\u003e\r\nDelivered-To: default@denbond7.com\r\nReceived: from mail.denbond7.com\r\n\tby mail.denbond7.com with LMTP\r\n\tid WF4PDSLael+dCQAAZlazJA\r\n\t(envelope-from \u003cdenbond7@denbond7.com\u003e)\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 05 Oct 2020 08:32:34 +0000\r\nReceived: from localhost (localhost [127.0.0.1])\r\n\tby mail.denbond7.com (Postfix) with ESMTP id 347E7A20940\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 5 Oct 2020 08:32:34 +0000 (UTC)\r\nTo: default@denbond7.com\r\nFrom: Denis Bondarenko \u003cdenbond7@denbond7.com\u003e\r\nX-Pep-Version: 2.0\r\nMessage-ID: \u003c8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@denbond7.com\u003e\r\nDate: Mon, 5 Oct 2020 11:32:34 +0300\r\nMime-Version: 1.0\r\nSubject: Standard message - plane text\r\nContent-Type: multipart/alternative;\r\n boundary\u003d\"------------D3F69D95534F587EC1BE35A3\"\r\nContent-Language: en-US", + "text": "It\u0027s a standard message with plane text" +} \ No newline at end of file diff --git a/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plain_text_single_to_replyto_to_cc.txt b/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plain_text_single_to_replyto_to_cc.txt new file mode 100644 index 0000000000..40080d2251 --- /dev/null +++ b/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plain_text_single_to_replyto_to_cc.txt @@ -0,0 +1,48 @@ +Return-Path: +Delivered-To: default@denbond7.com +Received: from mail.denbond7.com + by mail.denbond7.com with LMTP + id WF4PDSLael+dCQAAZlazJA + (envelope-from ) + for ; Mon, 05 Oct 2020 08:32:34 +0000 +Received: from localhost (localhost [127.0.0.1]) + by mail.denbond7.com (Postfix) with ESMTP id 347E7A20940 + for ; Mon, 5 Oct 2020 08:32:34 +0000 (UTC) +To: default@denbond7.com +Cc: ccuser@test +From: Denis Bondarenko +X-Pep-Version: 2.0 +Message-ID: <8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@denbond7.com> +Date: Mon, 5 Oct 2020 11:32:34 +0300 +Mime-Version: 1.0 +Subject: Standard message - plane text +Content-Type: multipart/alternative; + boundary="------------D3F69D95534F587EC1BE35A3" +Content-Language: en-US + +This is a multi-part message in MIME format. +--------------D3F69D95534F587EC1BE35A3 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: quoted-printable + +It's a standard message with plane text + + +--------------D3F69D95534F587EC1BE35A3 +Content-Type: text/html; charset=utf-8 +Content-Transfer-Encoding: quoted-printable + + + + + + + + 
It's a standard message with plane text=
+
+ + + +--------------D3F69D95534F587EC1BE35A3-- diff --git a/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plain_text_to_2_recipients.txt b/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plain_text_to_2_recipients.txt new file mode 100644 index 0000000000..bc77774043 --- /dev/null +++ b/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plain_text_to_2_recipients.txt @@ -0,0 +1,47 @@ +Return-Path: +Delivered-To: default@denbond7.com +Received: from mail.denbond7.com + by mail.denbond7.com with LMTP + id WF4PDSLael+dCQAAZlazJA + (envelope-from ) + for ; Mon, 05 Oct 2020 08:32:34 +0000 +Received: from localhost (localhost [127.0.0.1]) + by mail.denbond7.com (Postfix) with ESMTP id 347E7A20940 + for ; Mon, 5 Oct 2020 08:32:34 +0000 (UTC) +To: default@denbond7.com, User +From: Denis Bondarenko +X-Pep-Version: 2.0 +Message-ID: <8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@denbond7.com> +Date: Mon, 5 Oct 2020 11:32:34 +0300 +Mime-Version: 1.0 +Subject: Standard message - plane text +Content-Type: multipart/alternative; + boundary="------------D3F69D95534F587EC1BE35A3" +Content-Language: en-US + +This is a multi-part message in MIME format. +--------------D3F69D95534F587EC1BE35A3 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: quoted-printable + +It's a standard message with plane text + + +--------------D3F69D95534F587EC1BE35A3 +Content-Type: text/html; charset=utf-8 +Content-Transfer-Encoding: quoted-printable + + + + + + + + 
It's a standard message with plane text=
+
+ + + +--------------D3F69D95534F587EC1BE35A3-- diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt index 5388d53166..63841f83c0 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt @@ -9,6 +9,7 @@ import android.app.Activity import android.app.Instrumentation import android.content.ComponentName import android.text.format.Formatter +import androidx.recyclerview.widget.RecyclerView import androidx.test.core.app.ActivityScenario import androidx.test.espresso.Espresso.onData import androidx.test.espresso.Espresso.onView @@ -18,9 +19,11 @@ import androidx.test.espresso.IdlingResource import androidx.test.espresso.action.ViewActions.click import androidx.test.espresso.action.ViewActions.scrollTo import androidx.test.espresso.assertion.ViewAssertions.matches +import androidx.test.espresso.contrib.RecyclerViewActions.scrollToHolder import androidx.test.espresso.intent.Intents.intended import androidx.test.espresso.intent.Intents.intending import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent +import androidx.test.espresso.matcher.BoundedMatcher import androidx.test.espresso.matcher.RootMatchers import androidx.test.espresso.matcher.ViewMatchers.assertThat import androidx.test.espresso.matcher.ViewMatchers.isChecked @@ -54,10 +57,13 @@ import com.flowcrypt.email.rules.ClearAppSettingsRule import com.flowcrypt.email.rules.RetryRule import com.flowcrypt.email.rules.ScreenshotTestRule import com.flowcrypt.email.rules.lazyActivityScenarioRule +import com.flowcrypt.email.ui.adapter.MsgDetailsRecyclerViewAdapter import com.flowcrypt.email.util.DateTimeUtil import com.flowcrypt.email.util.GeneralUtil import com.flowcrypt.email.util.PrivateKeysManager import com.flowcrypt.email.util.TestGeneralUtil +import org.hamcrest.Description +import org.hamcrest.Matcher import org.hamcrest.Matchers.anything import org.hamcrest.Matchers.equalTo import org.hamcrest.Matchers.not @@ -153,6 +159,8 @@ class MessageDetailsActivityTest : BaseTest() { fun testStandardMsgPlaneText() { baseCheck(getMsgInfo("messages/info/standard_msg_info_plain_text.json", "messages/mime/standard_msg_info_plain_text.txt")) + onView(withId(R.id.tVTo)) + .check(matches(withText(getResString(R.string.to_receiver, getResString(R.string.me))))) } @Test @@ -341,6 +349,63 @@ class MessageDetailsActivityTest : BaseTest() { "messages/mime/8bit-utf8.txt")) } + @Test + fun testToLabelForTwoRecipients() { + baseCheck(getMsgInfo("messages/info/standard_msg_info_plain_text_to_2_recipients.json", + "messages/mime/standard_msg_info_plain_text_to_2_recipients.txt")) + + val subText = getResString(R.string.me) + ", User" + + onView(withId(R.id.tVTo)) + .check(matches(withText(getResString(R.string.to_receiver, subText)))) + } + + @Test + fun testMsgDetailsSingleToReplyToCC() { + val msgInfo = getMsgInfo("messages/info/standard_msg_info_plain_text_single_to_replyto_cc.json", + "messages/mime/standard_msg_info_plain_text_single_to_replyto_to_cc.txt") + baseCheck(msgInfo) + + onView(withId(R.id.rVMsgDetails)) + .check(matches(not(isDisplayed()))) + onView(withId(R.id.iBShowDetails)) + .perform(scrollTo(), click()) + onView(withId(R.id.rVMsgDetails)) + .check(matches(isDisplayed())) + .check(matches(CustomMatchers.withRecyclerViewItemCount(5))) + + onView(withId(R.id.rVMsgDetails)) + .perform(scrollToHolder( + withHeaderInfo(MsgDetailsRecyclerViewAdapter.Header( + name = getResString(R.string.from), + value = "Denis Bondarenko " + )))) + onView(withId(R.id.rVMsgDetails)) + .perform(scrollToHolder(withHeaderInfo( + MsgDetailsRecyclerViewAdapter.Header( + name = getResString(R.string.reply_to), + value = "Denis Bondarenko " + )))) + onView(withId(R.id.rVMsgDetails)) + .perform(scrollToHolder(withHeaderInfo( + MsgDetailsRecyclerViewAdapter.Header( + name = getResString(R.string.to), + value = "default@denbond7.com" + )))) + onView(withId(R.id.rVMsgDetails)) + .perform(scrollToHolder(withHeaderInfo( + MsgDetailsRecyclerViewAdapter.Header( + name = getResString(R.string.cc), + value = "ccuser@test" + )))) + onView(withId(R.id.rVMsgDetails)) + .perform(scrollToHolder(withHeaderInfo( + MsgDetailsRecyclerViewAdapter.Header( + name = getResString(R.string.date), + value = "October 5, 2020, 11:32 AM" + )))) + } + private fun testMissingKey(incomingMsgInfo: IncomingMessageInfo?) { assertThat(incomingMsgInfo, notNullValue()) @@ -492,4 +557,20 @@ class MessageDetailsActivityTest : BaseTest() { onView(withId(R.id.toolbar)) .check(matches(CustomMatchers.withToolBarText(title))) } + + private fun withHeaderInfo(header: MsgDetailsRecyclerViewAdapter.Header): + Matcher { + return object : BoundedMatcher( + MsgDetailsRecyclerViewAdapter.ViewHolder::class.java) { + override fun matchesSafely(holder: MsgDetailsRecyclerViewAdapter.ViewHolder): Boolean { + return holder.tVHeaderName.text.toString() == header.name + && holder.tVHeaderValue.text.toString() == header.value + } + + override fun describeTo(description: Description) { + description.appendText("with: $header") + } + } + } } diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgDetailsRecyclerViewAdapter.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgDetailsRecyclerViewAdapter.kt index b7456f0b4a..6d27e74a60 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgDetailsRecyclerViewAdapter.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/MsgDetailsRecyclerViewAdapter.kt @@ -34,8 +34,8 @@ class MsgDetailsRecyclerViewAdapter : } inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - private val tVHeaderName: TextView = itemView.findViewById(R.id.tVHeaderName) - private val tVHeaderValue: TextView = itemView.findViewById(R.id.tVHeaderValue) + val tVHeaderName: TextView = itemView.findViewById(R.id.tVHeaderName) + val tVHeaderValue: TextView = itemView.findViewById(R.id.tVHeaderValue) fun bindTo(item: Header?) { tVHeaderName.text = item?.name From 788eb309016abb6db9d3213c1d3e6cb518245ab3 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Tue, 27 Apr 2021 09:02:18 +0300 Subject: [PATCH 06/14] Renamed some test files.| #1191 --- ...ext.json => standard_msg_info_plaintext.json} | 0 ...msg_info_plaintext_single_to_replyto_cc.json} | 0 ...dard_msg_info_plaintext_to_2_recipients.json} | 0 ...tandard_msg_info_plaintext_with_one_att.json} | 0 ..._text.txt => standard_msg_info_plaintext.txt} | 0 ...g_info_plaintext_single_to_replyto_to_cc.txt} | 0 ...ndard_msg_info_plaintext_to_2_recipients.txt} | 0 ...standard_msg_info_plaintext_with_one_att.txt} | 0 .../email/security/KeyStoreCryptoManagerTest.kt | 4 ++-- .../ui/activity/MessageDetailsActivityTest.kt | 16 ++++++++-------- .../javax/mail/internet/InternetAddressExt.kt | 7 +++---- .../activity/fragment/MessageDetailsFragment.kt | 4 ++-- 12 files changed, 15 insertions(+), 16 deletions(-) rename FlowCrypt/src/androidTest/assets/messages/info/{standard_msg_info_plain_text.json => standard_msg_info_plaintext.json} (100%) rename FlowCrypt/src/androidTest/assets/messages/info/{standard_msg_info_plain_text_single_to_replyto_cc.json => standard_msg_info_plaintext_single_to_replyto_cc.json} (100%) rename FlowCrypt/src/androidTest/assets/messages/info/{standard_msg_info_plain_text_to_2_recipients.json => standard_msg_info_plaintext_to_2_recipients.json} (100%) rename FlowCrypt/src/androidTest/assets/messages/info/{standard_msg_info_plain_text_with_one_att.json => standard_msg_info_plaintext_with_one_att.json} (100%) rename FlowCrypt/src/androidTest/assets/messages/mime/{standard_msg_info_plain_text.txt => standard_msg_info_plaintext.txt} (100%) rename FlowCrypt/src/androidTest/assets/messages/mime/{standard_msg_info_plain_text_single_to_replyto_to_cc.txt => standard_msg_info_plaintext_single_to_replyto_to_cc.txt} (100%) rename FlowCrypt/src/androidTest/assets/messages/mime/{standard_msg_info_plain_text_to_2_recipients.txt => standard_msg_info_plaintext_to_2_recipients.txt} (100%) rename FlowCrypt/src/androidTest/assets/messages/mime/{standard_msg_info_plain_text_with_one_att.txt => standard_msg_info_plaintext_with_one_att.txt} (100%) diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plain_text.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext.json similarity index 100% rename from FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plain_text.json rename to FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext.json diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plain_text_single_to_replyto_cc.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_single_to_replyto_cc.json similarity index 100% rename from FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plain_text_single_to_replyto_cc.json rename to FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_single_to_replyto_cc.json diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plain_text_to_2_recipients.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_to_2_recipients.json similarity index 100% rename from FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plain_text_to_2_recipients.json rename to FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_to_2_recipients.json diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plain_text_with_one_att.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_with_one_att.json similarity index 100% rename from FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plain_text_with_one_att.json rename to FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_with_one_att.json diff --git a/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plain_text.txt b/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext.txt similarity index 100% rename from FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plain_text.txt rename to FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext.txt diff --git a/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plain_text_single_to_replyto_to_cc.txt b/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_single_to_replyto_to_cc.txt similarity index 100% rename from FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plain_text_single_to_replyto_to_cc.txt rename to FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_single_to_replyto_to_cc.txt diff --git a/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plain_text_to_2_recipients.txt b/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_to_2_recipients.txt similarity index 100% rename from FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plain_text_to_2_recipients.txt rename to FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_to_2_recipients.txt diff --git a/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plain_text_with_one_att.txt b/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_with_one_att.txt similarity index 100% rename from FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plain_text_with_one_att.txt rename to FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_with_one_att.txt diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/security/KeyStoreCryptoManagerTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/security/KeyStoreCryptoManagerTest.kt index 7a934b8c0e..581da3a24b 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/security/KeyStoreCryptoManagerTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/security/KeyStoreCryptoManagerTest.kt @@ -62,7 +62,7 @@ class KeyStoreCryptoManagerTest { @Test fun testDataAsStream() { val msg = MimeMessage(Session.getInstance(Properties()), InstrumentationRegistry - .getInstrumentation().context.assets.open("messages/mime/standard_msg_info_plain_text.txt")) + .getInstrumentation().context.assets.open("messages/mime/standard_msg_info_plaintext.txt")) val cipherForEncryption = KeyStoreCryptoManager.getCipherForEncryption() val byteArrayOutputStream = ByteArrayOutputStream() @@ -101,7 +101,7 @@ class KeyStoreCryptoManagerTest { @Test fun testDataAsStreamFromCacheManager() { val msg = MimeMessage(Session.getInstance(Properties()), InstrumentationRegistry - .getInstrumentation().context.assets.open("messages/mime/standard_msg_info_plain_text.txt")) + .getInstrumentation().context.assets.open("messages/mime/standard_msg_info_plaintext.txt")) val key = "temp" val editor = MsgsCacheManager.diskLruCache.edit(key) ?: return diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt index 63841f83c0..6a54d5e389 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt @@ -157,16 +157,16 @@ class MessageDetailsActivityTest : BaseTest() { @Test fun testStandardMsgPlaneText() { - baseCheck(getMsgInfo("messages/info/standard_msg_info_plain_text.json", - "messages/mime/standard_msg_info_plain_text.txt")) + baseCheck(getMsgInfo("messages/info/standard_msg_info_plaintext.json", + "messages/mime/standard_msg_info_plaintext.txt")) onView(withId(R.id.tVTo)) .check(matches(withText(getResString(R.string.to_receiver, getResString(R.string.me))))) } @Test fun testStandardMsgPlaneTextWithOneAttachment() { - baseCheckWithAtt(getMsgInfo("messages/info/standard_msg_info_plain_text_with_one_att.json", - "messages/mime/standard_msg_info_plain_text_with_one_att.txt", simpleAttInfo), simpleAttInfo) + baseCheckWithAtt(getMsgInfo("messages/info/standard_msg_info_plaintext_with_one_att.json", + "messages/mime/standard_msg_info_plaintext_with_one_att.txt", simpleAttInfo), simpleAttInfo) } @Test @@ -351,8 +351,8 @@ class MessageDetailsActivityTest : BaseTest() { @Test fun testToLabelForTwoRecipients() { - baseCheck(getMsgInfo("messages/info/standard_msg_info_plain_text_to_2_recipients.json", - "messages/mime/standard_msg_info_plain_text_to_2_recipients.txt")) + baseCheck(getMsgInfo("messages/info/standard_msg_info_plaintext_to_2_recipients.json", + "messages/mime/standard_msg_info_plaintext_to_2_recipients.txt")) val subText = getResString(R.string.me) + ", User" @@ -362,8 +362,8 @@ class MessageDetailsActivityTest : BaseTest() { @Test fun testMsgDetailsSingleToReplyToCC() { - val msgInfo = getMsgInfo("messages/info/standard_msg_info_plain_text_single_to_replyto_cc.json", - "messages/mime/standard_msg_info_plain_text_single_to_replyto_to_cc.txt") + val msgInfo = getMsgInfo("messages/info/standard_msg_info_plaintext_single_to_replyto_cc.json", + "messages/mime/standard_msg_info_plaintext_single_to_replyto_to_cc.txt") baseCheck(msgInfo) onView(withId(R.id.rVMsgDetails)) diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/javax/mail/internet/InternetAddressExt.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/javax/mail/internet/InternetAddressExt.kt index 0961f86b23..616e8d3c7b 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/javax/mail/internet/InternetAddressExt.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/extensions/javax/mail/internet/InternetAddressExt.kt @@ -20,6 +20,9 @@ import javax.mail.internet.InternetAddress val InternetAddress.domain: String get() = address.substring(address.indexOf('@') + 1) +val InternetAddress.personalOrEmail: CharSequence + get() = if (personal.isNullOrEmpty()) address else personal + fun InternetAddress.getFormattedString(): CharSequence { return if (personal.isNullOrEmpty()) { SpannableString(address) @@ -28,8 +31,4 @@ fun InternetAddress.getFormattedString(): CharSequence { setSpan(StyleSpan(Typeface.BOLD), 0, personal.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) } } -} - -fun InternetAddress.getPersonalElseEmail(): CharSequence { - return if (personal.isNullOrEmpty()) address else personal } \ No newline at end of file diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt index e4a88707c1..e2aceb65b3 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.kt @@ -60,7 +60,7 @@ import com.flowcrypt.email.database.entity.MessageEntity import com.flowcrypt.email.extensions.decrementSafely import com.flowcrypt.email.extensions.incrementSafely import com.flowcrypt.email.extensions.javax.mail.internet.getFormattedString -import com.flowcrypt.email.extensions.javax.mail.internet.getPersonalElseEmail +import com.flowcrypt.email.extensions.javax.mail.internet.personalOrEmail import com.flowcrypt.email.extensions.showTwoWayDialog import com.flowcrypt.email.extensions.toast import com.flowcrypt.email.extensions.visibleOrGone @@ -693,7 +693,7 @@ class MessageDetailsFragment : BaseFragment(), ProgressBehaviour, View.OnClickLi } val to = leftAddresses.foldIndexed(stringBuilder) { index, builder, it -> - builder.append(it.getPersonalElseEmail()) + builder.append(it.personalOrEmail) if (index != leftAddresses.size - 1) { builder.append(",") } From e3e8ac67590e4228bab68f758a4ea605c9e5b72b Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Tue, 27 Apr 2021 09:11:07 +0300 Subject: [PATCH 07/14] Renamed 'plane text' to 'plaintext'.| #1191 --- .../info/standard_msg_info_plaintext.json | 10 +++++----- ...sg_info_plaintext_single_to_replyto_cc.json | 10 +++++----- ...ard_msg_info_plaintext_to_2_recipients.json | 10 +++++----- ...andard_msg_info_plaintext_with_one_att.json | 4 ++-- .../mime/standard_msg_info_plaintext.txt | 6 +++--- ..._info_plaintext_single_to_replyto_to_cc.txt | 6 +++--- ...dard_msg_info_plaintext_to_2_recipients.txt | 6 +++--- ...tandard_msg_info_plaintext_with_one_att.txt | 4 ++-- .../ui/activity/MessageDetailsActivityTest.kt | 18 +++++++++--------- .../default/mailboxes/Drafts/dbox-Mails/u.1 | 4 ++-- .../denbond7/mailboxes/Sent/dbox-Mails/u.2 | 6 +++--- .../denbond7/mailboxes/Trash/dbox-Mails/u.1 | 6 +++--- 12 files changed, 45 insertions(+), 45 deletions(-) diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext.json index ecd053d9a9..39a8448c6b 100644 --- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext.json +++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext.json @@ -1,10 +1,10 @@ { "encryptionType": "STANDARD", - "inlineSubject": "Standard message - plane text", + "inlineSubject": "Standard message - plaintext", "msgBlocks": [ { "complete": true, - "content": "\n \u003c!DOCTYPE html\u003e\u003chtml\u003e\n \u003chead\u003e\n \u003cmeta name\u003d\"viewport\" content\u003d\"width\u003ddevice-width\" /\u003e\n \u003cstyle\u003e\n body { word-wrap: break-word; word-break: break-word; hyphens: auto; margin-left: 0px; padding-left: 0px; }\n body img { display: inline !important; height: auto !important; max-width: 95% !important; }\n body pre { white-space: pre-wrap !important; }\n body \u003e div.MsgBlock \u003e table { zoom: 75% } /* table layouts tend to overflow - eg emails from fb */\n \u003c/style\u003e\n \u003c/head\u003e\n \u003cbody\u003e\u003cdiv class\u003d\"MsgBlock plain\" style\u003d\"background: white;padding-left: 8px;min-height: 50px;padding-top: 4px;padding-bottom: 4px;width: 100%;border: none;\"\u003e\n\n \n \n \n \u003cpre\u003eIt\u0027s a standard message with plane text\u003c/pre\u003e\u003c/div\u003e\u003c!-- next MsgBlock --\u003e\n\u003c/body\u003e\n \u003c/html\u003e", + "content": "\n \u003c!DOCTYPE html\u003e\u003chtml\u003e\n \u003chead\u003e\n \u003cmeta name\u003d\"viewport\" content\u003d\"width\u003ddevice-width\" /\u003e\n \u003cstyle\u003e\n body { word-wrap: break-word; word-break: break-word; hyphens: auto; margin-left: 0px; padding-left: 0px; }\n body img { display: inline !important; height: auto !important; max-width: 95% !important; }\n body pre { white-space: pre-wrap !important; }\n body \u003e div.MsgBlock \u003e table { zoom: 75% } /* table layouts tend to overflow - eg emails from fb */\n \u003c/style\u003e\n \u003c/head\u003e\n \u003cbody\u003e\u003cdiv class\u003d\"MsgBlock plain\" style\u003d\"background: white;padding-left: 8px;min-height: 50px;padding-top: 4px;padding-bottom: 4px;width: 100%;border: none;\"\u003e\n\n \n \n \n \u003cpre\u003eIt\u0027s a standard message with plaintext\u003c/pre\u003e\u003c/div\u003e\u003c!-- next MsgBlock --\u003e\n\u003c/body\u003e\n \u003c/html\u003e", "type": "plainHtml" } ], @@ -34,7 +34,7 @@ } ], "sentDate": 1601886754000, - "subject": "Standard message - plane text", + "subject": "Standard message - plaintext", "to": [ { "address": "default@denbond7.com" @@ -43,6 +43,6 @@ "toAddress": "default@denbond7.com", "uid": 5 }, - "origMsgHeaders": "Return-Path: \u003cdenbond7@denbond7.com\u003e\r\nDelivered-To: default@denbond7.com\r\nReceived: from mail.denbond7.com\r\n\tby mail.denbond7.com with LMTP\r\n\tid WF4PDSLael+dCQAAZlazJA\r\n\t(envelope-from \u003cdenbond7@denbond7.com\u003e)\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 05 Oct 2020 08:32:34 +0000\r\nReceived: from localhost (localhost [127.0.0.1])\r\n\tby mail.denbond7.com (Postfix) with ESMTP id 347E7A20940\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 5 Oct 2020 08:32:34 +0000 (UTC)\r\nTo: default@denbond7.com\r\nFrom: Denis Bondarenko \u003cdenbond7@denbond7.com\u003e\r\nX-Pep-Version: 2.0\r\nMessage-ID: \u003c8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@denbond7.com\u003e\r\nDate: Mon, 5 Oct 2020 11:32:34 +0300\r\nMime-Version: 1.0\r\nSubject: Standard message - plane text\r\nContent-Type: multipart/alternative;\r\n boundary\u003d\"------------D3F69D95534F587EC1BE35A3\"\r\nContent-Language: en-US", - "text": "It\u0027s a standard message with plane text" + "origMsgHeaders": "Return-Path: \u003cdenbond7@denbond7.com\u003e\r\nDelivered-To: default@denbond7.com\r\nReceived: from mail.denbond7.com\r\n\tby mail.denbond7.com with LMTP\r\n\tid WF4PDSLael+dCQAAZlazJA\r\n\t(envelope-from \u003cdenbond7@denbond7.com\u003e)\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 05 Oct 2020 08:32:34 +0000\r\nReceived: from localhost (localhost [127.0.0.1])\r\n\tby mail.denbond7.com (Postfix) with ESMTP id 347E7A20940\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 5 Oct 2020 08:32:34 +0000 (UTC)\r\nTo: default@denbond7.com\r\nFrom: Denis Bondarenko \u003cdenbond7@denbond7.com\u003e\r\nX-Pep-Version: 2.0\r\nMessage-ID: \u003c8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@denbond7.com\u003e\r\nDate: Mon, 5 Oct 2020 11:32:34 +0300\r\nMime-Version: 1.0\r\nSubject: Standard message - plaintext\r\nContent-Type: multipart/alternative;\r\n boundary\u003d\"------------D3F69D95534F587EC1BE35A3\"\r\nContent-Language: en-US", + "text": "It\u0027s a standard message with plaintext" } \ No newline at end of file diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_single_to_replyto_cc.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_single_to_replyto_cc.json index 2fa751bc79..1f62c10c96 100644 --- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_single_to_replyto_cc.json +++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_single_to_replyto_cc.json @@ -1,10 +1,10 @@ { "encryptionType": "STANDARD", - "inlineSubject": "Standard message - plane text", + "inlineSubject": "Standard message - plaintext", "msgBlocks": [ { "complete": true, - "content": "\n \u003c!DOCTYPE html\u003e\u003chtml\u003e\n \u003chead\u003e\n \u003cmeta name\u003d\"viewport\" content\u003d\"width\u003ddevice-width\" /\u003e\n \u003cstyle\u003e\n body { word-wrap: break-word; word-break: break-word; hyphens: auto; margin-left: 0px; padding-left: 0px; }\n body img { display: inline !important; height: auto !important; max-width: 95% !important; }\n body pre { white-space: pre-wrap !important; }\n body \u003e div.MsgBlock \u003e table { zoom: 75% } /* table layouts tend to overflow - eg emails from fb */\n \u003c/style\u003e\n \u003c/head\u003e\n \u003cbody\u003e\u003cdiv class\u003d\"MsgBlock plain\" style\u003d\"background: white;padding-left: 8px;min-height: 50px;padding-top: 4px;padding-bottom: 4px;width: 100%;border: none;\"\u003e\n\n \n \n \n \u003cpre\u003eIt\u0027s a standard message with plane text\u003c/pre\u003e\u003c/div\u003e\u003c!-- next MsgBlock --\u003e\n\u003c/body\u003e\n \u003c/html\u003e", + "content": "\n \u003c!DOCTYPE html\u003e\u003chtml\u003e\n \u003chead\u003e\n \u003cmeta name\u003d\"viewport\" content\u003d\"width\u003ddevice-width\" /\u003e\n \u003cstyle\u003e\n body { word-wrap: break-word; word-break: break-word; hyphens: auto; margin-left: 0px; padding-left: 0px; }\n body img { display: inline !important; height: auto !important; max-width: 95% !important; }\n body pre { white-space: pre-wrap !important; }\n body \u003e div.MsgBlock \u003e table { zoom: 75% } /* table layouts tend to overflow - eg emails from fb */\n \u003c/style\u003e\n \u003c/head\u003e\n \u003cbody\u003e\u003cdiv class\u003d\"MsgBlock plain\" style\u003d\"background: white;padding-left: 8px;min-height: 50px;padding-top: 4px;padding-bottom: 4px;width: 100%;border: none;\"\u003e\n\n \n \n \n \u003cpre\u003eIt\u0027s a standard message with plaintext\u003c/pre\u003e\u003c/div\u003e\u003c!-- next MsgBlock --\u003e\n\u003c/body\u003e\n \u003c/html\u003e", "type": "plainHtml" } ], @@ -39,7 +39,7 @@ } ], "sentDate": 1601886754000, - "subject": "Standard message - plane text", + "subject": "Standard message - plaintext", "to": [ { "address": "default@denbond7.com" @@ -48,6 +48,6 @@ "toAddress": "default@denbond7.com", "uid": 5 }, - "origMsgHeaders": "Return-Path: \u003cdenbond7@denbond7.com\u003e\r\nDelivered-To: default@denbond7.com\r\nReceived: from mail.denbond7.com\r\n\tby mail.denbond7.com with LMTP\r\n\tid WF4PDSLael+dCQAAZlazJA\r\n\t(envelope-from \u003cdenbond7@denbond7.com\u003e)\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 05 Oct 2020 08:32:34 +0000\r\nReceived: from localhost (localhost [127.0.0.1])\r\n\tby mail.denbond7.com (Postfix) with ESMTP id 347E7A20940\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 5 Oct 2020 08:32:34 +0000 (UTC)\r\nTo: default@denbond7.com\r\nFrom: Denis Bondarenko \u003cdenbond7@denbond7.com\u003e\r\nX-Pep-Version: 2.0\r\nMessage-ID: \u003c8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@denbond7.com\u003e\r\nDate: Mon, 5 Oct 2020 11:32:34 +0300\r\nMime-Version: 1.0\r\nSubject: Standard message - plane text\r\nContent-Type: multipart/alternative;\r\n boundary\u003d\"------------D3F69D95534F587EC1BE35A3\"\r\nContent-Language: en-US", - "text": "It\u0027s a standard message with plane text" + "origMsgHeaders": "Return-Path: \u003cdenbond7@denbond7.com\u003e\r\nDelivered-To: default@denbond7.com\r\nReceived: from mail.denbond7.com\r\n\tby mail.denbond7.com with LMTP\r\n\tid WF4PDSLael+dCQAAZlazJA\r\n\t(envelope-from \u003cdenbond7@denbond7.com\u003e)\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 05 Oct 2020 08:32:34 +0000\r\nReceived: from localhost (localhost [127.0.0.1])\r\n\tby mail.denbond7.com (Postfix) with ESMTP id 347E7A20940\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 5 Oct 2020 08:32:34 +0000 (UTC)\r\nTo: default@denbond7.com\r\nFrom: Denis Bondarenko \u003cdenbond7@denbond7.com\u003e\r\nX-Pep-Version: 2.0\r\nMessage-ID: \u003c8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@denbond7.com\u003e\r\nDate: Mon, 5 Oct 2020 11:32:34 +0300\r\nMime-Version: 1.0\r\nSubject: Standard message - plaintext\r\nContent-Type: multipart/alternative;\r\n boundary\u003d\"------------D3F69D95534F587EC1BE35A3\"\r\nContent-Language: en-US", + "text": "It\u0027s a standard message with plaintext" } \ No newline at end of file diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_to_2_recipients.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_to_2_recipients.json index 6d101a6da4..b13fd0c0b0 100644 --- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_to_2_recipients.json +++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_to_2_recipients.json @@ -1,10 +1,10 @@ { "encryptionType": "STANDARD", - "inlineSubject": "Standard message - plane text", + "inlineSubject": "Standard message - plaintext", "msgBlocks": [ { "complete": true, - "content": "\n \u003c!DOCTYPE html\u003e\u003chtml\u003e\n \u003chead\u003e\n \u003cmeta name\u003d\"viewport\" content\u003d\"width\u003ddevice-width\" /\u003e\n \u003cstyle\u003e\n body { word-wrap: break-word; word-break: break-word; hyphens: auto; margin-left: 0px; padding-left: 0px; }\n body img { display: inline !important; height: auto !important; max-width: 95% !important; }\n body pre { white-space: pre-wrap !important; }\n body \u003e div.MsgBlock \u003e table { zoom: 75% } /* table layouts tend to overflow - eg emails from fb */\n \u003c/style\u003e\n \u003c/head\u003e\n \u003cbody\u003e\u003cdiv class\u003d\"MsgBlock plain\" style\u003d\"background: white;padding-left: 8px;min-height: 50px;padding-top: 4px;padding-bottom: 4px;width: 100%;border: none;\"\u003e\n\n \n \n \n \u003cpre\u003eIt\u0027s a standard message with plane text\u003c/pre\u003e\u003c/div\u003e\u003c!-- next MsgBlock --\u003e\n\u003c/body\u003e\n \u003c/html\u003e", + "content": "\n \u003c!DOCTYPE html\u003e\u003chtml\u003e\n \u003chead\u003e\n \u003cmeta name\u003d\"viewport\" content\u003d\"width\u003ddevice-width\" /\u003e\n \u003cstyle\u003e\n body { word-wrap: break-word; word-break: break-word; hyphens: auto; margin-left: 0px; padding-left: 0px; }\n body img { display: inline !important; height: auto !important; max-width: 95% !important; }\n body pre { white-space: pre-wrap !important; }\n body \u003e div.MsgBlock \u003e table { zoom: 75% } /* table layouts tend to overflow - eg emails from fb */\n \u003c/style\u003e\n \u003c/head\u003e\n \u003cbody\u003e\u003cdiv class\u003d\"MsgBlock plain\" style\u003d\"background: white;padding-left: 8px;min-height: 50px;padding-top: 4px;padding-bottom: 4px;width: 100%;border: none;\"\u003e\n\n \n \n \n \u003cpre\u003eIt\u0027s a standard message with plaintext\u003c/pre\u003e\u003c/div\u003e\u003c!-- next MsgBlock --\u003e\n\u003c/body\u003e\n \u003c/html\u003e", "type": "plainHtml" } ], @@ -34,7 +34,7 @@ } ], "sentDate": 1601886754000, - "subject": "Standard message - plane text", + "subject": "Standard message - plaintext", "to": [ { "address": "default@denbond7.com" @@ -47,6 +47,6 @@ "toAddress": "default@denbond7.com, User ", "uid": 5 }, - "origMsgHeaders": "Return-Path: \u003cdenbond7@denbond7.com\u003e\r\nDelivered-To: default@denbond7.com\r\nReceived: from mail.denbond7.com\r\n\tby mail.denbond7.com with LMTP\r\n\tid WF4PDSLael+dCQAAZlazJA\r\n\t(envelope-from \u003cdenbond7@denbond7.com\u003e)\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 05 Oct 2020 08:32:34 +0000\r\nReceived: from localhost (localhost [127.0.0.1])\r\n\tby mail.denbond7.com (Postfix) with ESMTP id 347E7A20940\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 5 Oct 2020 08:32:34 +0000 (UTC)\r\nTo: default@denbond7.com\r\nFrom: Denis Bondarenko \u003cdenbond7@denbond7.com\u003e\r\nX-Pep-Version: 2.0\r\nMessage-ID: \u003c8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@denbond7.com\u003e\r\nDate: Mon, 5 Oct 2020 11:32:34 +0300\r\nMime-Version: 1.0\r\nSubject: Standard message - plane text\r\nContent-Type: multipart/alternative;\r\n boundary\u003d\"------------D3F69D95534F587EC1BE35A3\"\r\nContent-Language: en-US", - "text": "It\u0027s a standard message with plane text" + "origMsgHeaders": "Return-Path: \u003cdenbond7@denbond7.com\u003e\r\nDelivered-To: default@denbond7.com\r\nReceived: from mail.denbond7.com\r\n\tby mail.denbond7.com with LMTP\r\n\tid WF4PDSLael+dCQAAZlazJA\r\n\t(envelope-from \u003cdenbond7@denbond7.com\u003e)\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 05 Oct 2020 08:32:34 +0000\r\nReceived: from localhost (localhost [127.0.0.1])\r\n\tby mail.denbond7.com (Postfix) with ESMTP id 347E7A20940\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 5 Oct 2020 08:32:34 +0000 (UTC)\r\nTo: default@denbond7.com\r\nFrom: Denis Bondarenko \u003cdenbond7@denbond7.com\u003e\r\nX-Pep-Version: 2.0\r\nMessage-ID: \u003c8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@denbond7.com\u003e\r\nDate: Mon, 5 Oct 2020 11:32:34 +0300\r\nMime-Version: 1.0\r\nSubject: Standard message - plaintext\r\nContent-Type: multipart/alternative;\r\n boundary\u003d\"------------D3F69D95534F587EC1BE35A3\"\r\nContent-Language: en-US", + "text": "It\u0027s a standard message with plaintext" } \ No newline at end of file diff --git a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_with_one_att.json b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_with_one_att.json index 38e9e37ec0..416088143c 100644 --- a/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_with_one_att.json +++ b/FlowCrypt/src/androidTest/assets/messages/info/standard_msg_info_plaintext_with_one_att.json @@ -4,7 +4,7 @@ "msgBlocks": [ { "complete": true, - "content": "\n \u003c!DOCTYPE html\u003e\u003chtml\u003e\n \u003chead\u003e\n \u003cmeta name\u003d\"viewport\" content\u003d\"width\u003ddevice-width\" /\u003e\n \u003cstyle\u003e\n body { word-wrap: break-word; word-break: break-word; hyphens: auto; margin-left: 0px; padding-left: 0px; }\n body img { display: inline !important; height: auto !important; max-width: 95% !important; }\n body pre { white-space: pre-wrap !important; }\n body \u003e div.MsgBlock \u003e table { zoom: 75% } /* table layouts tend to overflow - eg emails from fb */\n \u003c/style\u003e\n \u003c/head\u003e\n \u003cbody\u003e\u003cdiv class\u003d\"MsgBlock plain\" style\u003d\"background: white;padding-left: 8px;min-height: 50px;padding-top: 4px;padding-bottom: 4px;width: 100%;border: none;\"\u003e\n\n \n \n \n \u003cpre\u003eIt\u0027s a standard message with plane text and one attachment\u003c/pre\u003e\u003c/div\u003e\u003c!-- next MsgBlock --\u003e\n\u003c/body\u003e\n \u003c/html\u003e", + "content": "\n \u003c!DOCTYPE html\u003e\u003chtml\u003e\n \u003chead\u003e\n \u003cmeta name\u003d\"viewport\" content\u003d\"width\u003ddevice-width\" /\u003e\n \u003cstyle\u003e\n body { word-wrap: break-word; word-break: break-word; hyphens: auto; margin-left: 0px; padding-left: 0px; }\n body img { display: inline !important; height: auto !important; max-width: 95% !important; }\n body pre { white-space: pre-wrap !important; }\n body \u003e div.MsgBlock \u003e table { zoom: 75% } /* table layouts tend to overflow - eg emails from fb */\n \u003c/style\u003e\n \u003c/head\u003e\n \u003cbody\u003e\u003cdiv class\u003d\"MsgBlock plain\" style\u003d\"background: white;padding-left: 8px;min-height: 50px;padding-top: 4px;padding-bottom: 4px;width: 100%;border: none;\"\u003e\n\n \n \n \n \u003cpre\u003eIt\u0027s a standard message with plaintext and one attachment\u003c/pre\u003e\u003c/div\u003e\u003c!-- next MsgBlock --\u003e\n\u003c/body\u003e\n \u003c/html\u003e", "type": "plainHtml" } ], @@ -44,5 +44,5 @@ "uid": 6 }, "origMsgHeaders": "Return-Path: \u003cdenbond7@denbond7.com\u003e\r\nDelivered-To: default@denbond7.com\r\nReceived: from mail.denbond7.com\r\n\tby mail.denbond7.com with LMTP\r\n\tid YISlMxbcel9GEwAAZlazJA\r\n\t(envelope-from \u003cdenbond7@denbond7.com\u003e)\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 05 Oct 2020 08:40:54 +0000\r\nReceived: from localhost (localhost [127.0.0.1])\r\n\tby mail.denbond7.com (Postfix) with ESMTP id D03A0A2098A\r\n\tfor \u003cdefault@denbond7.com\u003e; Mon, 5 Oct 2020 08:40:54 +0000 (UTC)\r\nTo: default@denbond7.com\r\nFrom: Denis Bondarenko \u003cdenbond7@denbond7.com\u003e\r\nX-Pep-Version: 2.0\r\nMessage-ID: \u003cfacd4f6d-9e74-977b-3f11-abbe7cd467eb@denbond7.com\u003e\r\nDate: Mon, 5 Oct 2020 11:40:54 +0300\r\nMime-Version: 1.0\r\nSubject: Standard message + one attachment\r\nContent-Type: multipart/mixed;\r\n boundary\u003d\"------------9575DD1DBF2C2FFA08F4568A\"\r\nContent-Language: en-US", - "text": "It\u0027s a standard message with plane text and one attachment" + "text": "It\u0027s a standard message with plaintext and one attachment" } \ No newline at end of file diff --git a/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext.txt b/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext.txt index da57201d08..525711d2fa 100644 --- a/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext.txt +++ b/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext.txt @@ -14,7 +14,7 @@ X-Pep-Version: 2.0 Message-ID: <8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@denbond7.com> Date: Mon, 5 Oct 2020 11:32:34 +0300 Mime-Version: 1.0 -Subject: Standard message - plane text +Subject: Standard message - plaintext Content-Type: multipart/alternative; boundary="------------D3F69D95534F587EC1BE35A3" Content-Language: en-US @@ -24,7 +24,7 @@ This is a multi-part message in MIME format. Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable -It's a standard message with plane text +It's a standard message with plaintext --------------D3F69D95534F587EC1BE35A3 @@ -39,7 +39,7 @@ Content-Transfer-Encoding: quoted-printable 
It's a standard message with plane text=
+aVu Sans Mono';font-size:12.0pt;">It's a standard message with plaintext=
diff --git a/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_single_to_replyto_to_cc.txt b/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_single_to_replyto_to_cc.txt index 40080d2251..4ea3ea2473 100644 --- a/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_single_to_replyto_to_cc.txt +++ b/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_single_to_replyto_to_cc.txt @@ -15,7 +15,7 @@ X-Pep-Version: 2.0 Message-ID: <8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@denbond7.com> Date: Mon, 5 Oct 2020 11:32:34 +0300 Mime-Version: 1.0 -Subject: Standard message - plane text +Subject: Standard message - plaintext Content-Type: multipart/alternative; boundary="------------D3F69D95534F587EC1BE35A3" Content-Language: en-US @@ -25,7 +25,7 @@ This is a multi-part message in MIME format. Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable -It's a standard message with plane text +It's a standard message with plaintext --------------D3F69D95534F587EC1BE35A3 @@ -40,7 +40,7 @@ Content-Transfer-Encoding: quoted-printable 
It's a standard message with plane text=
+aVu Sans Mono';font-size:12.0pt;">It's a standard message with plaintext=
diff --git a/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_to_2_recipients.txt b/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_to_2_recipients.txt index bc77774043..751ca0a7f5 100644 --- a/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_to_2_recipients.txt +++ b/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_to_2_recipients.txt @@ -14,7 +14,7 @@ X-Pep-Version: 2.0 Message-ID: <8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@denbond7.com> Date: Mon, 5 Oct 2020 11:32:34 +0300 Mime-Version: 1.0 -Subject: Standard message - plane text +Subject: Standard message - plaintext Content-Type: multipart/alternative; boundary="------------D3F69D95534F587EC1BE35A3" Content-Language: en-US @@ -24,7 +24,7 @@ This is a multi-part message in MIME format. Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable -It's a standard message with plane text +It's a standard message with plaintext --------------D3F69D95534F587EC1BE35A3 @@ -39,7 +39,7 @@ Content-Transfer-Encoding: quoted-printable 
It's a standard message with plane text=
+aVu Sans Mono';font-size:12.0pt;">It's a standard message with plaintext=
diff --git a/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_with_one_att.txt b/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_with_one_att.txt index 10333c8335..78750672d4 100644 --- a/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_with_one_att.txt +++ b/FlowCrypt/src/androidTest/assets/messages/mime/standard_msg_info_plaintext_with_one_att.txt @@ -29,7 +29,7 @@ Content-Type: multipart/alternative; Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable -It's a standard message with plane text and one attachment +It's a standard message with plaintext and one attachment --------------9BD0A609717171AC93BCB3E4 @@ -44,7 +44,7 @@ Content-Transfer-Encoding: quoted-printable 
It's a standard message with plane text=
+aVu Sans Mono';font-size:12.0pt;">It's a standard message with plaintext=
  and one attachment
diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt index 6a54d5e389..cf38b142ad 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt @@ -120,7 +120,7 @@ class MessageDetailsActivityTest : BaseTest() { @Test fun testReplyButton() { - testStandardMsgPlaneText() + testStandardMsgPlaintext() onView(withId(R.id.layoutReplyButton)) .check(matches(isDisplayed())) .perform(scrollTo(), click()) @@ -134,7 +134,7 @@ class MessageDetailsActivityTest : BaseTest() { @Test fun testReplyAllButton() { - testStandardMsgPlaneText() + testStandardMsgPlaintext() onView(withId(R.id.layoutReplyAllButton)) .check(matches(isDisplayed())) .perform(scrollTo(), click()) @@ -143,7 +143,7 @@ class MessageDetailsActivityTest : BaseTest() { @Test fun testFwdButton() { - testStandardMsgPlaneText() + testStandardMsgPlaintext() onView(withId(R.id.layoutFwdButton)) .check(matches(isDisplayed())) .perform(scrollTo(), click()) @@ -156,7 +156,7 @@ class MessageDetailsActivityTest : BaseTest() { } @Test - fun testStandardMsgPlaneText() { + fun testStandardMsgPlaintext() { baseCheck(getMsgInfo("messages/info/standard_msg_info_plaintext.json", "messages/mime/standard_msg_info_plaintext.txt")) onView(withId(R.id.tVTo)) @@ -164,13 +164,13 @@ class MessageDetailsActivityTest : BaseTest() { } @Test - fun testStandardMsgPlaneTextWithOneAttachment() { + fun testStandardMsgplaintextWithOneAttachment() { baseCheckWithAtt(getMsgInfo("messages/info/standard_msg_info_plaintext_with_one_att.json", "messages/mime/standard_msg_info_plaintext_with_one_att.txt", simpleAttInfo), simpleAttInfo) } @Test - fun testEncryptedMsgPlaneText() { + fun testEncryptedMsgplaintext() { baseCheck(getMsgInfo("messages/info/encrypted_msg_info_plain_text.json", "messages/mime/encrypted_msg_info_plain_text.txt")) } @@ -297,14 +297,14 @@ class MessageDetailsActivityTest : BaseTest() { } @Test - fun testEncryptedMsgPlaneTextWithOneAttachment() { + fun testEncryptedMsgplaintextWithOneAttachment() { val msgInfo = getMsgInfo("messages/info/encrypted_msg_info_plain_text_with_one_att.json", "messages/mime/encrypted_msg_info_plain_text_with_one_att.txt", encryptedAttInfo) baseCheckWithAtt(msgInfo, encryptedAttInfo) } @Test - fun testEncryptedMsgPlaneTextWithPubKey() { + fun testEncryptedMsgplaintextWithPubKey() { val msgInfo = getMsgInfo("messages/info/encrypted_msg_info_plain_text_with_pub_key.json", "messages/mime/encrypted_msg_info_plain_text_with_pub_key.txt", pubKeyAttInfo) baseCheckWithAtt(msgInfo, pubKeyAttInfo) @@ -542,7 +542,7 @@ class MessageDetailsActivityTest : BaseTest() { } private fun testTopReplyAction(title: String) { - testStandardMsgPlaneText() + testStandardMsgPlaintext() onView(withId(R.id.imageButtonMoreOptions)) .check(matches(isDisplayed())) diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Drafts/dbox-Mails/u.1 b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Drafts/dbox-Mails/u.1 index 8d4e2acb57..a5bd52e2c0 100644 --- a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Drafts/dbox-Mails/u.1 +++ b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Drafts/dbox-Mails/u.1 @@ -5,7 +5,7 @@ X-Identity-Key: id3 X-Account-Key: account16 To: Denis Bondarenko From: Default -Subject: Standard message - plane text +Subject: Standard message - plaintext Message-ID: <6687977f-9bf3-c937-953e-5e6fc332ddf7@denbond7.com> Date: Mon, 5 Oct 2020 11:26:04 +0300 X-Mozilla-Draft-Info: internal/draft; vcard=0; receipt=0; DSN=0; uuencode=0; @@ -23,7 +23,7 @@ Content-Transfer-Encoding: 7bit - 
It's a standard message with plane text=20
+ 
It's a standard message with plaintext=20
diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.2 b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.2 index 9091cce1b9..c41afbc3bf 100644 --- a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.2 +++ b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.2 @@ -8,7 +8,7 @@ Date: Mon, 5 Oct 2020 11:32:34 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 -Subject: Standard message - plane text +Subject: Standard message - plaintext Content-Type: multipart/alternative; boundary="------------D3F69D95534F587EC1BE35A3" Content-Language: en-US @@ -18,7 +18,7 @@ This is a multi-part message in MIME format. Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable -It's a standard message with plane text +It's a standard message with plaintext --------------D3F69D95534F587EC1BE35A3 @@ -33,7 +33,7 @@ Content-Transfer-Encoding: quoted-printable 
It's a standard message with plane text=
+aVu Sans Mono';font-size:12.0pt;">It's a standard message with plaintext=
diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.1 b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.1 index c88ef677a9..e6011351f5 100644 --- a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.1 +++ b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.1 @@ -16,7 +16,7 @@ X-Pep-Version: 2.0 Message-ID: Date: Mon, 5 Oct 2020 11:28:22 +0300 Mime-Version: 1.0 -Subject: Standard message - plane text +Subject: Standard message - plaintext Content-Type: multipart/alternative; boundary="------------122DE5599D10BFBCB913B469" Content-Language: en-US @@ -26,7 +26,7 @@ This is a multi-part message in MIME format. Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable -It's a standard message with plane text +It's a standard message with plaintext --------------122DE5599D10BFBCB913B469 @@ -41,7 +41,7 @@ Content-Transfer-Encoding: quoted-printable 
It's a standard message with plane text=
+aVu Sans Mono';font-size:12.0pt;">It's a standard message with plaintext=
From 0756e35dd0e38944d8ddfb0ec3d12237e8d676eb Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Tue, 27 Apr 2021 09:23:26 +0300 Subject: [PATCH 08/14] Added versions support for 'flowcrypt-email-server'.| #1151 --- docker-mailserver/build_docker_image_and_push.sh | 11 +++++++++-- docker-mailserver/docker-compose.yml | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/docker-mailserver/build_docker_image_and_push.sh b/docker-mailserver/build_docker_image_and_push.sh index b559267097..9b054b8bc1 100755 --- a/docker-mailserver/build_docker_image_and_push.sh +++ b/docker-mailserver/build_docker_image_and_push.sh @@ -2,5 +2,12 @@ # build docker image -docker build -t flowcrypt/flowcrypt-email-server . -docker push flowcrypt/flowcrypt-email-server \ No newline at end of file +if [ $# -eq 0 ] + then + tag='latest' + else + tag=$1 +fi + +docker build -t flowcrypt/flowcrypt-email-server:$tag . +docker push flowcrypt/flowcrypt-email-server:$tag \ No newline at end of file diff --git a/docker-mailserver/docker-compose.yml b/docker-mailserver/docker-compose.yml index 7857624c12..13ffb1a5e4 100644 --- a/docker-mailserver/docker-compose.yml +++ b/docker-mailserver/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: mail: - image: flowcrypt/flowcrypt-email-server:latest + image: flowcrypt/flowcrypt-email-server:0.0.1 hostname: ${HOSTNAME} domainname: ${DOMAINNAME} container_name: ${CONTAINER_NAME} From 9ab9fe0a72f90a37073faf7d2acf344f4b8884c9 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Tue, 27 Apr 2021 10:50:43 +0300 Subject: [PATCH 09/14] Reverted back changes in docker-mailserver/maildata_source.| #1191 --- .../denbond7.com/default/mailboxes/Drafts/dbox-Mails/u.1 | 4 ++-- .../denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.2 | 6 +++--- .../denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.1 | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Drafts/dbox-Mails/u.1 b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Drafts/dbox-Mails/u.1 index a5bd52e2c0..8d4e2acb57 100644 --- a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Drafts/dbox-Mails/u.1 +++ b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Drafts/dbox-Mails/u.1 @@ -5,7 +5,7 @@ X-Identity-Key: id3 X-Account-Key: account16 To: Denis Bondarenko From: Default -Subject: Standard message - plaintext +Subject: Standard message - plane text Message-ID: <6687977f-9bf3-c937-953e-5e6fc332ddf7@denbond7.com> Date: Mon, 5 Oct 2020 11:26:04 +0300 X-Mozilla-Draft-Info: internal/draft; vcard=0; receipt=0; DSN=0; uuencode=0; @@ -23,7 +23,7 @@ Content-Transfer-Encoding: 7bit - 
It's a standard message with plaintext=20
+ 
It's a standard message with plane text=20
diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.2 b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.2 index c41afbc3bf..9091cce1b9 100644 --- a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.2 +++ b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.2 @@ -8,7 +8,7 @@ Date: Mon, 5 Oct 2020 11:32:34 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 -Subject: Standard message - plaintext +Subject: Standard message - plane text Content-Type: multipart/alternative; boundary="------------D3F69D95534F587EC1BE35A3" Content-Language: en-US @@ -18,7 +18,7 @@ This is a multi-part message in MIME format. Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable -It's a standard message with plaintext +It's a standard message with plane text --------------D3F69D95534F587EC1BE35A3 @@ -33,7 +33,7 @@ Content-Transfer-Encoding: quoted-printable 
It's a standard message with plaintext=
+aVu Sans Mono';font-size:12.0pt;">It's a standard message with plane text=
diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.1 b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.1 index e6011351f5..c88ef677a9 100644 --- a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.1 +++ b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.1 @@ -16,7 +16,7 @@ X-Pep-Version: 2.0 Message-ID: Date: Mon, 5 Oct 2020 11:28:22 +0300 Mime-Version: 1.0 -Subject: Standard message - plaintext +Subject: Standard message - plane text Content-Type: multipart/alternative; boundary="------------122DE5599D10BFBCB913B469" Content-Language: en-US @@ -26,7 +26,7 @@ This is a multi-part message in MIME format. Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable -It's a standard message with plaintext +It's a standard message with plane text --------------122DE5599D10BFBCB913B469 @@ -41,7 +41,7 @@ Content-Transfer-Encoding: quoted-printable 
It's a standard message with plaintext=
+aVu Sans Mono';font-size:12.0pt;">It's a standard message with plane text=
From 6ca2ec5806431de5880f337372baee345259c9ea Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Tue, 27 Apr 2021 11:19:41 +0300 Subject: [PATCH 10/14] Update docker-mailserver data.| #1191 --- .../android/dovecot.list.index.log | Bin 3644 -> 4656 bytes .../Drafts/dbox-Mails/dovecot.index.log | Bin 228 -> 380 bytes .../INBOX/dbox-Mails/dovecot.index.log | Bin 288 -> 368 bytes .../Junk/dbox-Mails/dovecot.index.log | Bin 228 -> 380 bytes .../Sent/dbox-Mails/dovecot.index.cache | Bin 444 -> 108 bytes .../Sent/dbox-Mails/dovecot.index.log | Bin 652 -> 888 bytes .../Trash/dbox-Mails/dovecot.index.cache | Bin 416 -> 88 bytes .../Trash/dbox-Mails/dovecot.index.log | Bin 624 -> 820 bytes .../default/dovecot.list.index.log | Bin 4764 -> 7204 bytes .../Drafts/dbox-Mails/dovecot.index.cache | Bin 1008 -> 1844 bytes .../Drafts/dbox-Mails/dovecot.index.log | Bin 760 -> 1008 bytes .../default/mailboxes/Drafts/dbox-Mails/u.1 | 34 ---- .../INBOX/dbox-Mails/dovecot.index.cache | Bin 18268 -> 23308 bytes .../INBOX/dbox-Mails/dovecot.index.log | Bin 2480 -> 3784 bytes .../default/mailboxes/INBOX/dbox-Mails/u.26 | 180 ------------------ .../default/mailboxes/INBOX/dbox-Mails/u.27 | 119 ------------ .../default/mailboxes/INBOX/dbox-Mails/u.28 | 118 ------------ .../mailboxes/INBOX/dbox-Mails/{u.6 => u.29} | 56 +++--- .../default/mailboxes/INBOX/dbox-Mails/u.30 | 51 +++++ .../default/mailboxes/INBOX/dbox-Mails/u.5 | 55 ------ .../Trash/dbox-Mails/dovecot.index.cache | Bin 1132 -> 9376 bytes .../Trash/dbox-Mails/dovecot.index.log | Bin 1096 -> 2868 bytes .../default/mailboxes/Trash/dbox-Mails/u.10 | 94 --------- .../default/mailboxes/Trash/dbox-Mails/u.5 | 47 ----- .../default/mailboxes/Trash/dbox-Mails/u.6 | 131 ------------- .../default/mailboxes/Trash/dbox-Mails/u.7 | 47 ----- .../default/mailboxes/Trash/dbox-Mails/u.8 | 94 --------- .../default/mailboxes/Trash/dbox-Mails/u.9 | 59 ------ .../denbond7/dovecot.list.index.log | Bin 3760 -> 7532 bytes .../Drafts/dbox-Mails/dovecot.index.log | Bin 228 -> 380 bytes .../INBOX/dbox-Mails/dovecot.index.cache | Bin 416 -> 88 bytes .../INBOX/dbox-Mails/dovecot.index.log | Bin 612 -> 808 bytes .../Junk/dbox-Mails/dovecot.index.log | Bin 228 -> 380 bytes .../Sent/dbox-Mails/dovecot.index.cache | Bin 864 -> 2384 bytes .../Sent/dbox-Mails/dovecot.index.log | Bin 1072 -> 2364 bytes .../denbond7/mailboxes/Sent/dbox-Mails/u.2 | 47 ----- .../mailboxes/Sent/dbox-Mails/{u.3 => u.22} | 52 +++-- .../denbond7/mailboxes/Sent/dbox-Mails/u.23 | 43 +++++ .../Trash/dbox-Mails/dovecot.index.cache | Bin 584 -> 1844 bytes .../Trash/dbox-Mails/dovecot.index.log | Bin 792 -> 2260 bytes .../denbond7/mailboxes/Trash/dbox-Mails/u.1 | 55 ------ .../denbond7/mailboxes/Trash/dbox-Mails/u.2 | 123 ------------ .../denbond7/mailboxes/Trash/dbox-Mails/u.3 | 38 ---- .../denbond7/mailboxes/Trash/dbox-Mails/u.4 | 44 ----- .../denbond7/mailboxes/Trash/dbox-Mails/u.5 | 85 --------- .../denbond7/mailboxes/Trash/dbox-Mails/u.6 | 85 --------- .../denbond7/mailboxes/Trash/dbox-Mails/u.7 | 44 ----- 47 files changed, 144 insertions(+), 1557 deletions(-) delete mode 100644 docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Drafts/dbox-Mails/u.1 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.26 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.27 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.28 rename docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/{u.6 => u.29} (76%) create mode 100644 docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.30 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.5 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.10 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.5 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.6 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.7 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.8 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.9 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.2 rename docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/{u.3 => u.22} (77%) create mode 100644 docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.23 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.1 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.2 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.3 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.4 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.5 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.6 delete mode 100644 docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.7 diff --git a/docker-mailserver/maildata_source/denbond7.com/android/dovecot.list.index.log b/docker-mailserver/maildata_source/denbond7.com/android/dovecot.list.index.log index 20a50a37e2ab015047d6c69e3bf821392f9e8bf9..e8079c08f7a0aaa147f5c6bf18da5f6bfce01643 100644 GIT binary patch delta 563 zcmdlZvq5Ep4IgJiLqjtI1BZak+CjdoT6c`u;92i&_I`|kEkX5Ox zvM?|(^k7kW1zqLj39KBl=;kT#qnpPFH17!zqpQq8Qdu+kEu*-m00RdDBLgc#S#f4n zDo_W|UF{4^3<9h`_5%vPWiv4IcmuVFITB diff --git a/docker-mailserver/maildata_source/denbond7.com/android/mailboxes/Drafts/dbox-Mails/dovecot.index.log b/docker-mailserver/maildata_source/denbond7.com/android/mailboxes/Drafts/dbox-Mails/dovecot.index.log index 4bc738c25b3703245cb65cee76a0ec40eebac7d4..afd5953ddf579e0bbc8baba42d8eff19f72caf6e 100644 GIT binary patch delta 160 zcmaFD_=jo2llq2+hGqr^4uJp$1_mIz%YlJG;6D%mxeNjzf`Nm9k%5yTBc({UtT?kO z6(|B!*A5f}N<&nDl|c!h9N0V$h`MeEAPqB*1*(RTffsCEL4JXxv2JN*N)AME3(!y? HfG7h1Cz2v0 delta 6 Ncmeyv^n`K3695a316Tk6 diff --git a/docker-mailserver/maildata_source/denbond7.com/android/mailboxes/INBOX/dbox-Mails/dovecot.index.log b/docker-mailserver/maildata_source/denbond7.com/android/mailboxes/INBOX/dbox-Mails/dovecot.index.log index 8bc7492965c9a685926ad03acdc972705f367335..400896b341fa53dc373edced3aba890e32a7ee03 100644 GIT binary patch delta 88 zcmZ3$^nq!E0%Jf!LqjtI1BXBW0|Nt)-Q~c*An+dufLsOv5W&E~z{tSKkdacPTUMM| Ul?oIAs%r-d0;M4;z{;Qm0Otr1T>t<8 delta 7 Ocmeysw18=Y0wVwn90Fzl diff --git a/docker-mailserver/maildata_source/denbond7.com/android/mailboxes/Junk/dbox-Mails/dovecot.index.log b/docker-mailserver/maildata_source/denbond7.com/android/mailboxes/Junk/dbox-Mails/dovecot.index.log index eddc03714265c07fa70762fda70558b546e9c66d..b19cf4e67145c8f7f0360c7cc9239839a20c8089 100644 GIT binary patch delta 160 zcmaFD_=jo2llq2+hGqr^4uJp$1_mIz%YlJG;6D%mxeNjzf`Nm9k%5yTBc({UtT?kO z6(|B!*A5f}N<&nDl|c!h9N0V$h`MeEAPqB*1*(RTffsCEL4JXxv2JN*N)AME3(!y? HfG7h1Cz2v0 delta 6 Ncmeyv^n`K3695a316Tk6 diff --git a/docker-mailserver/maildata_source/denbond7.com/android/mailboxes/Sent/dbox-Mails/dovecot.index.cache b/docker-mailserver/maildata_source/denbond7.com/android/mailboxes/Sent/dbox-Mails/dovecot.index.cache index 0e5b8cef02419b58c9d59348948d79a90feb6eef..5c44cd4d7b2a01403f2bf8e45b639891e7557396 100644 GIT binary patch literal 108 zcmZSNU}WIERhPgA#0)^d1jIQY1`sqfG)w}~A|L_?<}*TQ5D61|z={x41~NfPI*+y| WaDapvi!-ZI^~y4fN=g%fh5`WUa}N~& literal 444 zcmah`OG*SW5Uq?O%tr74v+xAjcm;PJLergcrl3Eel5S`b>4gh#G3T0Dc@wQN9faQa z;PF2BP$6b#;O6rFtOUVE_+ium%=7%IT1mbYJwLuZX)Y*dO8!r`vSBAwEnf5Y3c9wc ze&dz&GNAxA#+a>+show1m&P3;c$d&d>{51&HPVQF>D`DB=@soroCeqA5ROx%S`xJ` z*sAx_pNolyIt`4u!fwQ-4+x0A+y*pV0Azsz5Q7Xf0b-CLK)!$j(9j5=AdGJSVQ`ZN zPw%4-BeOE_^!@Rw1c4EL>LQru`AfBu{4Dyrd*5p=D0fQ!PnU9FB~&e5^WPnG@2p^ez3>=i>Tpb8!auyK*Q1 diff --git a/docker-mailserver/maildata_source/denbond7.com/android/mailboxes/Trash/dbox-Mails/dovecot.index.log b/docker-mailserver/maildata_source/denbond7.com/android/mailboxes/Trash/dbox-Mails/dovecot.index.log index 13a5c9c704298f33f4d4d09c0b3077e895cfddd4..2da3ac9c10420cfc7292604e9367827aee29307d 100644 GIT binary patch delta 151 zcmeysvW0C!0aHLjLqjtI1BXBW0|Nt)-Q~c*An+dufLsOv5W&E~z{tSKkdacPTUMM| zl?oIAs%r-d0;L5Q9td?kSs{O1CY-QWb;ja$S5W$ W08*|1#6YPQAT8j)z`|exlm`Hal^(YM delta 7 OcmdnO_JL(X0TTcW$pX;; diff --git a/docker-mailserver/maildata_source/denbond7.com/default/dovecot.list.index.log b/docker-mailserver/maildata_source/denbond7.com/default/dovecot.list.index.log index 9b904564629b67ceaeb55401f31bd16878d5cc6d..f2565a3ffabe06cd030528cf74245dbd352c9244 100644 GIT binary patch delta 824 zcmZuvJx{_=6uoGRVCe^6<--n;XfT1q#1QDfpt}R?#9+cmi2edeG+|Y5OdK$Aa5Ba) zI50S&KLIxf+!!2mGseODE+A>4N&DKqd+xdCoY&d7wY!}V{;GM^4*=5S*6>Tqdct_F zZ<#~-`Py&STCLV;3c%Q*s&W|j11463R!}BL^N1dFDRi&kyPh@c^xF*@gt2LCV>jpv z-Sv+h{ZbL$I+LY~kTkd35W5BQdkMe|>_r@dTwe1Wpwi+OgQQ0b1}Q}WNX-d=&v?UK zrHCI&P8Qk$)1fRj6d%^*9Nrj``MC@*a;e`m@j)y68zyiXlMTE8-siSM+P&!{%ivIx z)Tz;9ESW7w#4A>U8Fth<5TC$8B<^kd=6heoX1yC6SyV)p-lJN>HAf^qs}-Wf9EOL3 zmTAN>H(LIHN9EXSbROJ2Ab~$>L8Tn{605sAX%C=GcTdn{c?G)?S;{&P-qpazfCE0N4aw^oZx_M7#Oc GEr36{kGcu~ delta 7 OcmZ2tF-LX793cP<%>w)Y diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Drafts/dbox-Mails/dovecot.index.cache b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Drafts/dbox-Mails/dovecot.index.cache index 80dd7ff5a5dbcf6025e9ae82971a70dc9748eaf1..b45c4078d73c8e0064ed66e840fe4494fc2a1ffb 100644 GIT binary patch delta 617 zcmeyszJ*Vck%N&z@m5^|2s1H2fC)PT1LH=?c1D(lhQ>demoWM;)q`Z@fC?mm^y5SA z2_QZ)jm!qg!N3ckT9_P248$e|vjEj{05OOL;)&IUlO32?2w-t}7BFCB074*Y0BQyT zMmU&wX4_;1W|{holp;N+gKU9R*Vb|Kt({BLgD?1w%tCBQq-l z6NP$h17iaNE}%kTuyO_l5hyJRrNw}>2M_~e0t^tYu~M)xGqW(aG&fJvwMU0PVdAfB*mh diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Drafts/dbox-Mails/dovecot.index.log b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Drafts/dbox-Mails/dovecot.index.log index 5ec2c66f0dbd26d21f407033b5abee7ae1e2c97a..1b56f38eb9a1fb2063dce6f740215790748d9640 100644 GIT binary patch delta 184 zcmeyt`hk7J4<^orhK6Pa1`dIo$(2mnjsk293_y`i2L=X)|3Cnwz<`B;g@KWQm7%OS zvnmxR0#wt&z{CI)V_?|M4Cc2_cnjoDHe?cG12F}_%)k}}1_l8KpzbvgRbabZASSds f0OeSKY!DCtlN?|Zfu^?u89*V3C`bxq69@nR9nT|B delta 7 Ocmeys{)2VH4<-N)uLGX| diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Drafts/dbox-Mails/u.1 b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Drafts/dbox-Mails/u.1 deleted file mode 100644 index 8d4e2acb57..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Drafts/dbox-Mails/u.1 +++ /dev/null @@ -1,34 +0,0 @@ -2 M1e C607eda21 -N 000000000000039C -FCC: imap://default%40denbond7.com@mail.denbond7.com/Sent -X-Identity-Key: id3 -X-Account-Key: account16 -To: Denis Bondarenko -From: Default -Subject: Standard message - plane text -Message-ID: <6687977f-9bf3-c937-953e-5e6fc332ddf7@denbond7.com> -Date: Mon, 5 Oct 2020 11:26:04 +0300 -X-Mozilla-Draft-Info: internal/draft; vcard=0; receipt=0; DSN=0; uuencode=0; - attachmentreminder=0; deliveryformat=4 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 - Thunderbird/68.10.0 -MIME-Version: 1.0 -Content-Type: text/html; charset=utf-8 -Content-Language: en-US -Content-Transfer-Encoding: 7bit - - - - - - - - 
It's a standard message with plane text=20
- - - - -R60586566 -V3b6 -G1601886364.M433822P956.mail,S=924,W=950 - diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/dovecot.index.cache b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/dovecot.index.cache index 5dd2c9bfd21f8ac8d6d9dbb26827b1f2c682a92f..3fddfd7690f47006668966bcd71fb30858b75f4b 100644 GIT binary patch delta 3372 zcmb_eOKcle6n$$I=_Do6D*ui#10up%QnGhq#cFhEm z4aovgkgBTUZCW8JqE=!{Rf$y>6#^lIgkXV?0I@(_vS9@akhpI=E-}hy6nr&T_kHfX z`#bOR^HtxKPkljOyAKWh_*O0gJd6-}61eLngxc-|cl`YB?yVmNP9YS8(XT(doFjbt z^F~=82Ng#Lf9LNW`yLd@0HM0V0TOrmhwhG3yvP&955UsEz8}0;ig~n@d+&?O|7Btw zk5dVpqq>0Gaghq*U234sM+o1f;yrpgwTRZu>U8Gf{CO>&b=uh!{*$tI;&G?viiDcg zoc=5pOsiU3CY8);$t;~+S*op*)LzJ(OQ$X_ zWt{n?^g=4VkX>;X(Y58YmW*q)$z}TCG+KsYU56}^nymqM0uzdtOSVFjpJnhkGk z7VSdCsM<3dg)PgBb%a;Tn_WLTQ+c&Q*R=eg7HM$ot24u^9ml!k z2MGQD`0ovdOb_w@HTbVF3*tUWvZEx?$7cG$5JEZ7BbjD^56-l0ZP_!GqERTt!ufTh z`nqM$ZQ5(Jd{o+WSPmf>wtqcuCk>?s|9ZCH@)AyX1fh4qDhX#9_~3AkLTPz?^ms7b zA8$rbGgJMZYE+p*=$aeU%N~LZ+jQ9s0DF4SA1lz6(;6 zpBFfl#ox?OUVLZ=d^S4`TAY*P5+~yzN4@4@V`jOg_<)!AQ7`5`f(xt(A>*6ksFw`? zCN{-f1JLFfL090zf6Jb#EGy0Tf#VZVl~V=05cA~2+p)$&k%CP}sPXza(V>XQDdy1a zR-AlP_eJsVo!yvfP2u&qZr?QCiv>cQ6jm$MFvoCgm}O_3FFeIW8KwhI2FA`tc}p?` zd6i}q3l3pZVrWwlO_1PBt%BySyhUv zA}i{VqfUPkBmP)@oO=Kb6}Yp73?Ve=%5VL(e#CVSUTKcrD=qkm(ZKn4NFV4!R}%3Y z@GtJ~LDp9rpLOM9(0vxz#49~hZFgaG9N&LBG7^rg zm8%u3l2x5)dEb2EWRW^^ZxK7ZBdpFD|o0^>Ei@Rlj2H3)aH4H zXBkBhbQqeCOyI>y2H)_8tJZ%XkOPjnARr037Mg{R9V#pnH9AdoO zF^nLyoEGObMinJqN@$YECOC$T9DdNALTB)v8hWwIt#a6vS4e_@Zn=^Of`;57Xn_0K zp-ETP_1kM`7;sTAwhs+tr9bdqbi@k=c&?5CP7!Jt=shf4Qs8dl!1cD8H>AKC6!;&R CAJ9wy delta 113 zcmeC##(1ZXQIe5^kwNiRU4jx23o|en h)+J1y=q@~YfjbKf%Ya2eGFb5B`|hcma|Az_0sxX`BY6M- diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/dovecot.index.log b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/dovecot.index.log index 7cd3487414244026a05fcf68398b8afaf086134e..8df89158a133c25d9a580658aa516144765bb055 100644 GIT binary patch delta 807 zcmZvay-!p@6vYqn_OVZ0c(ADZgk3kFG&EF%a>2v|{3aMbDq=;bEG#HUb`vpBP(WTn z*iu6Xp?Zn`g2fgVBs4VkCSYP|>F>@g@}V!8Id|@ycjnHylNDR#EQ{)mM&pB&j}Igf zuhzgExF)D;1{Mmm^8N)f!|qQ1>b_#!IK`T0A{QS zHCfdg#RP>!>ID~J^?~=KN|XQ!K;m8ulixNPZKIung2yUiwo(jdc1fwFG0IVTvN3R*5cm%AYK z%}c$gpGny*k#d%2>8Eh0{@Gl`5dEI^?rqG-xmSDW-8%x!y?2kidk3JoxA2&X!C#=s zu08SQm7e;F_dqjm;+Z$E1)6!Uo_q6tfQbgArP;HZb|6sS3N^*$w2&VS%Vdsb(@Hcl zZs8P?5Z0>@=7isKtMit(ck%yWcHY}cy$43M4kO__c<*C(Ud5ePA+!9_&I>L4nzR3x wUbov}sdhVD$Ho-sPFthe?qGvgf&RyUyq#ymo+Y`zUEVpzF-;qnIW0JU0J+|If&c&j delta 7 OcmX>hyFqxv22KDCVgnKY diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.26 b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.26 deleted file mode 100644 index 8394f3dfc0..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.26 +++ /dev/null @@ -1,180 +0,0 @@ -2 M1e C607edeef -N 0000000000002426 -Return-Path: -Delivered-To: default@denbond7.com -Received: from mail.denbond7.com - by mail.denbond7.com with LMTP - id A3U/Ou/efmAUDAAAZlazJA - (envelope-from ) - for ; Tue, 20 Apr 2021 14:02:23 +0000 -Received: from localhost (localhost [127.0.0.1]) - by mail.denbond7.com (Postfix) with ESMTP id E9CDD1E09D0 - for ; Tue, 20 Apr 2021 14:02:23 +0000 (UTC) -Date: Tue, 20 Apr 2021 17:02:23 +0300 (GMT+03:00) -From: default@denbond7.com -To: default@denbond7.com -Message-ID: <267024227.1.1618927343266@denbond7.com> -Subject: Your FlowCrypt Backup -Mime-Version: 1.0 -Content-Type: multipart/mixed; - boundary="----=_Part_0_87986657.1618927343207" - -------=_Part_0_87986657.1618927343207 -Content-Type: text/html; charset=us-ascii -Content-Transfer-Encoding: 7bit - - - -
-
This email contains a key backup. It will help you access your - encrypted messages from other devices (along with your pass phrase). You can safely leave - it in your inbox or archive it. -
-
-
The key below is protected with pass phrase that only you know. - You should make sure to note your pass phrase down. -
-
-
- DO NOT DELETE THIS EMAIL. Write us at human@flowcrypt.com for help. We respond - very promptly. -
-
- -------=_Part_0_87986657.1618927343207 -Content-Type: text/plain; charset=us-ascii; - name=flowcrypt-backup-defaultdenbond7com.key -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; - filename=flowcrypt-backup-defaultdenbond7com.key -Content-ID: - ------BEGIN PGP PRIVATE KEY BLOCK----- -Version: FlowCrypt 1.1.6_devTest_116__2021_04_20 Gmail Encryption -Comment: Seamlessly send and receive encrypted email - -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 -=wZtY ------END PGP PRIVATE KEY BLOCK----- - ------BEGIN PGP PRIVATE KEY BLOCK----- -Version: FlowCrypt 1.1.6_devTest_116__2021_04_20 Gmail Encryption -Comment: Seamlessly send and receive encrypted email - -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 -=HjZ5 ------END PGP PRIVATE KEY BLOCK----- - -------=_Part_0_87986657.1618927343207-- - - -R607edeef -V24d2 -G018c573aefde7e60140c00006656b324 - diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.27 b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.27 deleted file mode 100644 index 77b0730994..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.27 +++ /dev/null @@ -1,119 +0,0 @@ -2 M1e C607edf2d -N 00000000000015AB -Return-Path: -Delivered-To: default@denbond7.com -Received: from mail.denbond7.com - by mail.denbond7.com with LMTP - id MOQgAi3ffmAUDAAAZlazJA - (envelope-from ) - for ; Tue, 20 Apr 2021 14:03:25 +0000 -Received: from localhost (localhost [127.0.0.1]) - by mail.denbond7.com (Postfix) with ESMTP id 075F31E09D2 - for ; Tue, 20 Apr 2021 14:03:25 +0000 (UTC) -Date: Tue, 20 Apr 2021 17:03:24 +0300 (GMT+03:00) -From: default@denbond7.com -To: default@denbond7.com -Message-ID: <236079790.3.1618927404359@denbond7.com> -Subject: Your FlowCrypt Backup -Mime-Version: 1.0 -Content-Type: multipart/mixed; - boundary="----=_Part_2_143797424.1618927404350" - -------=_Part_2_143797424.1618927404350 -Content-Type: text/html; charset=us-ascii -Content-Transfer-Encoding: 7bit - - - -
-
This email contains a key backup. It will help you access your - encrypted messages from other devices (along with your pass phrase). You can safely leave - it in your inbox or archive it. -
-
-
The key below is protected with pass phrase that only you know. - You should make sure to note your pass phrase down. -
-
-
- DO NOT DELETE THIS EMAIL. Write us at human@flowcrypt.com for help. We respond - very promptly. -
-
- -------=_Part_2_143797424.1618927404350 -Content-Type: text/plain; charset=us-ascii; - name=flowcrypt-backup-defaultdenbond7com.key -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; - filename=flowcrypt-backup-defaultdenbond7com.key -Content-ID: <04407a57-861d-4ce9-8927-d30869b53096@flowcrypt> - ------BEGIN PGP PRIVATE KEY BLOCK----- -Version: FlowCrypt 1.1.6_devTest_116__2021_04_20 Gmail Encryption -Comment: Seamlessly send and receive encrypted email - -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 -=HjZ5 ------END PGP PRIVATE KEY BLOCK----- - -------=_Part_2_143797424.1618927404350-- - - -R607edf2d -V161a -Gb1fe26022ddf7e60140c00006656b324 - diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.28 b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.28 deleted file mode 100644 index b6baabdd39..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.28 +++ /dev/null @@ -1,118 +0,0 @@ -2 M1e C607edf60 -N 000000000000159F -Return-Path: -Delivered-To: default@denbond7.com -Received: from mail.denbond7.com - by mail.denbond7.com with LMTP - id cNznFmDffmAUDAAAZlazJA - (envelope-from ) - for ; Tue, 20 Apr 2021 14:04:16 +0000 -Received: from localhost (localhost [127.0.0.1]) - by mail.denbond7.com (Postfix) with ESMTP id 5CC691E09D2 - for ; Tue, 20 Apr 2021 14:04:16 +0000 (UTC) -Date: Tue, 20 Apr 2021 17:04:15 +0300 (GMT+03:00) -From: default@denbond7.com -To: default@denbond7.com -Message-ID: <9640470.5.1618927455713@denbond7.com> -Subject: Your FlowCrypt Backup -Mime-Version: 1.0 -Content-Type: multipart/mixed; boundary="----=_Part_4_5866456.1618927455701" - -------=_Part_4_5866456.1618927455701 -Content-Type: text/html; charset=us-ascii -Content-Transfer-Encoding: 7bit - - - -
-
This email contains a key backup. It will help you access your - encrypted messages from other devices (along with your pass phrase). You can safely leave - it in your inbox or archive it. -
-
-
The key below is protected with pass phrase that only you know. - You should make sure to note your pass phrase down. -
-
-
- DO NOT DELETE THIS EMAIL. Write us at human@flowcrypt.com for help. We respond - very promptly. -
-
- -------=_Part_4_5866456.1618927455701 -Content-Type: text/plain; charset=us-ascii; - name=flowcrypt-backup-defaultdenbond7com.key -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; - filename=flowcrypt-backup-defaultdenbond7com.key -Content-ID: <431fb9a1-fb6c-458a-ae63-ba6be700aff6@flowcrypt> - ------BEGIN PGP PRIVATE KEY BLOCK----- -Version: FlowCrypt 1.1.6_devTest_116__2021_04_20 Gmail Encryption -Comment: Seamlessly send and receive encrypted email - -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 -=w+BF ------END PGP PRIVATE KEY BLOCK----- - -------=_Part_4_5866456.1618927455701-- - - -R607edf60 -V160d -Ge99eee1660df7e60140c00006656b324 - diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.6 b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.29 similarity index 76% rename from docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.6 rename to docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.29 index cdc5a5b92c..0454e3b48f 100644 --- a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.6 +++ b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.29 @@ -1,59 +1,55 @@ -2 M1e C607eda21 -N 00000000000013FD +2 M1e C6087c71f +N 00000000000013DB Return-Path: Delivered-To: default@denbond7.com Received: from mail.denbond7.com by mail.denbond7.com with LMTP - id YISlMxbcel9GEwAAZlazJA + id DL9/DB/Hh2C/BQAAZlazJA (envelope-from ) - for ; Mon, 05 Oct 2020 08:40:54 +0000 + for ; Tue, 27 Apr 2021 08:11:11 +0000 Received: from localhost (localhost [127.0.0.1]) - by mail.denbond7.com (Postfix) with ESMTP id D03A0A2098A - for ; Mon, 5 Oct 2020 08:40:54 +0000 (UTC) + by mail.denbond7.com (Postfix) with ESMTP id 2FD238262C + for ; Tue, 27 Apr 2021 08:11:11 +0000 (UTC) To: default@denbond7.com From: Denis Bondarenko -X-Pep-Version: 2.0 -Message-ID: -Date: Mon, 5 Oct 2020 11:40:54 +0300 -Mime-Version: 1.0 Subject: Standard message + one attachment +Message-ID: <34e7a58b-09ef-8d70-d96d-77ca6dd96570@denbond7.com> +Date: Tue, 27 Apr 2021 11:11:11 +0300 +Mime-Version: 1.0 Content-Type: multipart/mixed; - boundary="------------9575DD1DBF2C2FFA08F4568A" + boundary="------------F8FEAF85A0D60741A73A616F" Content-Language: en-US This is a multi-part message in MIME format. ---------------9575DD1DBF2C2FFA08F4568A +--------------F8FEAF85A0D60741A73A616F Content-Type: multipart/alternative; - boundary="------------9BD0A609717171AC93BCB3E4" + boundary="------------257E7C9D6EB40410955F57EB" ---------------9BD0A609717171AC93BCB3E4 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: quoted-printable +--------------257E7C9D6EB40410955F57EB +Content-Type: text/plain; charset=utf-8; format=flowed +Content-Transfer-Encoding: 7bit -It's a standard message with plane text and one attachment +It's a standard message with plaintext and one attachment ---------------9BD0A609717171AC93BCB3E4 +--------------257E7C9D6EB40410955F57EB Content-Type: text/html; charset=utf-8 -Content-Transfer-Encoding: quoted-printable +Content-Transfer-Encoding: 7bit - + - 
It's a standard message with plane text=
- and one attachment
+ 
It's a standard message with plaintext and one attachment
---------------9BD0A609717171AC93BCB3E4-- +--------------257E7C9D6EB40410955F57EB-- ---------------9575DD1DBF2C2FFA08F4568A +--------------F8FEAF85A0D60741A73A616F Content-Type: image/png; name="android.png" Content-Transfer-Encoding: base64 @@ -105,10 +101,10 @@ ZAB8ztK9d+JFudK7IvlZ+LwRAD7+RFzCJcnj+4E4gRhA8oD4SEoQla1UkZQggNID4+MvRRGk 8jWSmfB5+8rNB/IR3W5L54rn14LnjZZRSYHxKVOoXYberfIKOyvPGEDTcwXIx88nDaOAH3Zv nt9F/GnE6AWi7FRA+fj+6sJ5TBghnE90Xvay4JyUz8ecf5mtcVMB5+P70/1m/ZOGK93FxdNV mP6sN3vtxcgaQPqMAfQZN+gzbv4Htx68Wm+jVTYAAAAASUVORK5CYII= ---------------9575DD1DBF2C2FFA08F4568A-- +--------------F8FEAF85A0D60741A73A616F--  -R5f7adc16 -V1467 -G1601887254.M867655P4934.mail,S=5117,W=5223 +R6087c71f +V1441 +G2954950c1fc78760bf0500006656b324 diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.30 b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.30 new file mode 100644 index 0000000000..d6aebffc57 --- /dev/null +++ b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.30 @@ -0,0 +1,51 @@ +2 M1e C6087c745 +N 0000000000000598 +Return-Path: +Delivered-To: default@denbond7.com +Received: from mail.denbond7.com + by mail.denbond7.com with LMTP + id YJm1LUXHh2C/BQAAZlazJA + (envelope-from ) + for ; Tue, 27 Apr 2021 08:11:49 +0000 +Received: from localhost (localhost [127.0.0.1]) + by mail.denbond7.com (Postfix) with ESMTP id BA45C8262C + for ; Tue, 27 Apr 2021 08:11:49 +0000 (UTC) +To: default@denbond7.com +From: Denis Bondarenko +Subject: Standard message - plaintext +Message-ID: <48a7eaff-2110-354c-e5d1-d4a39cd91356@denbond7.com> +Date: Tue, 27 Apr 2021 11:11:49 +0300 +Mime-Version: 1.0 +Content-Type: multipart/alternative; + boundary="------------05812EC4E0A6747DE761D201" +Content-Language: en-US + +This is a multi-part message in MIME format. +--------------05812EC4E0A6747DE761D201 +Content-Type: text/plain; charset=utf-8; format=flowed +Content-Transfer-Encoding: 7bit + +It's a standard message with plaintext + + +--------------05812EC4E0A6747DE761D201 +Content-Type: text/html; charset=utf-8 +Content-Transfer-Encoding: 7bit + + + + + + + + 
It's a standard message with plaintext
+ + + +--------------05812EC4E0A6747DE761D201-- + + +R6087c745 +V5c3 +Gb990bb2d45c78760bf0500006656b324 + diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.5 b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.5 deleted file mode 100644 index 5c7a45454c..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/INBOX/dbox-Mails/u.5 +++ /dev/null @@ -1,55 +0,0 @@ -2 M1e C607eda21 -N 00000000000005BB -Return-Path: -Delivered-To: default@denbond7.com -Received: from mail.denbond7.com - by mail.denbond7.com with LMTP - id WF4PDSLael+dCQAAZlazJA - (envelope-from ) - for ; Mon, 05 Oct 2020 08:32:34 +0000 -Received: from localhost (localhost [127.0.0.1]) - by mail.denbond7.com (Postfix) with ESMTP id 347E7A20940 - for ; Mon, 5 Oct 2020 08:32:34 +0000 (UTC) -To: default@denbond7.com -From: Denis Bondarenko -X-Pep-Version: 2.0 -Message-ID: <8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@denbond7.com> -Date: Mon, 5 Oct 2020 11:32:34 +0300 -Mime-Version: 1.0 -Subject: Standard message - plane text -Content-Type: multipart/alternative; - boundary="------------D3F69D95534F587EC1BE35A3" -Content-Language: en-US - -This is a multi-part message in MIME format. ---------------D3F69D95534F587EC1BE35A3 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: quoted-printable - -It's a standard message with plane text - - ---------------D3F69D95534F587EC1BE35A3 -Content-Type: text/html; charset=utf-8 -Content-Transfer-Encoding: quoted-printable - - - - - - - - 
It's a standard message with plane text=
-
- - - ---------------D3F69D95534F587EC1BE35A3-- - - -R5f7ada22 -V5ea -G1601886754.M219463P2461.mail,S=1467,W=1514 - diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/dovecot.index.cache b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/dovecot.index.cache index 3af96fd71b68112460918baadf648c3f7254d15e..7332f4d3b06e2c6eb2d7b25a78854ea6b1bd512b 100644 GIT binary patch literal 9376 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 delta 43 qcmZ4B`G!N1k%N&z@m5`e5)d;00UHqKumFjTlAoDDG{a;8mKXrz;0W;m diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/dovecot.index.log b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/dovecot.index.log index d66b77fdc5dcda28706030e251f2063dbfc4a56a..3c9501ccb25df92baef73414579ef7de9b91186c 100644 GIT binary patch literal 2868 zcmcIkO-oc^6h5P)O&{8=tfrda7A{&S4CJEa4I*01!azbuYSb|lEGsFZz;1YRtVCK& z5oFMBs1`0-v~OT}(2m~gQ`b-S-kK;) zs%-=?Uyu_i#_?e-qpUz*@xo@@R$Z!mmB% z+hU%H`SzIa04KqZ{m!>SHe8LXn9`z{5n>SYH8?TfgA?;BI5F42iRmE;U{)klzrDC4 z(br`9n@kLoiDNRcOa|V9j~oZ2Tf###Mb@|(!QSmt4~!s3K6p;jva{}-$C)wAwx}|D zA)EAqt0pTjU_Fx^e&j+@0{;Cilpxn0?@Y) zMIsLO!Q(#2K)J{m>_wxW}8|Pvefy%^i`GPsBo9!H9v*sfQwB}B5^KT}HXRj2Sed8_|#z&Q14h{NW zVGiu)4>)qRD=36@d;l2ttADp*R`%$A4erxgm-cJ!zwyCm+@ZtTmjE*HjOyxLv{?7h zRK|J$AI8e!z*yaAGV?!+OYSnys3r0-2fpJ@+}WAC{TY5ZyInk`y3J~Jvu1AZa?bDN z)1Mo2g~}0gOA_-;5_3)x^G_0TWGwfNle#U4<@&|`tRZRZPc!?J8`dm2SMEPB9+Gn= zb$8V`LudqSp0l5{NfO^ilI%NCe^2Zr#kk%U;8yd`VQ7fs_NbXYS+171VGKe6d5+&j z?kx8N&&YAymjm24c#r%hIG@5%^%?hTxxtUP^l$XW+&6_WzqiHyT{Zt^YCDg&Nn+lp zgK=HI_zw9kv@`c?2*bhI?FeJjC*B+9Lz_@-7Pup{NfLdM1Wekyek64b?5pv9X}tfQ Hsp0 -Delivered-To: default@denbond7.com -Received: from mail.denbond7.com - by mail.denbond7.com with LMTP - id fCzpFVlGe19jFgAAZlazJA - (envelope-from ) - for ; Mon, 05 Oct 2020 16:14:17 +0000 -Received: from localhost (localhost [127.0.0.1]) - by mail.denbond7.com (Postfix) with ESMTP id 56103B20597 - for ; Mon, 5 Oct 2020 16:14:17 +0000 (UTC) -Content-Type: multipart/mixed; - boundary="----sinikael-?=_1-16019144539760.06379430448642398" -To: default@denbond7.com -From: denbond7@denbond7.com -Subject: Simple encrypted message + pub key -Date: Mon, 05 Oct 2020 16:14:13 +0000 -Message-Id: <90049050.0.1601914456206@localhost> -Mime-Version: 1.0 - -------sinikael-?=_1-16019144539760.06379430448642398 -Content-Type: text/plain -Content-Transfer-Encoding: quoted-printable - ------BEGIN PGP MESSAGE----- -Version: FlowCrypt 1.1.1 Gmail Encryption -Comment: Seamlessly send and receive encrypted email - -wcBMA0HJ2AYtijsRAQf9FXpEpyfYsQV1NNxMlR6TjIZga7URvFddBzbOqewi -AxRLMxM2y4JOWo1KkBomG4Y0jDJyJjSizt4UyOPGhHgbAC6jd+QOgTSxQ0f3 -7kVsJqbe6oZTZLh7ux8aPTqND4YasJtnufakQk/CQIZM4WMB5jzUjNyhI3uQ -c43N8ynUrnnns1fcIOb1CHTf96wJnxs3wr/C8FBZuEUZ7ueevqXoXKsUu0u9 -OxQE8Ks1PxnaIYwbM7l1DEIhw2t06yumNMfHLbfVY+e/Y/75OR4r11KnxxKi -ADaF16kxW2Dq1F02K/K+MTQ75aZAj5i9NAHbjlzyD5pDXPS33ei/Iu2GKsU6 -VsHATAOE5YkozqaZLwEH/irWq1dCsR/IpBXii3F3qW+GN0/Y+xNtXX8TKU+S -1CPXTE44+2NjW1kaUb9w+90ZqSfScxnuD1kn3tdGA+t+16Ztu6T5a1tDb/4+ -eNM3ENKb44DQKKeM3dFce7fkw+z4VAs8mktalMMru30chpnd8I7k0bWB6Knr -AxB4jhIw/4MjnoLt8Y1Le2HFY8IGnX42N1R4LpFVrrXMeVak++FojyfzxE1f -FUN2N1C93uBYup4DGayIeM14raEL9hUUnkmg5uedaqvzuo9lQ6nAV0X3gjVE -KcSVf0J2rZgJ0XRx4knxEPcS0rGH9WYNzpMqqjENK26JuQAEPlTxnouKz9ZC -khbSYQEkd6DmvwrYbmwJQeLUiD50jLVO79AUm1pcnGdYaHap+t6e5BVj2uSL -KiBzl160F3++zr+VvTfnJi99fYioqT2mfZJao2H8SVEdKrvHi10oWdR6xeDY -shHgloREj/qWt30=3D -=3DcteV ------END PGP MESSAGE----- - -------sinikael-?=_1-16019144539760.06379430448642398 -Content-Type: application/pgp-keys; name=0x6A150653F1800874.asc -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; filename=0x6A150653F1800874.asc -Content-ID: <1edd04a2-4dd6-4f16-9bf7-96e6b2a085d1@flowcrypt> - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: FlowCrypt 1.1.1 Gmail Encryption -Comment: Seamlessly send and receive encrypted email - -xsBNBFyM4vkBCACr8FvuG4MAZsz90hrZ2B+oEznArD46QUbAGrPT8JU6zz27 -SfLmTTbTA86q+DVAZC94CZ2lqJaG7KY7eqHFqJObetA8mcUk0Oo3EshphpK0 -MnNv+bHFpKf/srJgKSDmpCF+JSHeZs2WAPtrdfoTO1KPy5IZexMWdnhYZy8d -0xUr4rPZ7i2UyrkdV3k2O9x4aG5tD1Zo/WkmlTv8z2BtAwAziqUQFxABQLu1 -fzcRkMHTMcGVXrB+73GITl03GbfeJHvFuThhofqP09o/p3Y18Zm+zVWL/T4z -sA5P+Cp6kwnwUnQkL3Tc49a0qIJShlP4LbSbPBqFGWTHxceCkFBkMVoJABEB -AAHNLWRlbmJvbmQ3QGRlbmJvbmQ3LmNvbSA8ZGVuYm9uZDdAZGVuYm9uZDcu -Y29tPsLAfwQQAQgAKQUCXIzjAQYLCQcIAwIJEGoVBlPxgAh0BBUICgIDFgIB -AhkBAhsDAh4BAAoJEGoVBlPxgAh0L2EIAJRM22lnSHhgQ+waiCf0p739L3XK -s2eDZUkxAX+4an654wnn1OjxWrG7lls2GgN1ziKHHdGgxU4PQ8PmQrgyc6F0 -5vmYihRFaVFDQ97xF16+IvO4xiuYMuJk7ovsr5mrlI43CWE4f7GPtmJ7QYTl -xeYW3s7KLqr0TKxqGG8f6qRjy/Q1ky3qnseR5Fp1GjIwijVI2rncfH0lOkNm -BHj4aYugN60HNlUJbosb2vjJkz5dsqe+nY3XVKI6Iqq07I+Jvankn6jyvlMP -8jNLxQMUsqrtBki/C6ett3z+JeP2+2Nh+mp1vDW/kO7gSgRHUEPJ9w/VVIpW -IOTEv+Bsz3l28h7OwE0EXIzjAAEIAJKbKexaP/2HqUAj/DxOebhKqw2ddK5H -sYacv12pHVTEVjOnLQELyroZ1ikO21UK8Z/zng9+8DlCz72SMql+/uZYpoEd -gqMy9PU3zPDzGcAeOr07R56G08l+hUO/i3FMW4v2ZT6gLCInAJ417wSvF4wg -6dJzfrBFkj7o2lyTOwfD87CehQozyGza1cb+yS3ZPC8oc99a1jwSqFYecDI2 -7Cgy7KWSbhSfoPcJG4KPTLDrvVn2Y+U2jxx6OiYXRai8wwlheAmIohmZNpHL -aCQiTZTWRYPKvP0kb6aoN9O4fGhgMh3QAbc2BVwh299rToBieI/zow+I9Ocr -ScejwQNI2VUAEQEAAcLAaQQYAQgAEwUCXIzjAgkQahUGU/GACHQCGwwACgkQ -ahUGU/GACHSfcQf/euBJSXopDZxAVniN9HDQDga+ccwJYWZvyiDOaGSoSxW3 -QDhTOWbCH66GkZiOp9KLObHs54KzoOGaOJbQmhWGR4rwNdGSnp8oWimyyXVE -HHhir2BmT8MZrMC3WpMPmUlY2v9CMFD7hF2OfmXd1M9fuFT41aZQVDgGSdYc -IQchOmUv3NQUiBJyOlp1bF1RT7Yf3UjAQANyENz19fYHKd2yh9Ltv3CYVjwR -B4crQmuESxM87IEXDVNnYOBP0F5WaSQEesFAhjk+cVjxTUfcmM04YEFhedBS -tsV8kWF50ojYgF9te4yRM/zoNRi6SjWLSeEw/zIfvkggDvn1UfA2bGFk8Q== -=RKQi ------END PGP PUBLIC KEY BLOCK----- - -------sinikael-?=_1-16019144539760.06379430448642398-- - - -R60586566 -V1023 -G1618926113.M876710P23.mail.denbond7.com,S=4045,W=4131 - diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.5 b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.5 deleted file mode 100644 index 26c662097f..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.5 +++ /dev/null @@ -1,47 +0,0 @@ -2 M1e C607eda21 -N 0000000000000453 -To: denbond7@denbond7.com -From: Default -X-Pep-Version: 2.0 -Message-ID: -Date: Mon, 5 Oct 2020 11:28:22 +0300 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 - Thunderbird/68.10.0 -MIME-Version: 1.0 -Subject: Standard message - plane text -Content-Type: multipart/alternative; - boundary="------------122DE5599D10BFBCB913B469" -Content-Language: en-US - -This is a multi-part message in MIME format. ---------------122DE5599D10BFBCB913B469 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: quoted-printable - -It's a standard message with plane text - - ---------------122DE5599D10BFBCB913B469 -Content-Type: text/html; charset=utf-8 -Content-Transfer-Encoding: quoted-printable - - - - - - - - 
It's a standard message with plane text=
-
- - - ---------------122DE5599D10BFBCB913B469-- - - -R5f7ad926 -V47a -G1601886502.M625773P1577.mail,S=1107,W=1146 - diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.6 b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.6 deleted file mode 100644 index 8924724b12..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.6 +++ /dev/null @@ -1,131 +0,0 @@ -2 M1e C607eda21 -N 0000000000001A05 -Return-Path: -Delivered-To: default@denbond7.com -Received: from mail.denbond7.com - by mail.denbond7.com with LMTP - id 8er9KubZel+dCQAAZlazJA - (envelope-from ) - for ; Mon, 05 Oct 2020 08:31:34 +0000 -Received: from localhost (localhost [127.0.0.1]) - by mail.denbond7.com (Postfix) with ESMTP id ACD90A20942 - for ; Mon, 5 Oct 2020 08:31:34 +0000 (UTC) -To: default@denbond7.com -From: Denis Bondarenko -X-Pep-Version: 2.0 -Message-ID: <2a6083e2-f8fe-ec56-3965-b9e64a4903af@denbond7.com> -Date: Mon, 5 Oct 2020 11:31:34 +0300 -Mime-Version: 1.0 -Subject: =?utf-8?Q?p=E2=89=A1p?= -X-Pep-Version: 2.0 -Content-Type: multipart/encrypted; boundary="30886d4054d26c6325f3a10924f53696"; - protocol="application/pgp-encrypted" - - - ---30886d4054d26c6325f3a10924f53696 -Content-Type: application/pgp-encrypted - -Version: 1 ---30886d4054d26c6325f3a10924f53696 -Content-Type: application/octet-stream -Content-Transfer-Encoding: 7bit -Content-Disposition: inline; filename="msg.asc" - ------BEGIN PGP MESSAGE----- - -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 -HUdqiA3JmKHdAeMn8wx7YLB+/xGzOGVIXUs= -=n60c ------END PGP MESSAGE----- - ---30886d4054d26c6325f3a10924f53696-- - - -R5f7ad9e6 -V1a80 -G1601886694.M722330P2461.mail,S=6661,W=6784 - diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.7 b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.7 deleted file mode 100644 index 147506a5a2..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.7 +++ /dev/null @@ -1,47 +0,0 @@ -2 M1e C607eda21 -N 00000000000005F0 -Return-Path: -Delivered-To: default@denbond7.com -Received: from mail.denbond7.com - by mail.denbond7.com with LMTP - id 8PGNDUMJe1+LKwAAZlazJA - (envelope-from ) - for ; Mon, 05 Oct 2020 11:53:39 +0000 -Received: from localhost (localhost [127.0.0.1]) - by mail.denbond7.com (Postfix) with ESMTP id 34273B2058E - for ; Mon, 5 Oct 2020 11:53:39 +0000 (UTC) -Content-Type: multipart/mixed; - boundary="----sinikael-?=_1-16018988160880.5992817679438005" -To: default@denbond7.com -From: denbond7@denbond7.com -Subject: Fsdf -Date: Mon, 05 Oct 2020 11:53:36 +0000 -Message-Id: <1601898816089-616d20b3-45f55a08-a78e6781@denbond7.com> -Mime-Version: 1.0 - -------sinikael-?=_1-16018988160880.5992817679438005 -Content-Type: text/plain -Content-Transfer-Encoding: quoted-printable - ------BEGIN PGP MESSAGE----- -Version: FlowCrypt 1.1.1 Gmail Encryption -Comment: Seamlessly send and receive encrypted email - -wcBMA4TliSjOppkvAQf+OvZNzBdw/hhsEsYZg1xSYVAZqEufxNvMtblP+xR1 -gIIQsBLhNkx41/gDzguuTowgyh/Tsf0YAHXv+xQgvtz8R5cvMJL3rF/FkrUG -pawRbgVXNfeQeRFQYdRJRwWd0lSq7Uodm9o623SVbzhdea5POGeZ9UwdKQTr -mHXU/Dq5sBCtY3FvUJNla83tHyrKGvfMBJBe1NE700BnF5CtCzYt8HtJXXL7 -cAaaVpmJXIn9L51RVWnofPxXzEDxXRSVOFwT7S11h58zIieImO9Xw8K1Zt70 -O6IWAJTxuCfg26boTq8TBqK5/YJP/3ld7NBvD94oejlpYXFMhUphwu/mMbre -O9I9AaFLOOZe2O0e2lXZ7R6CmpEcESO/cgLJ1O04Nqp9oVXTBNxphJe+VV2S -RyUrPbYcH0Lm2AyPTCClyQrjOg=3D=3D -=3DWVdo ------END PGP MESSAGE----- - -------sinikael-?=_1-16018988160880.5992817679438005-- - - -R5f7b0943 -V617 -G1601898819.M228505P11147.mail,S=1520,W=1559 - diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.8 b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.8 deleted file mode 100644 index 475b396d48..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.8 +++ /dev/null @@ -1,94 +0,0 @@ -2 M1e C607eda21 -N 0000000000000FCD -Return-Path: -Delivered-To: default@denbond7.com -Received: from mail.denbond7.com - by mail.denbond7.com with LMTP - id fCzpFVlGe19jFgAAZlazJA - (envelope-from ) - for ; Mon, 05 Oct 2020 16:14:17 +0000 -Received: from localhost (localhost [127.0.0.1]) - by mail.denbond7.com (Postfix) with ESMTP id 56103B20597 - for ; Mon, 5 Oct 2020 16:14:17 +0000 (UTC) -Content-Type: multipart/mixed; - boundary="----sinikael-?=_1-16019144539760.06379430448642398" -To: default@denbond7.com -From: denbond7@denbond7.com -Subject: Simple encrypted message + pub key -Date: Mon, 05 Oct 2020 16:14:13 +0000 -Message-Id: <90049050.0.1601914456206@localhost> -Mime-Version: 1.0 - -------sinikael-?=_1-16019144539760.06379430448642398 -Content-Type: text/plain -Content-Transfer-Encoding: quoted-printable - ------BEGIN PGP MESSAGE----- -Version: FlowCrypt 1.1.1 Gmail Encryption -Comment: Seamlessly send and receive encrypted email - -wcBMA0HJ2AYtijsRAQf9FXpEpyfYsQV1NNxMlR6TjIZga7URvFddBzbOqewi -AxRLMxM2y4JOWo1KkBomG4Y0jDJyJjSizt4UyOPGhHgbAC6jd+QOgTSxQ0f3 -7kVsJqbe6oZTZLh7ux8aPTqND4YasJtnufakQk/CQIZM4WMB5jzUjNyhI3uQ -c43N8ynUrnnns1fcIOb1CHTf96wJnxs3wr/C8FBZuEUZ7ueevqXoXKsUu0u9 -OxQE8Ks1PxnaIYwbM7l1DEIhw2t06yumNMfHLbfVY+e/Y/75OR4r11KnxxKi -ADaF16kxW2Dq1F02K/K+MTQ75aZAj5i9NAHbjlzyD5pDXPS33ei/Iu2GKsU6 -VsHATAOE5YkozqaZLwEH/irWq1dCsR/IpBXii3F3qW+GN0/Y+xNtXX8TKU+S -1CPXTE44+2NjW1kaUb9w+90ZqSfScxnuD1kn3tdGA+t+16Ztu6T5a1tDb/4+ -eNM3ENKb44DQKKeM3dFce7fkw+z4VAs8mktalMMru30chpnd8I7k0bWB6Knr -AxB4jhIw/4MjnoLt8Y1Le2HFY8IGnX42N1R4LpFVrrXMeVak++FojyfzxE1f -FUN2N1C93uBYup4DGayIeM14raEL9hUUnkmg5uedaqvzuo9lQ6nAV0X3gjVE -KcSVf0J2rZgJ0XRx4knxEPcS0rGH9WYNzpMqqjENK26JuQAEPlTxnouKz9ZC -khbSYQEkd6DmvwrYbmwJQeLUiD50jLVO79AUm1pcnGdYaHap+t6e5BVj2uSL -KiBzl160F3++zr+VvTfnJi99fYioqT2mfZJao2H8SVEdKrvHi10oWdR6xeDY -shHgloREj/qWt30=3D -=3DcteV ------END PGP MESSAGE----- - -------sinikael-?=_1-16019144539760.06379430448642398 -Content-Type: application/pgp-keys; name=0x6A150653F1800874.asc -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; filename=0x6A150653F1800874.asc -Content-ID: <1edd04a2-4dd6-4f16-9bf7-96e6b2a085d1@flowcrypt> - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: FlowCrypt 1.1.1 Gmail Encryption -Comment: Seamlessly send and receive encrypted email - -xsBNBFyM4vkBCACr8FvuG4MAZsz90hrZ2B+oEznArD46QUbAGrPT8JU6zz27 -SfLmTTbTA86q+DVAZC94CZ2lqJaG7KY7eqHFqJObetA8mcUk0Oo3EshphpK0 -MnNv+bHFpKf/srJgKSDmpCF+JSHeZs2WAPtrdfoTO1KPy5IZexMWdnhYZy8d -0xUr4rPZ7i2UyrkdV3k2O9x4aG5tD1Zo/WkmlTv8z2BtAwAziqUQFxABQLu1 -fzcRkMHTMcGVXrB+73GITl03GbfeJHvFuThhofqP09o/p3Y18Zm+zVWL/T4z -sA5P+Cp6kwnwUnQkL3Tc49a0qIJShlP4LbSbPBqFGWTHxceCkFBkMVoJABEB -AAHNLWRlbmJvbmQ3QGRlbmJvbmQ3LmNvbSA8ZGVuYm9uZDdAZGVuYm9uZDcu -Y29tPsLAfwQQAQgAKQUCXIzjAQYLCQcIAwIJEGoVBlPxgAh0BBUICgIDFgIB -AhkBAhsDAh4BAAoJEGoVBlPxgAh0L2EIAJRM22lnSHhgQ+waiCf0p739L3XK -s2eDZUkxAX+4an654wnn1OjxWrG7lls2GgN1ziKHHdGgxU4PQ8PmQrgyc6F0 -5vmYihRFaVFDQ97xF16+IvO4xiuYMuJk7ovsr5mrlI43CWE4f7GPtmJ7QYTl -xeYW3s7KLqr0TKxqGG8f6qRjy/Q1ky3qnseR5Fp1GjIwijVI2rncfH0lOkNm -BHj4aYugN60HNlUJbosb2vjJkz5dsqe+nY3XVKI6Iqq07I+Jvankn6jyvlMP -8jNLxQMUsqrtBki/C6ett3z+JeP2+2Nh+mp1vDW/kO7gSgRHUEPJ9w/VVIpW -IOTEv+Bsz3l28h7OwE0EXIzjAAEIAJKbKexaP/2HqUAj/DxOebhKqw2ddK5H -sYacv12pHVTEVjOnLQELyroZ1ikO21UK8Z/zng9+8DlCz72SMql+/uZYpoEd -gqMy9PU3zPDzGcAeOr07R56G08l+hUO/i3FMW4v2ZT6gLCInAJ417wSvF4wg -6dJzfrBFkj7o2lyTOwfD87CehQozyGza1cb+yS3ZPC8oc99a1jwSqFYecDI2 -7Cgy7KWSbhSfoPcJG4KPTLDrvVn2Y+U2jxx6OiYXRai8wwlheAmIohmZNpHL -aCQiTZTWRYPKvP0kb6aoN9O4fGhgMh3QAbc2BVwh299rToBieI/zow+I9Ocr -ScejwQNI2VUAEQEAAcLAaQQYAQgAEwUCXIzjAgkQahUGU/GACHQCGwwACgkQ -ahUGU/GACHSfcQf/euBJSXopDZxAVniN9HDQDga+ccwJYWZvyiDOaGSoSxW3 -QDhTOWbCH66GkZiOp9KLObHs54KzoOGaOJbQmhWGR4rwNdGSnp8oWimyyXVE -HHhir2BmT8MZrMC3WpMPmUlY2v9CMFD7hF2OfmXd1M9fuFT41aZQVDgGSdYc -IQchOmUv3NQUiBJyOlp1bF1RT7Yf3UjAQANyENz19fYHKd2yh9Ltv3CYVjwR -B4crQmuESxM87IEXDVNnYOBP0F5WaSQEesFAhjk+cVjxTUfcmM04YEFhedBS -tsV8kWF50ojYgF9te4yRM/zoNRi6SjWLSeEw/zIfvkggDvn1UfA2bGFk8Q== -=RKQi ------END PGP PUBLIC KEY BLOCK----- - -------sinikael-?=_1-16019144539760.06379430448642398-- - - -R5f7b4659 -V1023 -G1601914457.M369521P5731.mail,S=4045,W=4131 - diff --git a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.9 b/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.9 deleted file mode 100644 index 174a894616..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/default/mailboxes/Trash/dbox-Mails/u.9 +++ /dev/null @@ -1,59 +0,0 @@ -2 M1e C607eda21 -N 0000000000000712 -Return-Path: -Delivered-To: default@denbond7.com -Received: from mail.denbond7.com - by mail.denbond7.com with LMTP - id cuhDB85LfF+3EQAAZlazJA - (envelope-from ) - for ; Tue, 06 Oct 2020 10:49:50 +0000 -Received: from localhost (localhost [127.0.0.1]) - by mail.denbond7.com (Postfix) with ESMTP id 19EDBBA0B3F - for ; Tue, 6 Oct 2020 10:49:50 +0000 (UTC) -To: default@denbond7.com -From: android -Subject: Test search by recipients -Message-ID: <89e2cc1d-05cb-587f-dad6-aabd371e439e@denbond7.com> -Date: Tue, 6 Oct 2020 13:49:44 +0300 -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="------------33B87526AB9C6BB1991A38B0" -Content-Language: en-US - -This is a multi-part message in MIME format. ---------------33B87526AB9C6BB1991A38B0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -Test message - - ---------------33B87526AB9C6BB1991A38B0 -Content-Type: text/html; charset=utf-8 -Content-Transfer-Encoding: 8bit - - - - - - - -

Test message

- - - ---------------33B87526AB9C6BB1991A38B0-- - - -R5f7c4bce -V745 -G1601981390.M123156P4535.mail,S=1810,W=1861 - diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/dovecot.list.index.log b/docker-mailserver/maildata_source/denbond7.com/denbond7/dovecot.list.index.log index 2858bd7770c89e0bcfd06ef000e0b6905d4b5b6b..89715877cc91fd0a74866048551213941442143b 100644 GIT binary patch literal 7532 zcmcIoO=w(I6uxQFCaqCNt2WiB0}VB5EJbVWB8!Ja(c(|UB3THX+N4c1joL}2hM<8N zoiqfgP(;B+76T5FMbWHW1wrl3O%W9rE`oO9!bL$Bf_~q<@4R>C=JvifBRyee-p~2@ z&Ub#^OgcIT)x$r(Q`(|Z;dw`VDxV7r3-1?|D)gx?t^W)@|ApXsmDeMjkHQA$6{UI# z!{&G~!aeHYRMA&I^g8gGo+{7M7AFPX;XSdvWR7bQY;mZC2ehR?uV(DDsZt}SkDZt; z%e^XcDOk9@e&TpbYKzeo{h?Pk9{lR}xub`lRO-Y_Uk=3amW%LtL=C8g-6=OZpyv(v z5>Ce980VT3CW+(!h3EdC=8nQg6R(6&05|0IRQY6?F(fY=UYzr}2=m)LH=H+u=T2_Lg44$d_nhj1Uq zAwInQQTNytan0(FB>+Qn+-aIF?hp3()6YHr{1`qdh^>1?df&wY>$qRFuI?4;ivHNX zzxVD%Js#TD)GJA@rOq_hQ4_Bz*H-;A7BLr5KhE2_<=@Ap4s9wnY7Z72P}>t>d;ot^{QiC^Ku_SK^}L(TfWxmn$+b#&goT1W6< zcB|I&)_Tpv(U@_lCBnO9_kpSPP*$x`1@+>@%&hi-y!0ILB1Q5vXG%pluwv*rqORy~ z+ciA+8|v^^kAIFDm@oL$x#z8U$p2u@nhQS3BX7-V*GkQ)zk!##D_6SHyxXn$I{aqT z<3m&PgSl&tR#Zn$A1hDdlLG&`{=81fh^OmMUD5x3`{ZM1QIiVtwVt`vV!Y=X=nMF4 zss17V_vNg=;A2jdy!EGDEA^+oxBlDHynWxN*f*RaKKILKUg2{;o_q5hO*pfA$Jog1 zCA%lFd&E4iH|?1$y8~_7J!;u;n*ehyLfwTwW@x_Kn0wsC_P*tPirCrr++A$ngTBtO zZrO%nGXGl`2*S@h@X8aDc6<&~M8DIV>UVelQ@;yu?k-rpLECH0d3mBQR|JF2h0Bv| z2mQ8rBA?fjr~MwDF88K9)e&Fv4b_(Oht;FM*YOkUCb0|gM7taDqDY)jZK?kU9J;k# zgcI1eR9pITMKEMx7CVXA4o{46J$dQ_kuFacZ%TQJ_hBudf(b2yh z*U-@YC1 z+`I6RiGg;raO`6E)54Iqe^{pjAo!e<&oID9K6!nyPCj3YmM@!|(9U9xXv&1ao zd%j!%H|L#vdT&khsl!-!4q;&JxC6Kg7!zMt61%J&gz?iNaYC3Gr;3C>buh16m~Gyu zFXHwT?|t-wxl8Q!4$H#O17jD%$j+3vU*J#j3Gv3-p%oLcYZu~;c6Y^A5+{@^^;eFk z^TU{87s{1(CH&@cbKQSinybxsC|BZ>9>HN#kAyJLZV+!PPR-XW40-2{zDgcn3QGli zRJfDs&=GF3@?oE|PSo3B*@bFH3|PlnBu-ZT4H$jq=5JxPYe4@Z-ku*fcZuDe(<}@F z=mQtSAv7#<(7d(M^O8T2w9@na20CNbB8*NbSKafYY0opJ*oAVX-2fhPZmt8n(p+u6 z^Y#d#+dUG(z`RDlcf+Z9!@|%?&(C{&UA25oBc5=R)w{Ba5+>1+TD#8Mf5{lQvVWW@ZRrgCFrO5;|Da( zE8Nre42J4SUvu%ZkGrOoXJ0Ss>0%hdgV%?Fe2BRJr?7dWj?G&Z4@1Ck(Ba{tg`p0A zz@uxBg+bt?Wa$xh8#lx@%!!!orKg%^LEC2ui delta 7 OcmaE3wLx~n20j1}IRjz< diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Drafts/dbox-Mails/dovecot.index.log b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Drafts/dbox-Mails/dovecot.index.log index d0b911778f6eb956d51528c8e1801d8f41cc31f2..ab7691bd9b91d8cf155977326438a1534600b33a 100644 GIT binary patch delta 160 zcmaFD_=jo2llq2+hGqr^4uJp$1_mIz%YlJG;6D%mxeNjzf`Nm9k%5yTBc({UtT?kO z6(|B!*A5f}N<&nDl|c!h9N0V$h`MeEAPqB*1*(RTffsCEL4JXxv2JN*N)AME3(!y? HfG7h1Cz2v0 delta 6 Ncmeyv^n`K3695a316Tk6 diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/INBOX/dbox-Mails/dovecot.index.cache b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/INBOX/dbox-Mails/dovecot.index.cache index 371b51a5faf5ab7846e70eea71040ad75eef2b3d..398bc2b492254b52e02547b2341ad46bea14e06d 100644 GIT binary patch literal 88 zcmZSNU}P}5RhM84#0)^d2*eQ}1`sqfH1vXK5fA|c%3=^2%mxx5wVg-X6F5KujK!H% Psd{CZMJ1()ISdQ{HhK-^ literal 416 zcmah^J8r`;45g9`89Q~#P@ubp_6og6D_cxLz?KC{HsB0}hYr1BbD4y!A{5Bd2Ryxx zKA_Cjz{~mbLkR*S{L)3REX%iQBl$rz{G8r3SJXQ-|EC){uobFSulaHZ-Mg!P<63%v zl>k=8n2nC9T!e~!=MD+H%V-mZTpVMIG@-xsZbC?OLOT)X(RC%nCs)%0zKZCyT!XrZb1#ayV;#X8^&+#Sf##=sd-~~dK!0ztu-UmZYVgqt}Iknj47&%eI?tS~+9L)2sK0k-%WB)u-#O}OY z#6CJ;>~HTE^KQRc#FkzxVt*VfVh>&_Vm};!{rE~T@7@7<-yeXT&b|ZI_3sa18eH#h ze*XH#QJk_AIbRBS+X>?to8sDk_0t#YrIeeOWe#k{gHUS{6;|e)oVH}aM6tL=7TbJOoxX3vtWjX~Pq9ro9ggteYDGzXt;NLD|I*UizW zb=j2GI!V|wuZ}Jc`&R~|BpeLa`olGABMF9P*BqL?wwdeg#5rK2lGRc#qsOIP*oN*S*<88p9^@t8EJH4|rP#h|Sqq!p#2QdMmx zKYB*d6s1g(C%}Ml_-3GVL*H%Ej_{m_uKHMl@V@Zr1uncXgvQ6YBip`vsXTuVUWc)t zfa3l}Sr<{nHU%tqlU~rO!eF)fSW+5dBGtK}NW7tQ$uMlDb8u^hvM})*=`Fx(U=Cid)!C;{y!bi z3qxwB?d<$_ryT37e(eVB0YWMWgCH2VYr3weUERlgY(Q{}%wTHkNn?bvK+)`Zfnekm zSs}H}d0ZPcDUFQC$%HF5%0&4$8LRWi<{Il2rUk~CLQt8yV!0G?J!M*;hA}N5kqI)z zwKXu3Dc5Cd=v-z}sT5k62+gkPs`b_3q|q}{_x&^XXsXNLs3owLTRc6lU^jQOwL)vT v&rLs@@A=tz&zZ|pe{Oc{XW_P=eeC+#*N&gP_OQ2oe{Ru}d+A{p&42j;%cX$m diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/dovecot.index.log b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/dovecot.index.log index 7449d80157b7d618f489e5016a0ce28c2cf99aba..4f51bcf9122f2afce03ea8dc29eea809d2aaa417 100644 GIT binary patch literal 2364 zcmbVOJx^3o5S@ixTn*^+6HtnmNU;SZ8?m6Ecm)N;78JxvBg&$XU_e1*D9lTEaf4b| zSZHDl1*M%av9Rz*5aUNE2|U zGzZrOTRNs`x|(3`4+d2|{G+2R^{exD2WRTHXd`+cXjfm9&d^sc?5lKl5R1dmF0v$vheg|E`j=rG_yB*ylm2V%HFaIuY^L;~THaub&awKxp*2fHw8=f#cX$U^7W0gFdZ-^&wmA1e&Lt$yN z1|-+FKyv*6B-dX+a*Yrexefrybqq+Zbs)K>KyrN!B-b}Ua@_!u>rWuLcH%N}tpLe& z6bP=bB@KK|V~>NJTqZA<$<1Z*bD11nCQp~i)n)Q^nVelFZ2&n5^4NOxEljChN6<$y$BKWSpCreB4&G4r9D;Yj7IMaCi zBdlqkAEwjXu{FOs9RagKjH^FaI0Ecrymp9QSD+)`OfO&k^g!Z!NhbSd-@teaM*9 zb`yu(wgg)rE%B@EXEYRS`GzCDVVP)5@;=sgw+VaYxSv`rTdnBZYNfejUv^^;KDTl? zfMETO;hc&xaecSa?weYEC}wwKVP&UHWecz-?A Xoj&Z_r13K!{I3H(bNn*wV9 diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.2 b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.2 deleted file mode 100644 index 9091cce1b9..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.2 +++ /dev/null @@ -1,47 +0,0 @@ -2 M1e C607eda32 -N 000000000000045C -To: default@denbond7.com -From: Denis Bondarenko -X-Pep-Version: 2.0 -Message-ID: <8fcbd0f1-e33b-9b5e-51ee-79d7c639f0bc@denbond7.com> -Date: Mon, 5 Oct 2020 11:32:34 +0300 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 - Thunderbird/68.10.0 -MIME-Version: 1.0 -Subject: Standard message - plane text -Content-Type: multipart/alternative; - boundary="------------D3F69D95534F587EC1BE35A3" -Content-Language: en-US - -This is a multi-part message in MIME format. ---------------D3F69D95534F587EC1BE35A3 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: quoted-printable - -It's a standard message with plane text - - ---------------D3F69D95534F587EC1BE35A3 -Content-Type: text/html; charset=utf-8 -Content-Transfer-Encoding: quoted-printable - - - - - - - - 
It's a standard message with plane text=
-
- - - ---------------D3F69D95534F587EC1BE35A3-- - - -R60586566 -V483 -G1601886754.M203623P2529.mail,S=1116,W=1155 - diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.3 b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.22 similarity index 77% rename from docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.3 rename to docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.22 index 9637e3e18d..c636144046 100644 --- a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.3 +++ b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.22 @@ -1,51 +1,47 @@ -2 M1e C607eda32 -N 000000000000129E +2 M1e C6087c71f +N 000000000000127C To: default@denbond7.com From: Denis Bondarenko -X-Pep-Version: 2.0 -Message-ID: -Date: Mon, 5 Oct 2020 11:40:54 +0300 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 - Thunderbird/68.10.0 -MIME-Version: 1.0 Subject: Standard message + one attachment +Message-ID: <34e7a58b-09ef-8d70-d96d-77ca6dd96570@denbond7.com> +Date: Tue, 27 Apr 2021 11:11:11 +0300 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 + Thunderbird/78.7.1 +MIME-Version: 1.0 Content-Type: multipart/mixed; - boundary="------------9575DD1DBF2C2FFA08F4568A" + boundary="------------F8FEAF85A0D60741A73A616F" Content-Language: en-US This is a multi-part message in MIME format. ---------------9575DD1DBF2C2FFA08F4568A +--------------F8FEAF85A0D60741A73A616F Content-Type: multipart/alternative; - boundary="------------9BD0A609717171AC93BCB3E4" + boundary="------------257E7C9D6EB40410955F57EB" ---------------9BD0A609717171AC93BCB3E4 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: quoted-printable +--------------257E7C9D6EB40410955F57EB +Content-Type: text/plain; charset=utf-8; format=flowed +Content-Transfer-Encoding: 7bit -It's a standard message with plane text and one attachment +It's a standard message with plaintext and one attachment ---------------9BD0A609717171AC93BCB3E4 +--------------257E7C9D6EB40410955F57EB Content-Type: text/html; charset=utf-8 -Content-Transfer-Encoding: quoted-printable +Content-Transfer-Encoding: 7bit - + - 
It's a standard message with plane text=
- and one attachment
+ 
It's a standard message with plaintext and one attachment
---------------9BD0A609717171AC93BCB3E4-- +--------------257E7C9D6EB40410955F57EB-- ---------------9575DD1DBF2C2FFA08F4568A +--------------F8FEAF85A0D60741A73A616F Content-Type: image/png; name="android.png" Content-Transfer-Encoding: base64 @@ -97,10 +93,10 @@ ZAB8ztK9d+JFudK7IvlZ+LwRAD7+RFzCJcnj+4E4gRhA8oD4SEoQla1UkZQggNID4+MvRRGk 8jWSmfB5+8rNB/IR3W5L54rn14LnjZZRSYHxKVOoXYberfIKOyvPGEDTcwXIx88nDaOAH3Zv nt9F/GnE6AWi7FRA+fj+6sJ5TBghnE90Xvay4JyUz8ecf5mtcVMB5+P70/1m/ZOGK93FxdNV mP6sN3vtxcgaQPqMAfQZN+gzbv4Htx68Wm+jVTYAAAAASUVORK5CYII= ---------------9575DD1DBF2C2FFA08F4568A-- +--------------F8FEAF85A0D60741A73A616F--  -R60586566 -V1300 -G1601887254.M821371P2786.mail,S=4766,W=4864 +R6087c71f +V12da +G8a84040a1fc78760ba0500006656b324 diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.23 b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.23 new file mode 100644 index 0000000000..b404df3c30 --- /dev/null +++ b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Sent/dbox-Mails/u.23 @@ -0,0 +1,43 @@ +2 M1e C6087c745 +N 0000000000000439 +To: default@denbond7.com +From: Denis Bondarenko +Subject: Standard message - plaintext +Message-ID: <48a7eaff-2110-354c-e5d1-d4a39cd91356@denbond7.com> +Date: Tue, 27 Apr 2021 11:11:49 +0300 +User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 + Thunderbird/78.7.1 +MIME-Version: 1.0 +Content-Type: multipart/alternative; + boundary="------------05812EC4E0A6747DE761D201" +Content-Language: en-US + +This is a multi-part message in MIME format. +--------------05812EC4E0A6747DE761D201 +Content-Type: text/plain; charset=utf-8; format=flowed +Content-Transfer-Encoding: 7bit + +It's a standard message with plaintext + + +--------------05812EC4E0A6747DE761D201 +Content-Type: text/html; charset=utf-8 +Content-Transfer-Encoding: 7bit + + + + + + + + 
It's a standard message with plaintext
+ + + +--------------05812EC4E0A6747DE761D201-- + + +R6087c745 +V45c +G1843fb2b45c78760270600006656b324 + diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/dovecot.index.cache b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/dovecot.index.cache index c96e0ef567dfe2cb9467ef61b0b4404ee1b2a932..fe28dd03343f1eac6e9585ecfb630b9435b60ba1 100644 GIT binary patch literal 1844 zcmcgs&yUkq5Pn%Gg&Zi90;ROlV>uys!HMH|;{qayZCJ!6tHh}6rQ+G1?3%_uWWTJ~ z9;%g)KwNw5srTM`>mR_KBSJm(AAxyx49PBt)gC(1WM;m3Gn#zk_bSILr19prM=I(P zDWv%&At%t?-QE35BHt7+`R|LFGlyNcupj&V=zi?VvHjQ|Cl7{|wK&f|m$9UR`r_sD zN5^G(B@2Fq+IEnNDW6E-!@N)D=6HsG?gz}tI(cSZ{`?3g^M4~gpOgM!RL&_!DQ)S$ z-6Im;106afN3a=LLLp0)O6BN+R3w8ayZJA{{G2TCIiB#%jQCtYErUoDUJ4!r+u+Y| zz6~TVO15^gz{4#BAx~;AlimWoB&DUM6FE&e^PjH>O)F45g=g@ zLM`E`$cP(6Jl!b+>|4vCAW1-wEkCVwd%fJ2X3%%6zQdf2bt}isj#D`HaIlsmt9>@K z*6(jHXOPEh)@anZW3g2;5Bt_nqdUXFgY{7!t`AoS!&PS^4~CX)4Xu99Dsl^LMi098 zte%sfn{|H3-d7Xy3hDkAssE~=ot&E4(`bK2tYjJdq zYINWU+E5w_t=A2;VW>@dRZ$g1&U6Mqwnh*sU?Z$Elh<=Ib4Id&GL;ZH? z)Vw&nRek?{oW&k@QRR0oWeu{7ZvxV8&>Jgb&-ImYoq?*ltnF&Rv^oIO+rI9#)b?0$ zy*-W36>Z4*nf-QV%O~kOjIX20w@k`t>OKZf7<44KoZ6>hF#%;XneYgxfG46#F5=ls zsIyx_oY&#X=QqbKpS3}6vbL_fOdZ$jjJq!Am}=?ZF0g#7 bdXPP<$mi$xe3izyWiABwwnDsOhuif#x9Z4g literal 584 zcmbVHy-ve05I(mBI#sNd7+6_6z$^4Us1qNprNpspCsI0~3=GVSycvwVNPCB4AqAmI zeA4OrIp66lmICfSpSN5OYjl-V<28ENQ2@26Q99*gfWlbi`)p{h4AwY@ v5%${44V{`!hntaaiTVFu7h^y)?XA~;_uhDT#B}cNGIxIOd|&;qmv^23J*IY{ diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/dovecot.index.log b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/dovecot.index.log index 2dc78b34c52fa03eac3ef9b18854cccf6eda7016..d998c6d39f368b4187af987e7e99197e4b64b7d3 100644 GIT binary patch literal 2260 zcmdUwv1=4j5XRq`T)dM+7SbeYu|>cj2^=P%m^?%S(ZLRI>_4mEEbGNtVB$kd$-n=*SzM1*v?O7R`c9*|BT07->qJ1Ub z+M1^6(}c5Mh+Gr;|C_$hJ9Z4 z2hP=^X7IHWe3)J=haia)HokEBslIuo^>zQ|!RbEiCo%UYz`lrYiBH|C&Yc6VoYZuY@eb34Rl zfW?lQBsor$1Y6ujhQkq2!-QAe`mOcNjS!Qi#E4I}cE2$XIbd~|Uqd{NqMD`Fp?p}N?~KH-7t&D8yzAMS1KZ-h9#8{Cl_zs3QgdZmW-&u-pt~cjy zteur+6G6L+QSmyD3Rmw_e6FHZbQe`$8LE2TpwyJb8+Ma_pryE05is z&#UXfU+B+sq50QwQAd}X>8js*ZmtHOa(JGPnMt>{Z3Y33zqgoUic{gAlvBkn4#>}O zR|;>!=hwZ;crX7yanlU2!jKvl;^s_YuXnS+qp}`P%8f8rLr;%2C-tE-*_KP#M+NLD z9uK~DLd<}^J9-m(W8VqDbm#bwhY`3J01NvPc)I)cZ1@(m>RZq`*zY?(!hMeVL|A1J zZdsJ0EX7*QN4h^mb(BSKq%7j8EP3tzccAS14{Fci{5PmW!}Q|6mjxQZZYTJR*FoR1 I^=#by2IzepQ2+n{ delta 7 Ocmca2ID>721Tz2&i~>&p diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.1 b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.1 deleted file mode 100644 index c88ef677a9..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.1 +++ /dev/null @@ -1,55 +0,0 @@ -2 M1e C607eda32 -N 00000000000005B3 -Return-Path: -Delivered-To: denbond7@denbond7.com -Received: from mail.denbond7.com - by mail.denbond7.com with LMTP - id tmjkJibZel8tBgAAZlazJA - (envelope-from ) - for ; Mon, 05 Oct 2020 08:28:22 +0000 -Received: from localhost (localhost [127.0.0.1]) - by mail.denbond7.com (Postfix) with ESMTP id 9B777A2092A - for ; Mon, 5 Oct 2020 08:28:22 +0000 (UTC) -To: denbond7@denbond7.com -From: Default -X-Pep-Version: 2.0 -Message-ID: -Date: Mon, 5 Oct 2020 11:28:22 +0300 -Mime-Version: 1.0 -Subject: Standard message - plane text -Content-Type: multipart/alternative; - boundary="------------122DE5599D10BFBCB913B469" -Content-Language: en-US - -This is a multi-part message in MIME format. ---------------122DE5599D10BFBCB913B469 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: quoted-printable - -It's a standard message with plane text - - ---------------122DE5599D10BFBCB913B469 -Content-Type: text/html; charset=utf-8 -Content-Transfer-Encoding: quoted-printable - - - - - - - - 
It's a standard message with plane text=
-
- - - ---------------122DE5599D10BFBCB913B469-- - - -R60586566 -V5e2 -G1601886502.M653799P1581.mail,S=1459,W=1506 - diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.2 b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.2 deleted file mode 100644 index 2cabc1aad4..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.2 +++ /dev/null @@ -1,123 +0,0 @@ -2 M1e C607eda32 -N 00000000000018A6 -To: default@denbond7.com -From: Denis Bondarenko -X-Pep-Version: 2.0 -Message-ID: <2a6083e2-f8fe-ec56-3965-b9e64a4903af@denbond7.com> -Date: Mon, 5 Oct 2020 11:31:34 +0300 -User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 - Thunderbird/68.10.0 -MIME-Version: 1.0 -Subject: =?utf-8?Q?p=E2=89=A1p?= -X-Pep-Version: 2.0 -Content-Type: multipart/encrypted; boundary="30886d4054d26c6325f3a10924f53696"; - protocol="application/pgp-encrypted" - - - ---30886d4054d26c6325f3a10924f53696 -Content-Type: application/pgp-encrypted - -Version: 1 ---30886d4054d26c6325f3a10924f53696 -Content-Type: application/octet-stream -Content-Transfer-Encoding: 7bit -Content-Disposition: inline; filename="msg.asc" - ------BEGIN PGP MESSAGE----- - -hQGMA+zVIKimH28DAQwAo9yumOtcV6fCmKNL/3Shdbx7HhPc+zTeVPxvrl82qmPq -tRFsVodLda8DgErAnkVxMwYm35Z7u6HHXptsSqBioiP/PktdbYw+LAV8/YEvFhT3 -uIfSSk4GTcKMsQEP3olmYiBZp92g/2Nm+ps8MOFTaZa/cOon+AACOcxXHJTj64u8 -yUT/Fh/XN/6C/tJ6jR7wauEp6UKv4C/URYobnEsnJBZmdl7pSiWKTdBe7lH+mqpX -mBzCw4v9cEgsVvl6BVxZdyJVa/yJM00lo46AAAP9xPnhalTqDwxRt2Ei43J1Eh9f -Lp5bQPGiD7THS6iXVK1Vam+1nMn8oXRxvS/cR9oV1dUdqHxtfJRokLdIXj51+MmZ -Ce2yLo/iHpEr46LtbMik64B1rXDb8krbixeK6QogjWSJjh3/eOT/RsRmDYNMqds1 -kn1SBdbIGtHdsqtBEfix4DQtUHBKSGzGGLnkQ5O9eoAkrjXwTmL4f6QA4tTPAY5R -jkFZFQWofMA4J96AQhykhQGMAxpKjj8xB/gIAQv/TsHBwkBNNbLasbou1xB0oM1g -xje9YsRSkx5A/UzUkpkk4g7DyNViODqxIkGWkJzlD2Y3IRPe2Xu3LtJN/Zwhp8sn -pzcEz04GhMRID7/ooPkT8fJGXod9XdkHoY525eKtkbFN4N+1VZS5HJKkpg8Yd3fO -HTGBws4SDnMQViuPgKOUS7Iwt9x7zcSfV9u/iX3qAe9CMW1WDpcvEuN0v5rUGCca -/QwEm+M2GY7SaQh7s8B9LFCqV3axnNjm+i2gjdSDl5tUg+NR1wkHmVPa3xDU3tG0 -A8x4R0qupANk5cBzHTT5kYqDh8DCL9Wj1K7v7aBc3txj5L8rFGSn8OOJabRN6Vlo -14hPsewnKFanrLf5eWpZmdoHZKBIa7ojbQHNexH5tyNCOEeutUgnrp1qy5VyH/2n -cgRLLVcw17XpfwZF5CqzY1j/kfnnknjbr1PEI3/9aJ5XKd/dClcGyb/tNm0RhxZd -JXFLL7HXdeduTDE+ITgh037QHMUVONzPU2iszLvl0usBdX2He1hAaOhdMRPKb/8n -HejZNu0xNDzP9h9cuaFZwuH8yeMy/DWxExZ7vBnyuTkEwdHinWuSMAp0W28rq/DH -OH6e9lQdcWE6s0x0lrBk/B3Vvj9l3bFFlhzxXwaUP4h0nfDyAhEafZMh85BWNxLI -UXVosGtpIfsswnwm0PH4RAdvtoFW0WeNdweoeDK2ZTyt485Ab53m9I8JU5CxS9+i -3y6vD5nq6SkPTCkQx3hsww6m3+NBXR1zaX5qMze9pMrLXGCEJ3Ksy9laIFMwpn1m -q7CRe6nOwz5y4qQP+S2cND470N4C6rsHMRc74gl/NAB1bXAe7MYuzmmlCowmXPo8 -hae+mohwz9nHvrSAsjvIp9wAAXqHRjmBrdE2uchjgbozJTFiopPEfHsd5UNhssJL -StP5Vd3WOztyHXWPkkoO5FTwyYYu+DBD8Y2hpTn6p06dcTF3lrPAnsj2gHXBQR12 -7WyfOnTp3JnwPV7z3POCu6avnA1RLC8Ju9SESPv9lUAR9odkJVc2lJKdO9HG+mUg -BvjdA9Tzw+S/mZTApOLbezCTr29Sxw36ji3Xvw0XOvDgSUa6AaHnrMYyioTeHYw0 -WKRmIxM9bzwJ11eGDJvXiPst06+1KXQOJWjUdeInhMcGIecdHiBIIyGlwRvTj3Py -QmPyAWgIp88RHysUftr5E7aV3GmNV1pq5LoI1dO/C6Xk1ULMeSIfcsZqbk2uYORE -i+dMRxG89wDnejQRCBJJdKsSlYkrnt21K/IAf2QWKhFSYGjB3+kzWP2XOUEg2jit -hpXqEgHgK8pImOMuGY1upg9SfzW8VtnOnX6SiYkv+M3hZ1U3XuXR/Ex3hRKxW8uD -If71/1J6bR6uGr0QRdxVla5LOAOwux4TnnOh0BUbsWXCXCU/UWBpQR6bLJF11HI/ -WMVgf7QHAUWfMJ58quJAi6b67JCZvAjSurrsSqkWqGKJ+4kKf8pj9gQ/8euKf9zl -74w/cluQllJgfKOdRcKKtQQ/aReWBt5rBrPPCc/wPyQKZcsuTy8iBwTYNegUUfTc -bWnHdFur095ob0ychaGvTTl7V5xu4pR4u0ZeV4xlqJpSWHXO+rBYIRnK6duHxyMu -9/8yCpAPrDQzzsYKnUoKpaj6lKl4YOKjGENN8bV9Nlsgn4tNSD39qvBASV4t6719 -7RydRQhJNEBe3B17T2DdhTfLdsTDrBrTsgDwCWM63FvjWYsBm0q9o+/wxi6632R5 -2cTjZU1t1iwye9VC2odiDd/ezyud/tMULvRejk5+RFQWpk3Ut4bRqsQ2oYnW0LaY -8UlgQmVR50FBF3MVhi9V+mjoeRtiBWrwf6UpmwIOV9drUIswo6j2r12oX8iE7z3s -wZ/AljccKKywZbUMqskFMasza5ZqftlSp4T8frpHow4A+BbZYbg2tvqCNaDcOR1N -dRY5IENd0z5dnLPhce5tLI2jhz/fhmSMkrqlBZcz8K55YAF6rAhMP+BTfAwQanaS -1T6djYGGtjZ5J876KkiOSbzPiQNA750mOJmz4mVaWjOftUc00qp7bCzvevTbJ41z -Ao3UifMpWUxAL3DMxf/nQOr7brH9X6XkcN1XhsUUoHVZODalaaF7Fevv6IJoGsyk -m0kc1TukVF5PGbbsT5rDCy5EfjLw25fADknvvnNBZTAxAmnnPj6aEPp07BQVryRG -jZhEETLXPD6lSQn5+ItBYVqXQ20FyigjOOLRaNDK9Cgjg5Q6ZZpV7oCXFxtTq9SZ -HXgDHSZw7VmeIau3javrsHj7dDr6n6jhMlo+1LiEIfc1XvAKWJ7U3jXdzQUAetpu -sInXEANNGZmylROlBp1stKeTCI2FOLBzrO6X+ARb5mbwhXmfEG8i/pLPDigxscaZ -KzMnvnwqA++o5kmmHmp8RB/NE7j8gczllY49ywMnJskOpx9zfyUTIxYxSNspJ3nn -n/SsneCWWzQGVlqoeuzHrvnNej0oqMiDtkf6xleB7eusWQiOwrn+beL1v76eYkgQ -ogyl9smL4oshwsKGvOlPIYXUmF6IET5tQehAUXbsF45W3vJsKemYUtD5hnVzj/A9 -lnjjcwiWpTsFCVvZdesKq9D+xZ+4YAdOW3q+FJ+Z56BFCKKKQ1sE9JD1fwR4ezjN -64DL8q7gK/uRIbPPEpQMN4HZXdRmx7zRpSkLM2883ongXZLEm+RSCrcpZCbjlG9j -5Z8oAQSmKKAGwcNkbFZwtJ8Y7uQNyJrsyR1/PHuy20gZJCJ9FDgR+CVzBoN9KyUd -temQul7YWDv74MlMK8HsYSAzKhrTXev8vafv9bEXH0ffxOgQBc0AIJUujDsgZcqI -cjGTJXmEsngC94ZWTVELga1628vZD5XM3W0ZAClI3ho9w9t5V6nhgvjqye6aAq8e -9jBYvz1Zx6E3PuIUHeEPEaemlpqDbrWjS+jmvNz33o607sTILZ7SXXRgdnyoN5It -72To0/JCno3j8TlPilSRSuJmZ0Gk48ibHMmkpRYjXfO1A2Jw/YSKe4oc8OmcsTpD -BcQnbQvX4e+J3HGfzHHawSo02LghGjQY/uaeS7+d4KIMUKF3IS8btTLVZrhJ/nQV -QT5fJaXV7sK4rnWbbIPRDhc0zy9kZh+vYZBVGqM26fh3hV8bdXL5Uxi8hsOnnD4e -M/9ZrvISQW7p39QTkD7nviT8ZVTYf4i0WHF1E/FXzgYb1hIK3O0HMwsSyB3uHvsS -C3Nivtf/Zkg9vny5r/5bO+pPLhxwyNBy/e2IU2ccPFrev0IDEaW9ZrQVXZ8O1pij -zdoslPfRH6UMmX5UGaj69BJ+A7EBBU/1Hui5WJiUyGEPwjylBb3XUiyL/zaC/Bpx -zPgd5kVXLoSzZHEuz4y8wxfUt/UwuSJipmLICri9QUkoRjB9ewLz0WZIg1JpmUGG -dgGiRNkMYQ3F2lNETZzexPWzkkcJRaESi9SjKaQWgnyqTQ1z1sSmbokOBCxhJDHm -wZjoGzrOCxGae73nnQMrDZFS9I0RcSY3obw2EBttI0Zs4UW02ZKt13fzA3qMFcBH -44UgkSqNrZlsn21nqVuU56iMCVy5ogZCAz68M0uodogjC1X9WOUUkAzCMndA0684 -itDQg1jyA8hpVGw/0ee/OehYLvt2zqC1wY9Wv0WsjwwimoUQT+dksPCCPga+lmBs -upYfIAx771vyRIuM+JRzNDWlrXDBZFrvQ4s55JN+TCquDnp8O7NixqK2ZJRD1+nt -R3VhnULrCQpCK0zm6zggwImDPj1tQQ4wmB/3Pm4Hf0qr13V4GiKz10SLU7MNw+Bf -ZkJw6SXGs4id862fna7fiWi+k8KyN66UitdiLIMMDj7c4fgUzMzgGHkoR9Mp7VA4 -YYQnysJNEv2tgj5QqZCOWJw5nHIgQk+AIaFwBiSGwXVqaPmfFDB0cNvEkhjgPhDm -u6C1R8jXP/5B3kUGebiQI8UDHameUCoruDxKcOzTgQ76iO4nT3XTQmwxnlftZ/Ud -Byv7UZld/KuXJPhFoM2CYsB00oJcjSRK21S3hj/6KTw+5eMK1QAcqUX0qDLPs94G -CGyZS1d7z3hPNAkywx9yTj2+hItnJevF8VKluCViPhQuQjM3x10KKnpxRDCGvnfc -52lGQXyXNJkX/P2s+qZ1sfmKKwE8EkxZ90warmdibsEJcnnBCbMqiDxQ2Npc2ykt -nfFKTrhFsIAjz2N7jmAK34KzK0L/XKSc2BX38l+HyYJXWUcBTEAA23A/0lXPef7k -/nwMJNiHqRS5R1+lkFjYKt2+pvW/0VnbWVckEX7CeL+CGG+kUpv7Qs1yBpxJtcub -txPVg7jZlW4BXzPuN508j5pKdb92mAQDxiI9T6ha8hH8eAuIQKH4uo+X/FYP86Es -KrMv3kkt08MkJcWP77+gbvmVtgTKaJyN+m/DST9eq3nuCt1nG/jtcEKO3p7g0Qty -80jVYON7TNBGY1QHgGpVVxpBu8AChJRN7CYPxUXnvf2HX5J6bc1K4FWU2kECEBSD -gQKMt6Qbv83UNTxVA330nKn655vZm9yd87WEIfXIkyjtQb/PXH75pbIo7X4287By -lcF+1iOit1wyeAjpVV/7IlG1nBnnDSMetJWKsyS2Me+huL73jLI3ijNk+UNHTibo -X1KQtXHMrBN6fm4BBQOG+HVUTTX1cdgDOaIdouVnSUkuKob/OXtFS/em+EbWPmqi -wXMhIXJCDcFUnr3wRUsPV3V4ynx5WpsQhO+5W9mdnwJXscLqRffVBj4mwN8hY6rR -7BldFcTjaoxWmG41AQO/k33aidJWbRP/X9Os9FDtKsPtRG3Czk8iUUb2dL2uThQJ -HUdqiA3JmKHdAeMn8wx7YLB+/xGzOGVIXUs= -=n60c ------END PGP MESSAGE----- - ---30886d4054d26c6325f3a10924f53696-- - - -R60586566 -V1919 -G1601886694.M674544P2295.mail,S=6310,W=6425 - diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.3 b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.3 deleted file mode 100644 index 01a3387fca..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.3 +++ /dev/null @@ -1,38 +0,0 @@ -2 M1e C607eda32 -N 0000000000000474 -Content-Type: multipart/mixed; - boundary="----sinikael-?=_1-16018988160880.5992817679438005" -To: default@denbond7.com -From: denbond7@denbond7.com -Subject: Fsdf -Date: Mon, 05 Oct 2020 11:53:36 +0000 -Message-Id: <1601898816089-616d20b3-45f55a08-a78e6781@denbond7.com> -MIME-Version: 1.0 -User-Agent: FlowCrypt_Android_1.1.1_devTest_111__2020_10_05 - -------sinikael-?=_1-16018988160880.5992817679438005 -Content-Type: text/plain -Content-Transfer-Encoding: quoted-printable - ------BEGIN PGP MESSAGE----- -Version: FlowCrypt 1.1.1 Gmail Encryption -Comment: Seamlessly send and receive encrypted email - -wcBMA4TliSjOppkvAQf+OvZNzBdw/hhsEsYZg1xSYVAZqEufxNvMtblP+xR1 -gIIQsBLhNkx41/gDzguuTowgyh/Tsf0YAHXv+xQgvtz8R5cvMJL3rF/FkrUG -pawRbgVXNfeQeRFQYdRJRwWd0lSq7Uodm9o623SVbzhdea5POGeZ9UwdKQTr -mHXU/Dq5sBCtY3FvUJNla83tHyrKGvfMBJBe1NE700BnF5CtCzYt8HtJXXL7 -cAaaVpmJXIn9L51RVWnofPxXzEDxXRSVOFwT7S11h58zIieImO9Xw8K1Zt70 -O6IWAJTxuCfg26boTq8TBqK5/YJP/3ld7NBvD94oejlpYXFMhUphwu/mMbre -O9I9AaFLOOZe2O0e2lXZ7R6CmpEcESO/cgLJ1O04Nqp9oVXTBNxphJe+VV2S -RyUrPbYcH0Lm2AyPTCClyQrjOg=3D=3D -=3DWVdo ------END PGP MESSAGE----- - -------sinikael-?=_1-16018988160880.5992817679438005-- - - -R60586566 -V492 -G1601898819.M209454P11127.mail,S=1140,W=1170 - diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.4 b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.4 deleted file mode 100644 index 47084d5c09..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.4 +++ /dev/null @@ -1,44 +0,0 @@ -2 M1e C607eda32 -N 0000000000000605 -Content-Type: multipart/mixed; - boundary="----sinikael-?=_1-16018903292560.36132483955245775" -To: default@denbond7.com -From: denbond7@denbond7.com -Subject: Simple encrypted message -Date: Mon, 05 Oct 2020 09:32:09 +0000 -Message-Id: <1601890329261-b32c7767-b765f189-3aa5b25b@denbond7.com> -MIME-Version: 1.0 -User-Agent: FlowCrypt_Android_1.1.1_dev_111__2020_09_25 - -------sinikael-?=_1-16018903292560.36132483955245775 -Content-Type: text/plain -Content-Transfer-Encoding: quoted-printable - ------BEGIN PGP MESSAGE----- -Version: FlowCrypt 1.1.1 Gmail Encryption -Comment: Seamlessly send and receive encrypted email - -wcBMA0HJ2AYtijsRAQgAj7pYAgik33uN9G77NQojcPIKSNOeHDL2tPi4jG2K -Aty941nsZphFixGqInWWiumQX8jq+wy9nQh+pTYVT1zWKvZYpcsDHEiTDgsi -XUF0eyRrr/tMEHJxFa2t061WzqMRvhLrYqMQHZe2qivlSxB2LEd0Tshh0drM -lpCcIOxOpGbm6WBtuS0YmRYmOEuB7VdLjWiYkhwTPBDeRAZDNwY/1pjpxSjY -pdfIHDclDunPAt4o/lCYkGXd49y3QNPGwbV+4aRT82Ufvh3AoFcUcPLJFBH0 -v+SWA7mg+kHZDRri0eYxQlyTDY5Vo7+PktsNBR+mE9CMwBet8tbdi9o1ZFAp -ssHATAOE5YkozqaZLwEH/0mbbvRtribZjXRBjwC5pbjCkaGMX3muT5ChiUU7 -5kV799aNa3NJPLTzeGYfbxFYJ9je4q4RxX16lG4mVJmW2q7LKLzbAZkRUjRB -3zmnPe2RHWMm6drhkvA+vHOwn9Mis/eilMutJ9/H3jUt0pNhYV/SB6VBUWzI -keI25nUZuvZ0h/0yb1dbx/6ynUS3TWi6/Tu3oI0QGVJW3QvIVXftx4I6NgEQ -u1Or2ojd8Vnuw/L3WRv5BPcMNm/R9LdrT2rfs28LdLPjyjGCNQs8oXSI4wcl -GqZ7j3SinmC1KZt4tzZeYUx5PgeSOFpki9nWnMvInXiJyvc3obEK8sESGuhY -XMfSTQFO0tPW7uHIQICzTFUet0meErFoWlDDAMd2//Vyr48NMQaDF6L2h6oG -GU7eTPX69P4q1Tr/jI8sZmScE7VXUcPHVgfz06lulM+5NMFc -=3DaWAB ------END PGP MESSAGE----- - -------sinikael-?=_1-16018903292560.36132483955245775-- - - -R60586566 -V629 -G1601890332.M568482P18428.mail,S=1541,W=1577 - diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.5 b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.5 deleted file mode 100644 index 8fd5655dd4..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.5 +++ /dev/null @@ -1,85 +0,0 @@ -2 M1e C607eda32 -N 0000000000000E4D -Content-Type: multipart/mixed; - boundary="----sinikael-?=_1-16019144539760.06379430448642398" -To: default@denbond7.com -From: denbond7@denbond7.com -Subject: Simple encrypted message + pub key -Date: Mon, 05 Oct 2020 16:14:13 +0000 -Message-Id: <90049050.0.1601914456206@localhost> -MIME-Version: 1.0 -User-Agent: FlowCrypt_Android_1.1.1_dev_111__2020_10_05 - -------sinikael-?=_1-16019144539760.06379430448642398 -Content-Type: text/plain -Content-Transfer-Encoding: quoted-printable - ------BEGIN PGP MESSAGE----- -Version: FlowCrypt 1.1.1 Gmail Encryption -Comment: Seamlessly send and receive encrypted email - -wcBMA0HJ2AYtijsRAQf9FXpEpyfYsQV1NNxMlR6TjIZga7URvFddBzbOqewi -AxRLMxM2y4JOWo1KkBomG4Y0jDJyJjSizt4UyOPGhHgbAC6jd+QOgTSxQ0f3 -7kVsJqbe6oZTZLh7ux8aPTqND4YasJtnufakQk/CQIZM4WMB5jzUjNyhI3uQ -c43N8ynUrnnns1fcIOb1CHTf96wJnxs3wr/C8FBZuEUZ7ueevqXoXKsUu0u9 -OxQE8Ks1PxnaIYwbM7l1DEIhw2t06yumNMfHLbfVY+e/Y/75OR4r11KnxxKi -ADaF16kxW2Dq1F02K/K+MTQ75aZAj5i9NAHbjlzyD5pDXPS33ei/Iu2GKsU6 -VsHATAOE5YkozqaZLwEH/irWq1dCsR/IpBXii3F3qW+GN0/Y+xNtXX8TKU+S -1CPXTE44+2NjW1kaUb9w+90ZqSfScxnuD1kn3tdGA+t+16Ztu6T5a1tDb/4+ -eNM3ENKb44DQKKeM3dFce7fkw+z4VAs8mktalMMru30chpnd8I7k0bWB6Knr -AxB4jhIw/4MjnoLt8Y1Le2HFY8IGnX42N1R4LpFVrrXMeVak++FojyfzxE1f -FUN2N1C93uBYup4DGayIeM14raEL9hUUnkmg5uedaqvzuo9lQ6nAV0X3gjVE -KcSVf0J2rZgJ0XRx4knxEPcS0rGH9WYNzpMqqjENK26JuQAEPlTxnouKz9ZC -khbSYQEkd6DmvwrYbmwJQeLUiD50jLVO79AUm1pcnGdYaHap+t6e5BVj2uSL -KiBzl160F3++zr+VvTfnJi99fYioqT2mfZJao2H8SVEdKrvHi10oWdR6xeDY -shHgloREj/qWt30=3D -=3DcteV ------END PGP MESSAGE----- - -------sinikael-?=_1-16019144539760.06379430448642398 -Content-Type: application/pgp-keys; name=0x6A150653F1800874.asc -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; filename=0x6A150653F1800874.asc -Content-ID: <1edd04a2-4dd6-4f16-9bf7-96e6b2a085d1@flowcrypt> - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: FlowCrypt 1.1.1 Gmail Encryption -Comment: Seamlessly send and receive encrypted email - -xsBNBFyM4vkBCACr8FvuG4MAZsz90hrZ2B+oEznArD46QUbAGrPT8JU6zz27 -SfLmTTbTA86q+DVAZC94CZ2lqJaG7KY7eqHFqJObetA8mcUk0Oo3EshphpK0 -MnNv+bHFpKf/srJgKSDmpCF+JSHeZs2WAPtrdfoTO1KPy5IZexMWdnhYZy8d -0xUr4rPZ7i2UyrkdV3k2O9x4aG5tD1Zo/WkmlTv8z2BtAwAziqUQFxABQLu1 -fzcRkMHTMcGVXrB+73GITl03GbfeJHvFuThhofqP09o/p3Y18Zm+zVWL/T4z -sA5P+Cp6kwnwUnQkL3Tc49a0qIJShlP4LbSbPBqFGWTHxceCkFBkMVoJABEB -AAHNLWRlbmJvbmQ3QGRlbmJvbmQ3LmNvbSA8ZGVuYm9uZDdAZGVuYm9uZDcu -Y29tPsLAfwQQAQgAKQUCXIzjAQYLCQcIAwIJEGoVBlPxgAh0BBUICgIDFgIB -AhkBAhsDAh4BAAoJEGoVBlPxgAh0L2EIAJRM22lnSHhgQ+waiCf0p739L3XK -s2eDZUkxAX+4an654wnn1OjxWrG7lls2GgN1ziKHHdGgxU4PQ8PmQrgyc6F0 -5vmYihRFaVFDQ97xF16+IvO4xiuYMuJk7ovsr5mrlI43CWE4f7GPtmJ7QYTl -xeYW3s7KLqr0TKxqGG8f6qRjy/Q1ky3qnseR5Fp1GjIwijVI2rncfH0lOkNm -BHj4aYugN60HNlUJbosb2vjJkz5dsqe+nY3XVKI6Iqq07I+Jvankn6jyvlMP -8jNLxQMUsqrtBki/C6ett3z+JeP2+2Nh+mp1vDW/kO7gSgRHUEPJ9w/VVIpW -IOTEv+Bsz3l28h7OwE0EXIzjAAEIAJKbKexaP/2HqUAj/DxOebhKqw2ddK5H -sYacv12pHVTEVjOnLQELyroZ1ikO21UK8Z/zng9+8DlCz72SMql+/uZYpoEd -gqMy9PU3zPDzGcAeOr07R56G08l+hUO/i3FMW4v2ZT6gLCInAJ417wSvF4wg -6dJzfrBFkj7o2lyTOwfD87CehQozyGza1cb+yS3ZPC8oc99a1jwSqFYecDI2 -7Cgy7KWSbhSfoPcJG4KPTLDrvVn2Y+U2jxx6OiYXRai8wwlheAmIohmZNpHL -aCQiTZTWRYPKvP0kb6aoN9O4fGhgMh3QAbc2BVwh299rToBieI/zow+I9Ocr -ScejwQNI2VUAEQEAAcLAaQQYAQgAEwUCXIzjAgkQahUGU/GACHQCGwwACgkQ -ahUGU/GACHSfcQf/euBJSXopDZxAVniN9HDQDga+ccwJYWZvyiDOaGSoSxW3 -QDhTOWbCH66GkZiOp9KLObHs54KzoOGaOJbQmhWGR4rwNdGSnp8oWimyyXVE -HHhir2BmT8MZrMC3WpMPmUlY2v9CMFD7hF2OfmXd1M9fuFT41aZQVDgGSdYc -IQchOmUv3NQUiBJyOlp1bF1RT7Yf3UjAQANyENz19fYHKd2yh9Ltv3CYVjwR -B4crQmuESxM87IEXDVNnYOBP0F5WaSQEesFAhjk+cVjxTUfcmM04YEFhedBS -tsV8kWF50ojYgF9te4yRM/zoNRi6SjWLSeEw/zIfvkggDvn1UfA2bGFk8Q== -=RKQi ------END PGP PUBLIC KEY BLOCK----- - -------sinikael-?=_1-16019144539760.06379430448642398-- - - -R60586566 -Ve9a -G1601914457.M322574P5710.mail,S=3661,W=3738 - diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.6 b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.6 deleted file mode 100644 index 13a4c06783..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.6 +++ /dev/null @@ -1,85 +0,0 @@ -2 M1e C607eda32 -N 0000000000000E4D -Content-Type: multipart/mixed; - boundary="----sinikael-?=_1-16019144539760.06379430448642398" -To: default@denbond7.com -From: denbond7@denbond7.com -Subject: Simple encrypted message + pub key -Date: Mon, 05 Oct 2020 16:14:13 +0000 -Message-Id: <90049050.0.1601914456206@localhost> -MIME-Version: 1.0 -User-Agent: FlowCrypt_Android_1.1.1_dev_111__2020_10_05 - -------sinikael-?=_1-16019144539760.06379430448642398 -Content-Type: text/plain -Content-Transfer-Encoding: quoted-printable - ------BEGIN PGP MESSAGE----- -Version: FlowCrypt 1.1.1 Gmail Encryption -Comment: Seamlessly send and receive encrypted email - -wcBMA0HJ2AYtijsRAQf9FXpEpyfYsQV1NNxMlR6TjIZga7URvFddBzbOqewi -AxRLMxM2y4JOWo1KkBomG4Y0jDJyJjSizt4UyOPGhHgbAC6jd+QOgTSxQ0f3 -7kVsJqbe6oZTZLh7ux8aPTqND4YasJtnufakQk/CQIZM4WMB5jzUjNyhI3uQ -c43N8ynUrnnns1fcIOb1CHTf96wJnxs3wr/C8FBZuEUZ7ueevqXoXKsUu0u9 -OxQE8Ks1PxnaIYwbM7l1DEIhw2t06yumNMfHLbfVY+e/Y/75OR4r11KnxxKi -ADaF16kxW2Dq1F02K/K+MTQ75aZAj5i9NAHbjlzyD5pDXPS33ei/Iu2GKsU6 -VsHATAOE5YkozqaZLwEH/irWq1dCsR/IpBXii3F3qW+GN0/Y+xNtXX8TKU+S -1CPXTE44+2NjW1kaUb9w+90ZqSfScxnuD1kn3tdGA+t+16Ztu6T5a1tDb/4+ -eNM3ENKb44DQKKeM3dFce7fkw+z4VAs8mktalMMru30chpnd8I7k0bWB6Knr -AxB4jhIw/4MjnoLt8Y1Le2HFY8IGnX42N1R4LpFVrrXMeVak++FojyfzxE1f -FUN2N1C93uBYup4DGayIeM14raEL9hUUnkmg5uedaqvzuo9lQ6nAV0X3gjVE -KcSVf0J2rZgJ0XRx4knxEPcS0rGH9WYNzpMqqjENK26JuQAEPlTxnouKz9ZC -khbSYQEkd6DmvwrYbmwJQeLUiD50jLVO79AUm1pcnGdYaHap+t6e5BVj2uSL -KiBzl160F3++zr+VvTfnJi99fYioqT2mfZJao2H8SVEdKrvHi10oWdR6xeDY -shHgloREj/qWt30=3D -=3DcteV ------END PGP MESSAGE----- - -------sinikael-?=_1-16019144539760.06379430448642398 -Content-Type: application/pgp-keys; name=0x6A150653F1800874.asc -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; filename=0x6A150653F1800874.asc -Content-ID: <1edd04a2-4dd6-4f16-9bf7-96e6b2a085d1@flowcrypt> - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: FlowCrypt 1.1.1 Gmail Encryption -Comment: Seamlessly send and receive encrypted email - -xsBNBFyM4vkBCACr8FvuG4MAZsz90hrZ2B+oEznArD46QUbAGrPT8JU6zz27 -SfLmTTbTA86q+DVAZC94CZ2lqJaG7KY7eqHFqJObetA8mcUk0Oo3EshphpK0 -MnNv+bHFpKf/srJgKSDmpCF+JSHeZs2WAPtrdfoTO1KPy5IZexMWdnhYZy8d -0xUr4rPZ7i2UyrkdV3k2O9x4aG5tD1Zo/WkmlTv8z2BtAwAziqUQFxABQLu1 -fzcRkMHTMcGVXrB+73GITl03GbfeJHvFuThhofqP09o/p3Y18Zm+zVWL/T4z -sA5P+Cp6kwnwUnQkL3Tc49a0qIJShlP4LbSbPBqFGWTHxceCkFBkMVoJABEB -AAHNLWRlbmJvbmQ3QGRlbmJvbmQ3LmNvbSA8ZGVuYm9uZDdAZGVuYm9uZDcu -Y29tPsLAfwQQAQgAKQUCXIzjAQYLCQcIAwIJEGoVBlPxgAh0BBUICgIDFgIB -AhkBAhsDAh4BAAoJEGoVBlPxgAh0L2EIAJRM22lnSHhgQ+waiCf0p739L3XK -s2eDZUkxAX+4an654wnn1OjxWrG7lls2GgN1ziKHHdGgxU4PQ8PmQrgyc6F0 -5vmYihRFaVFDQ97xF16+IvO4xiuYMuJk7ovsr5mrlI43CWE4f7GPtmJ7QYTl -xeYW3s7KLqr0TKxqGG8f6qRjy/Q1ky3qnseR5Fp1GjIwijVI2rncfH0lOkNm -BHj4aYugN60HNlUJbosb2vjJkz5dsqe+nY3XVKI6Iqq07I+Jvankn6jyvlMP -8jNLxQMUsqrtBki/C6ett3z+JeP2+2Nh+mp1vDW/kO7gSgRHUEPJ9w/VVIpW -IOTEv+Bsz3l28h7OwE0EXIzjAAEIAJKbKexaP/2HqUAj/DxOebhKqw2ddK5H -sYacv12pHVTEVjOnLQELyroZ1ikO21UK8Z/zng9+8DlCz72SMql+/uZYpoEd -gqMy9PU3zPDzGcAeOr07R56G08l+hUO/i3FMW4v2ZT6gLCInAJ417wSvF4wg -6dJzfrBFkj7o2lyTOwfD87CehQozyGza1cb+yS3ZPC8oc99a1jwSqFYecDI2 -7Cgy7KWSbhSfoPcJG4KPTLDrvVn2Y+U2jxx6OiYXRai8wwlheAmIohmZNpHL -aCQiTZTWRYPKvP0kb6aoN9O4fGhgMh3QAbc2BVwh299rToBieI/zow+I9Ocr -ScejwQNI2VUAEQEAAcLAaQQYAQgAEwUCXIzjAgkQahUGU/GACHQCGwwACgkQ -ahUGU/GACHSfcQf/euBJSXopDZxAVniN9HDQDga+ccwJYWZvyiDOaGSoSxW3 -QDhTOWbCH66GkZiOp9KLObHs54KzoOGaOJbQmhWGR4rwNdGSnp8oWimyyXVE -HHhir2BmT8MZrMC3WpMPmUlY2v9CMFD7hF2OfmXd1M9fuFT41aZQVDgGSdYc -IQchOmUv3NQUiBJyOlp1bF1RT7Yf3UjAQANyENz19fYHKd2yh9Ltv3CYVjwR -B4crQmuESxM87IEXDVNnYOBP0F5WaSQEesFAhjk+cVjxTUfcmM04YEFhedBS -tsV8kWF50ojYgF9te4yRM/zoNRi6SjWLSeEw/zIfvkggDvn1UfA2bGFk8Q== -=RKQi ------END PGP PUBLIC KEY BLOCK----- - -------sinikael-?=_1-16019144539760.06379430448642398-- - - -R60586566 -Ve9a -G1618926130.M453346P25.mail.denbond7.com,S=3661,W=3738 - diff --git a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.7 b/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.7 deleted file mode 100644 index c983167c12..0000000000 --- a/docker-mailserver/maildata_source/denbond7.com/denbond7/mailboxes/Trash/dbox-Mails/u.7 +++ /dev/null @@ -1,44 +0,0 @@ -2 M1e C607eda32 -N 0000000000000605 -Content-Type: multipart/mixed; - boundary="----sinikael-?=_1-16018903292560.36132483955245775" -To: default@denbond7.com -From: denbond7@denbond7.com -Subject: Simple encrypted message -Date: Mon, 05 Oct 2020 09:32:09 +0000 -Message-Id: <1601890329261-b32c7767-b765f189-3aa5b25b@denbond7.com> -MIME-Version: 1.0 -User-Agent: FlowCrypt_Android_1.1.1_dev_111__2020_09_25 - -------sinikael-?=_1-16018903292560.36132483955245775 -Content-Type: text/plain -Content-Transfer-Encoding: quoted-printable - ------BEGIN PGP MESSAGE----- -Version: FlowCrypt 1.1.1 Gmail Encryption -Comment: Seamlessly send and receive encrypted email - -wcBMA0HJ2AYtijsRAQgAj7pYAgik33uN9G77NQojcPIKSNOeHDL2tPi4jG2K -Aty941nsZphFixGqInWWiumQX8jq+wy9nQh+pTYVT1zWKvZYpcsDHEiTDgsi -XUF0eyRrr/tMEHJxFa2t061WzqMRvhLrYqMQHZe2qivlSxB2LEd0Tshh0drM -lpCcIOxOpGbm6WBtuS0YmRYmOEuB7VdLjWiYkhwTPBDeRAZDNwY/1pjpxSjY -pdfIHDclDunPAt4o/lCYkGXd49y3QNPGwbV+4aRT82Ufvh3AoFcUcPLJFBH0 -v+SWA7mg+kHZDRri0eYxQlyTDY5Vo7+PktsNBR+mE9CMwBet8tbdi9o1ZFAp -ssHATAOE5YkozqaZLwEH/0mbbvRtribZjXRBjwC5pbjCkaGMX3muT5ChiUU7 -5kV799aNa3NJPLTzeGYfbxFYJ9je4q4RxX16lG4mVJmW2q7LKLzbAZkRUjRB -3zmnPe2RHWMm6drhkvA+vHOwn9Mis/eilMutJ9/H3jUt0pNhYV/SB6VBUWzI -keI25nUZuvZ0h/0yb1dbx/6ynUS3TWi6/Tu3oI0QGVJW3QvIVXftx4I6NgEQ -u1Or2ojd8Vnuw/L3WRv5BPcMNm/R9LdrT2rfs28LdLPjyjGCNQs8oXSI4wcl -GqZ7j3SinmC1KZt4tzZeYUx5PgeSOFpki9nWnMvInXiJyvc3obEK8sESGuhY -XMfSTQFO0tPW7uHIQICzTFUet0meErFoWlDDAMd2//Vyr48NMQaDF6L2h6oG -GU7eTPX69P4q1Tr/jI8sZmScE7VXUcPHVgfz06lulM+5NMFc -=3DaWAB ------END PGP MESSAGE----- - -------sinikael-?=_1-16018903292560.36132483955245775-- - - -R60586566 -V629 -G1618926130.M453347P25.mail.denbond7.com,S=1541,W=1577 - From 5861b8d7184279cd165c03df28055bdd055eef7a Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Tue, 27 Apr 2021 11:55:35 +0300 Subject: [PATCH 11/14] Fixed KeyStoreCryptoManagerTest after the code refactoring.| #1191 --- .../security/KeyStoreCryptoManagerTest.kt | 49 ++++++++++++------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/security/KeyStoreCryptoManagerTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/security/KeyStoreCryptoManagerTest.kt index 581da3a24b..01e47ce0c0 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/security/KeyStoreCryptoManagerTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/security/KeyStoreCryptoManagerTest.kt @@ -39,8 +39,8 @@ import javax.mail.internet.MimeMessage @RunWith(AndroidJUnit4::class) class KeyStoreCryptoManagerTest { private val originalData = IOUtils.toString(InstrumentationRegistry - .getInstrumentation().context.assets.open("messages/mime/standard_msg_info_plain_text" + - ".txt"), StandardCharsets.UTF_8) + .getInstrumentation().context.assets.open( + "messages/mime/standard_msg_info_plaintext.txt"), StandardCharsets.UTF_8) @Before fun setUp() { @@ -61,25 +61,30 @@ class KeyStoreCryptoManagerTest { @Test fun testDataAsStream() { - val msg = MimeMessage(Session.getInstance(Properties()), InstrumentationRegistry - .getInstrumentation().context.assets.open("messages/mime/standard_msg_info_plaintext.txt")) + val msg = MimeMessage(Session.getInstance(Properties()), + InstrumentationRegistry.getInstrumentation().context.assets.open( + "messages/mime/standard_msg_info_plaintext.txt")) val cipherForEncryption = KeyStoreCryptoManager.getCipherForEncryption() val byteArrayOutputStream = ByteArrayOutputStream() - val base64OutputStream = Base64OutputStream(byteArrayOutputStream, KeyStoreCryptoManager.BASE64_FLAGS) + val base64OutputStream = Base64OutputStream(byteArrayOutputStream, + KeyStoreCryptoManager.BASE64_FLAGS) val outputStream = CipherOutputStream(base64OutputStream, cipherForEncryption) outputStream.use { - byteArrayOutputStream.write(Base64.encodeToString(cipherForEncryption.iv, KeyStoreCryptoManager.BASE64_FLAGS).toByteArray()) + byteArrayOutputStream.write(Base64.encodeToString(cipherForEncryption.iv, + KeyStoreCryptoManager.BASE64_FLAGS).toByteArray()) byteArrayOutputStream.write("\n".toByteArray()) msg.writeTo(outputStream) it.flush() } - val cipherForDecryption = KeyStoreCryptoManager.getCipherForDecryption(Base64.encodeToString(cipherForEncryption.iv, KeyStoreCryptoManager.BASE64_FLAGS)) + val cipherForDecryption = KeyStoreCryptoManager.getCipherForDecryption( + Base64.encodeToString(cipherForEncryption.iv, KeyStoreCryptoManager.BASE64_FLAGS)) val byteArrayInputStream = ByteArrayInputStream(byteArrayOutputStream.toByteArray()) - val base64InputStream = Base64InputStream(byteArrayInputStream, KeyStoreCryptoManager.BASE64_FLAGS) + val base64InputStream = Base64InputStream(byteArrayInputStream, + KeyStoreCryptoManager.BASE64_FLAGS) val inputStream = CipherInputStream(base64InputStream, cipherForDecryption) val outputStreamFoResult = ByteArrayOutputStream() @@ -95,25 +100,29 @@ class KeyStoreCryptoManagerTest { inputStream.copyTo(outputStreamFoResult) val decodedDataAsString = String(outputStreamFoResult.toByteArray()) - assertTrue(originalData.replace("\r\n".toRegex(), "\n") == decodedDataAsString.replace("\r\n".toRegex(), "\n")) + assertTrue(originalData.replace("\r\n".toRegex(), "\n") == + decodedDataAsString.replace("\r\n".toRegex(), "\n")) } @Test fun testDataAsStreamFromCacheManager() { - val msg = MimeMessage(Session.getInstance(Properties()), InstrumentationRegistry - .getInstrumentation().context.assets.open("messages/mime/standard_msg_info_plaintext.txt")) + val msg = MimeMessage(Session.getInstance(Properties()), + InstrumentationRegistry.getInstrumentation().context.assets.open( + "messages/mime/standard_msg_info_plaintext.txt")) val key = "temp" val editor = MsgsCacheManager.diskLruCache.edit(key) ?: return val bufferedSink = editor.newSink(0).buffer() val outputStreamOfBufferedSink = bufferedSink.outputStream() val cipherForEncryption = KeyStoreCryptoManager.getCipherForEncryption() - val base64OutputStream = Base64OutputStream(outputStreamOfBufferedSink, KeyStoreCryptoManager.BASE64_FLAGS) + val base64OutputStream = Base64OutputStream(outputStreamOfBufferedSink, + KeyStoreCryptoManager.BASE64_FLAGS) val outputStream = CipherOutputStream(base64OutputStream, cipherForEncryption) try { outputStream.use { - outputStreamOfBufferedSink.write(Base64.encodeToString(cipherForEncryption.iv, KeyStoreCryptoManager.BASE64_FLAGS).toByteArray()) + outputStreamOfBufferedSink.write(Base64.encodeToString(cipherForEncryption.iv, + KeyStoreCryptoManager.BASE64_FLAGS).toByteArray()) outputStreamOfBufferedSink.write("\n".toByteArray()) msg.writeTo(it) bufferedSink.flush() @@ -125,12 +134,15 @@ class KeyStoreCryptoManagerTest { } val snapshot = MsgsCacheManager.getMsgSnapshot(key) ?: throw IllegalArgumentException() - val inputStreamFromUri = InstrumentationRegistry.getInstrumentation().targetContext?.contentResolver?.openInputStream(snapshot.getUri(0) - ?: throw NullPointerException()) ?: throw java.lang.NullPointerException() + val inputStreamFromUri = InstrumentationRegistry.getInstrumentation() + .targetContext?.contentResolver?.openInputStream(snapshot.getUri(0) + ?: throw NullPointerException()) ?: throw java.lang.NullPointerException() - val cipherForDecryption = KeyStoreCryptoManager.getCipherForDecryption(Base64.encodeToString(cipherForEncryption.iv, KeyStoreCryptoManager.BASE64_FLAGS)) + val cipherForDecryption = KeyStoreCryptoManager.getCipherForDecryption( + Base64.encodeToString(cipherForEncryption.iv, KeyStoreCryptoManager.BASE64_FLAGS)) val byteArrayInputStream = ByteArrayInputStream(inputStreamFromUri.readBytes()) - val base64InputStream = Base64InputStream(byteArrayInputStream, KeyStoreCryptoManager.BASE64_FLAGS) + val base64InputStream = Base64InputStream(byteArrayInputStream, + KeyStoreCryptoManager.BASE64_FLAGS) val inputStream = CipherInputStream(base64InputStream, cipherForDecryption) val outputStreamFoResult = ByteArrayOutputStream() @@ -146,6 +158,7 @@ class KeyStoreCryptoManagerTest { inputStream.copyTo(outputStreamFoResult) val decodedDataAsString = String(outputStreamFoResult.toByteArray()) - assertTrue(originalData.replace("\r\n".toRegex(), "\n") == decodedDataAsString.replace("\r\n".toRegex(), "\n")) + assertTrue(originalData.replace("\r\n".toRegex(), "\n") == + decodedDataAsString.replace("\r\n".toRegex(), "\n")) } } \ No newline at end of file From f28bd82c2ef77749b461ba5b9e43de0fef4618f7 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Tue, 27 Apr 2021 12:16:23 +0300 Subject: [PATCH 12/14] Fixed method names.| #1191 --- .../email/ui/activity/MessageDetailsActivityTest.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt index cf38b142ad..e5b547c152 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt @@ -164,13 +164,13 @@ class MessageDetailsActivityTest : BaseTest() { } @Test - fun testStandardMsgplaintextWithOneAttachment() { + fun testStandardMsgPlaintextWithOneAttachment() { baseCheckWithAtt(getMsgInfo("messages/info/standard_msg_info_plaintext_with_one_att.json", "messages/mime/standard_msg_info_plaintext_with_one_att.txt", simpleAttInfo), simpleAttInfo) } @Test - fun testEncryptedMsgplaintext() { + fun testEncryptedMsgPlaintext() { baseCheck(getMsgInfo("messages/info/encrypted_msg_info_plain_text.json", "messages/mime/encrypted_msg_info_plain_text.txt")) } @@ -297,14 +297,14 @@ class MessageDetailsActivityTest : BaseTest() { } @Test - fun testEncryptedMsgplaintextWithOneAttachment() { + fun testEncryptedMsgPlaintextWithOneAttachment() { val msgInfo = getMsgInfo("messages/info/encrypted_msg_info_plain_text_with_one_att.json", "messages/mime/encrypted_msg_info_plain_text_with_one_att.txt", encryptedAttInfo) baseCheckWithAtt(msgInfo, encryptedAttInfo) } @Test - fun testEncryptedMsgplaintextWithPubKey() { + fun testEncryptedMsgPlaintextWithPubKey() { val msgInfo = getMsgInfo("messages/info/encrypted_msg_info_plain_text_with_pub_key.json", "messages/mime/encrypted_msg_info_plain_text_with_pub_key.txt", pubKeyAttInfo) baseCheckWithAtt(msgInfo, pubKeyAttInfo) From 48f1f1fb4497ffc99bf7f817f5f158b520f5f023 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Tue, 27 Apr 2021 16:23:26 +0300 Subject: [PATCH 13/14] Temporary disabled RetryRule for MessageDetailsActivityTest to debug.| #1191 --- .../flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt index e5b547c152..07a433b4b5 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt @@ -54,7 +54,6 @@ import com.flowcrypt.email.model.KeyDetails import com.flowcrypt.email.rules.AddAccountToDatabaseRule import com.flowcrypt.email.rules.AddPrivateKeyToDatabaseRule import com.flowcrypt.email.rules.ClearAppSettingsRule -import com.flowcrypt.email.rules.RetryRule import com.flowcrypt.email.rules.ScreenshotTestRule import com.flowcrypt.email.rules.lazyActivityScenarioRule import com.flowcrypt.email.ui.adapter.MsgDetailsRecyclerViewAdapter @@ -102,7 +101,7 @@ class MessageDetailsActivityTest : BaseTest() { .outerRule(ClearAppSettingsRule()) .around(addAccountToDatabaseRule) .around(AddPrivateKeyToDatabaseRule()) - .around(RetryRule.DEFAULT) + //.around(RetryRule.DEFAULT) .around(activeActivityRule) .around(ScreenshotTestRule()) From 76a6a04947fc62a982882717c412b7fcaba2cc10 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Tue, 27 Apr 2021 16:33:01 +0300 Subject: [PATCH 14/14] Fixed MessageDetailsActivityTest.testMsgDetailsSingleToReplyToCC()| #1191 --- .../email/ui/activity/MessageDetailsActivityTest.kt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt index 07a433b4b5..b53dd9adbf 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/MessageDetailsActivityTest.kt @@ -8,6 +8,7 @@ package com.flowcrypt.email.ui.activity import android.app.Activity import android.app.Instrumentation import android.content.ComponentName +import android.text.format.DateUtils import android.text.format.Formatter import androidx.recyclerview.widget.RecyclerView import androidx.test.core.app.ActivityScenario @@ -54,6 +55,7 @@ import com.flowcrypt.email.model.KeyDetails import com.flowcrypt.email.rules.AddAccountToDatabaseRule import com.flowcrypt.email.rules.AddPrivateKeyToDatabaseRule import com.flowcrypt.email.rules.ClearAppSettingsRule +import com.flowcrypt.email.rules.RetryRule import com.flowcrypt.email.rules.ScreenshotTestRule import com.flowcrypt.email.rules.lazyActivityScenarioRule import com.flowcrypt.email.ui.adapter.MsgDetailsRecyclerViewAdapter @@ -101,7 +103,7 @@ class MessageDetailsActivityTest : BaseTest() { .outerRule(ClearAppSettingsRule()) .around(addAccountToDatabaseRule) .around(AddPrivateKeyToDatabaseRule()) - //.around(RetryRule.DEFAULT) + .around(RetryRule.DEFAULT) .around(activeActivityRule) .around(ScreenshotTestRule()) @@ -397,11 +399,17 @@ class MessageDetailsActivityTest : BaseTest() { name = getResString(R.string.cc), value = "ccuser@test" )))) + + val flags = DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_TIME or + DateUtils.FORMAT_SHOW_YEAR + val datetime = DateUtils.formatDateTime(getTargetContext(), + msgInfo?.msgEntity?.receivedDate ?: 0, flags) + onView(withId(R.id.rVMsgDetails)) .perform(scrollToHolder(withHeaderInfo( MsgDetailsRecyclerViewAdapter.Header( name = getResString(R.string.date), - value = "October 5, 2020, 11:32 AM" + value = datetime )))) }