(relaxUnitFun = true) {
+ every { state } returns appState
+ }
+
+ private lateinit var forceUpdateHandler: ForceUpdateHandler
+
+ @Before
+ fun setUp() {
+ forceUpdateHandler = ForceUpdateHandler(context, appLifecycleObserver)
+ }
+
+ @Test
+ fun whenForegroundOnForceUpdate() {
+ // GIVEN
+ appState.tryEmit(AppLifecycleProvider.State.Foreground)
+ // WHEN
+ forceUpdateHandler.onForceUpdate("Update")
+ // THEN
+ verify(atLeast = 1) { context.startActivity(any()) }
+ }
+
+ @Test
+ fun whenBackgroundOnForceUpdate() {
+ // GIVEN
+ appState.tryEmit(AppLifecycleProvider.State.Background)
+ // WHEN
+ forceUpdateHandler.onForceUpdate("Update")
+ // THEN
+ verify(exactly = 0) { context.startActivity(any()) }
+ }
+}
diff --git a/app/src/androidTest/kotlin/ch/protonmail/android/message/SplitMessageBodyQuoteTest.kt b/app/src/androidTest/kotlin/ch/protonmail/android/message/SplitMessageBodyQuoteTest.kt
new file mode 100644
index 0000000000..fd52fe712f
--- /dev/null
+++ b/app/src/androidTest/kotlin/ch/protonmail/android/message/SplitMessageBodyQuoteTest.kt
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2022 Proton Technologies AG
+ * This file is part of Proton Technologies AG and Proton Mail.
+ *
+ * Proton Mail is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Mail is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Mail. If not, see .
+ */
+
+package ch.protonmail.android.message
+
+import ch.protonmail.android.mailcomposer.domain.model.DraftBody
+import ch.protonmail.android.mailcomposer.domain.usecase.SplitMessageBodyHtmlQuote
+import ch.protonmail.android.mailmessage.domain.model.MimeType
+import ch.protonmail.android.test.annotations.suite.SmokeTest
+import ch.protonmail.android.testdata.message.DecryptedMessageBodyTestData
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+@SmokeTest
+class SplitMessageBodyQuoteTest {
+
+ private val splitMessageBodyHtmlQuote = SplitMessageBodyHtmlQuote()
+
+ @Test
+ fun returnsGivenDecryptedBodyAndNoQuoteWhenMimeTypeIsPlainText() {
+ // Given
+ val decryptedBody = DecryptedMessageBodyTestData.PlainTextDecryptedBody
+
+ // When
+ val actual = splitMessageBodyHtmlQuote(decryptedBody)
+
+ // Then
+ assertEquals(Pair(DraftBody(decryptedBody.value), null), actual)
+ }
+
+ @Test
+ fun returnsDecryptedBodyTextExtractedFromHtmlAndNoQuoteWhenTheInputBodyHasNoQuoteAnchors() {
+ // Given
+ val decryptedBody = DecryptedMessageBodyTestData.buildDecryptedMessageBody(
+ value = HtmlBodyWithNoQuoteAnchors,
+ mimeType = MimeType.Html
+ )
+
+ // When
+ val actual = splitMessageBodyHtmlQuote(decryptedBody)
+
+ // Then
+ val expected = DraftBody("$BodyTypedContentRaw \n$BodyMoreTypedContentRaw \n")
+ assertEquals(Pair(expected, null), actual)
+ }
+
+ @Test
+ fun returnsNonHtmlTextExtractedFromHtmlAndQuoteWhenTheInputBodyHasOneOfTheQuoteAnchors() {
+ // Given
+ val decryptedBody = DecryptedMessageBodyTestData.buildDecryptedMessageBody(
+ value = HtmlBodyWithProtonQuoteAnchor,
+ mimeType = MimeType.Html
+ )
+
+ // When
+ val actual = splitMessageBodyHtmlQuote(decryptedBody)
+ val actualQuote = actual.second!!
+
+ // Then
+ assertEquals(DraftBody(BodyTypedContentRaw), actual.first)
+ assertTrue(actualQuote.value.contains(ProtonQuoteAnchor))
+ assertTrue(actualQuote.value.contains(HtmlQuotedContentRaw))
+ }
+
+ companion object {
+ private const val BodyTypedContentRaw = "Typed in content"
+ private const val BodyMoreTypedContentRaw = "this is additional typed content"
+ private const val HtmlQuotedContentRaw = "Any quoted html content here"
+ private const val ProtonQuoteAnchor = ""
+ private const val ProtonQuoteClosingAnchor = "
"
+
+ private const val ProtonQuoteHtml = "$ProtonQuoteAnchor$HtmlQuotedContentRaw$ProtonQuoteClosingAnchor"
+
+ private const val HtmlBodyWithNoQuoteAnchors = """
+
+
+ $BodyTypedContentRaw
+ $BodyMoreTypedContentRaw
+
+
+ """
+
+ private const val HtmlBodyWithProtonQuoteAnchor = """
+
+
+ $BodyTypedContentRaw
+ $ProtonQuoteHtml
+
+
+ """
+ }
+}
diff --git a/app/src/dev/AndroidManifest.xml b/app/src/dev/AndroidManifest.xml
new file mode 100644
index 0000000000..d562e80937
--- /dev/null
+++ b/app/src/dev/AndroidManifest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/dev/ic_launcher-playstore.png b/app/src/dev/ic_launcher-playstore.png
new file mode 100644
index 0000000000..f5d252178a
Binary files /dev/null and b/app/src/dev/ic_launcher-playstore.png differ
diff --git a/app/src/dev/kotlin/ch/protonmail/android/di/ServerProofModule.kt b/app/src/dev/kotlin/ch/protonmail/android/di/ServerProofModule.kt
new file mode 100644
index 0000000000..3abb5c1ce2
--- /dev/null
+++ b/app/src/dev/kotlin/ch/protonmail/android/di/ServerProofModule.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2022 Proton Technologies AG
+ * This file is part of Proton Technologies AG and Proton Mail.
+ *
+ * Proton Mail is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Mail is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Mail. If not, see .
+ */
+
+package ch.protonmail.android.di
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import me.proton.core.auth.domain.usecase.ValidateServerProof
+
+/**
+ * This module is an explicit provider for [ValidateServerProof] that is needed to perform the required
+ * overrides when running UI Tests.
+ *
+ * There's no need to have this definition in the production code, as the dependency is still automatically provided.
+ */
+@Module
+@InstallIn(SingletonComponent::class)
+object ServerProofModule {
+
+ @Provides
+ fun provideServerProofValidation(): ValidateServerProof = ValidateServerProof()
+}
diff --git a/app/src/dev/res/drawable-v24/ic_launcher_foreground.xml b/app/src/dev/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000000..abc4ebc37d
--- /dev/null
+++ b/app/src/dev/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+