Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import com.flowcrypt.email.rules.ClearAppSettingsRule
import com.flowcrypt.email.rules.FlowCryptMockWebServerRule
import com.flowcrypt.email.rules.RetryRule
import com.flowcrypt.email.rules.ScreenshotTestRule
import com.flowcrypt.email.ui.activity.settings.AttesterSettingsActivity
import com.flowcrypt.email.ui.activity.settings.SettingsActivity
import com.flowcrypt.email.util.AccountDaoManager
import com.flowcrypt.email.util.TestGeneralUtil
import okhttp3.mockwebserver.Dispatcher
Expand All @@ -44,8 +44,12 @@ import org.junit.runner.RunWith
*/
@MediumTest
@RunWith(AndroidJUnit4::class)
class AttesterSettingsActivityTest : BaseTest() {
override val activityScenarioRule = activityScenarioRule<AttesterSettingsActivity>()
class AttesterSettingsFragmentTest : BaseTest() {
override val activityScenarioRule = activityScenarioRule<SettingsActivity>(
TestGeneralUtil.genIntentForNavigationComponent(
uri = "flowcrypt://email.flowcrypt.com/settings/attester"
)
)
private val accountRule = AddAccountToDatabaseRule()

@get:Rule
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ import com.flowcrypt.email.rules.AddAccountToDatabaseRule
import com.flowcrypt.email.rules.ClearAppSettingsRule
import com.flowcrypt.email.rules.RetryRule
import com.flowcrypt.email.rules.ScreenshotTestRule
import com.flowcrypt.email.ui.activity.settings.ContactsSettingsActivity
import com.flowcrypt.email.ui.activity.settings.SettingsActivity
import com.flowcrypt.email.util.TestGeneralUtil
import com.flowcrypt.email.viewaction.ClickOnViewInRecyclerViewItem
import org.hamcrest.Matchers.not
import org.junit.AfterClass
Expand All @@ -44,9 +45,13 @@ import org.junit.runner.RunWith
*/
@MediumTest
@RunWith(AndroidJUnit4::class)
class ContactsSettingsActivityTest : BaseTest() {
class ContactsListFragmentTest : BaseTest() {

override val activityScenarioRule = activityScenarioRule<ContactsSettingsActivity>()
override val activityScenarioRule = activityScenarioRule<SettingsActivity>(
TestGeneralUtil.genIntentForNavigationComponent(
uri = "flowcrypt://email.flowcrypt.com/settings/contacts"
)
)

@get:Rule
var ruleChain: TestRule = RuleChain
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ import com.flowcrypt.email.rules.AddAccountToDatabaseRule
import com.flowcrypt.email.rules.ClearAppSettingsRule
import com.flowcrypt.email.rules.RetryRule
import com.flowcrypt.email.rules.ScreenshotTestRule
import com.flowcrypt.email.ui.activity.settings.LegalSettingsActivity
import com.flowcrypt.email.ui.activity.settings.SettingsActivity
import com.flowcrypt.email.util.TestGeneralUtil
import org.hamcrest.Matchers.allOf
import org.junit.Rule
import org.junit.Test
Expand All @@ -39,8 +40,12 @@ import org.junit.runner.RunWith
*/
@MediumTest
@RunWith(AndroidJUnit4::class)
class LegalSettingsActivityTest : BaseTest() {
override val activityScenarioRule = activityScenarioRule<LegalSettingsActivity>()
class LegalSettingsFragmentTest : BaseTest() {
override val activityScenarioRule = activityScenarioRule<SettingsActivity>(
TestGeneralUtil.genIntentForNavigationComponent(
uri = "flowcrypt://email.flowcrypt.com/settings/legal"
)
)

@get:Rule
var ruleChain: TestRule = RuleChain
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ 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.ui.activity.settings.KeysSettingsActivity
import com.flowcrypt.email.ui.activity.settings.SettingsActivity
import com.flowcrypt.email.util.GeneralUtil
import com.flowcrypt.email.util.PrivateKeysManager
import com.flowcrypt.email.util.TestGeneralUtil
import org.hamcrest.CoreMatchers.hasItem
import org.hamcrest.Matchers.equalTo
import org.hamcrest.Matchers.not
Expand All @@ -70,10 +71,14 @@ import java.util.Date
*/
@MediumTest
@RunWith(AndroidJUnit4::class)
class KeysSettingsActivityTest : BaseTest() {
class PrivateKeysListFragmentTest : BaseTest() {

override val useIntents: Boolean = true
override val activityScenarioRule = activityScenarioRule<KeysSettingsActivity>()
override val activityScenarioRule = activityScenarioRule<SettingsActivity>(
TestGeneralUtil.genIntentForNavigationComponent(
uri = "flowcrypt://email.flowcrypt.com/settings/keys"
)
)

private val addAccountToDatabaseRule = AddAccountToDatabaseRule()
private val addPrivateKeyToDatabaseRule = AddPrivateKeyToDatabaseRule()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,15 @@ import android.app.Activity
import android.app.Instrumentation
import android.content.Intent
import android.database.Cursor
import android.os.Bundle
import android.os.Environment
import android.text.format.DateFormat
import androidx.core.content.FileProvider
import androidx.recyclerview.widget.RecyclerView
import androidx.test.core.app.ApplicationProvider
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.contrib.RecyclerViewActions
import androidx.test.espresso.intent.Intents
import androidx.test.espresso.intent.matcher.IntentMatchers
import androidx.test.espresso.matcher.BoundedMatcher
Expand All @@ -39,7 +38,7 @@ import com.flowcrypt.email.rules.AddContactsToDatabaseRule
import com.flowcrypt.email.rules.ClearAppSettingsRule
import com.flowcrypt.email.rules.RetryRule
import com.flowcrypt.email.rules.ScreenshotTestRule
import com.flowcrypt.email.ui.activity.settings.ContactsSettingsActivity
import com.flowcrypt.email.ui.activity.settings.SettingsActivity
import com.flowcrypt.email.util.PrivateKeysManager
import com.flowcrypt.email.util.TestGeneralUtil
import org.hamcrest.CoreMatchers
Expand All @@ -48,7 +47,6 @@ import org.hamcrest.Matcher
import org.hamcrest.Matchers
import org.hamcrest.core.AllOf
import org.junit.AfterClass
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.rules.RuleChain
Expand All @@ -66,12 +64,24 @@ import java.util.Date
@MediumTest
@RunWith(AndroidJUnit4::class)
class PublicKeyDetailsFragmentTest : BaseTest() {
override val useIntents: Boolean = true
override val activityScenarioRule = activityScenarioRule<ContactsSettingsActivity>()

private val keyDetails =
PrivateKeysManager.getPgpKeyDetailsFromAssets("pgp/expired@flowcrypt.test_pub.asc")

override val useIntents: Boolean = true
override val activityScenarioRule = activityScenarioRule<SettingsActivity>(
TestGeneralUtil.genIntentForNavigationComponent(
uri = "flowcrypt://email.flowcrypt.com/settings/contacts/details",
extras = Bundle().apply {
putParcelable(
"contactEntity", PgpContact(
EMAIL_DENBOND7, USER_DENBOND7,
keyDetails.publicKey, true, null, null, 0
).toContactEntity()
)
}
)
)

@get:Rule
var ruleChain: TestRule = RuleChain
.outerRule(ClearAppSettingsRule())
Expand All @@ -90,17 +100,8 @@ class PublicKeyDetailsFragmentTest : BaseTest() {
.around(activityScenarioRule)
.around(ScreenshotTestRule())

@Before
fun waitData() {
//todo-denbond7 need to wait while activity lunches a fragment and loads data via ROOM.
// Need to improve this code after espresso updates
Thread.sleep(1000)
}

@Test
fun testPubKeyDetails() {
chooseContact()

keyDetails.users.forEachIndexed { index, s ->
onView(withText(getResString(R.string.template_user, index + 1, s)))
.check(matches(isDisplayed()))
Expand Down Expand Up @@ -139,8 +140,6 @@ class PublicKeyDetailsFragmentTest : BaseTest() {

@Test
fun testActionCopy() {
chooseContact()

onView(withId(R.id.menuActionCopy))
.check(matches(isDisplayed()))
.perform(click())
Expand All @@ -152,8 +151,6 @@ class PublicKeyDetailsFragmentTest : BaseTest() {

@Test
fun testActionSave() {
chooseContact()

val sanitizedEmail = EMAIL_DENBOND7.replace("[^a-z0-9]".toRegex(), "")
val fileName = "0x" + keyDetails.fingerprint + "-" + sanitizedEmail + "-publickey" + ".asc"

Expand Down Expand Up @@ -185,28 +182,17 @@ class PublicKeyDetailsFragmentTest : BaseTest() {
}

@Test
fun testActionDelete() {
chooseContact()

fun testActionDeleteVisibility() {
openActionBarOverflowOrOptionsMenu(getTargetContext())
onView(withText(R.string.delete))
.check(matches(isDisplayed()))
.perform(click())

onView(withText(R.string.no_results))
.check(matches(isDisplayed()))
}

@Test
fun testActionHelp() {
testHelpScreen()
}

private fun chooseContact() {
onView(withId(R.id.recyclerViewContacts))
.perform(RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(0, click()))
}

/**
* Match an item in an adapter which has the given text
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import com.flowcrypt.email.Constants
import com.flowcrypt.email.base.BaseTest
import com.flowcrypt.email.rules.AddAccountToDatabaseRule
import com.flowcrypt.email.ui.activity.settings.SettingsActivity
import com.flowcrypt.email.util.TestGeneralUtil
import org.hamcrest.Matchers
import java.io.File

Expand All @@ -28,7 +29,9 @@ import java.io.File
abstract class BaseBackupKeysFragmentTest : BaseTest() {
override val useIntents: Boolean = true
override val activityScenarioRule = activityScenarioRule<SettingsActivity>(
Intent(Intent.ACTION_VIEW, Uri.parse("flowcrypt://make_backup"))
TestGeneralUtil.genIntentForNavigationComponent(
uri = "flowcrypt://email.flowcrypt.com/settings/make_backup"
)
)

val addAccountToDatabaseRule = AddAccountToDatabaseRule()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ package com.flowcrypt.email.util

import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.os.Environment
import androidx.core.content.FileProvider
import androidx.test.core.app.ApplicationProvider
Expand Down Expand Up @@ -182,6 +184,15 @@ class TestGeneralUtil {
}
}

fun genIntentForNavigationComponent(uri: String, extras: Bundle? = null): Intent {
return Intent(
Intent.ACTION_VIEW,
Uri.parse(uri)
).apply {
extras?.let { putExtra("android-support-nav:controller:deepLinkExtras", it) }
}
}

fun clearApp(context: Context) {
SharedPreferencesHelper.clear(context)
FileAndDirectoryUtils.cleanDir(context.cacheDir)
Expand Down
45 changes: 0 additions & 45 deletions FlowCrypt/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -142,47 +142,17 @@
<nav-graph android:value="@navigation/nav_graph" />
</activity>

<activity
android:name=".ui.activity.settings.LegalSettingsActivity"
android:label="@string/legal"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar.NoElevation" />

<activity
android:name=".ui.activity.settings.ContactsSettingsActivity"
android:label="@string/contacts"
android:screenOrientation="portrait" />

<activity
android:name=".ui.activity.settings.KeysSettingsActivity"
android:label="@string/keys"
android:screenOrientation="portrait" />

<activity
android:name=".ui.activity.settings.AttesterSettingsActivity"
android:label="@string/attester"
android:screenOrientation="portrait" />

<activity
android:name=".ui.activity.settings.FeedbackActivity"
android:label="@string/help_feedback_or_question"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan" />

<activity
android:name=".ui.activity.settings.ExperimentalSettingsActivity"
android:label="@string/experimental_settings"
android:screenOrientation="portrait" />

<activity
android:name=".ui.activity.HtmlViewFromAssetsRawActivity"
android:label="@string/app_name"
android:screenOrientation="portrait" />

<activity
android:name=".ui.activity.DevSettingsActivity"
android:screenOrientation="portrait" />

<activity
android:name=".ui.activity.SelectContactsActivity"
android:screenOrientation="portrait" />
Expand All @@ -205,25 +175,10 @@
android:label="@string/add_contact"
android:screenOrientation="portrait" />

<activity
android:name=".ui.activity.settings.NotificationsSettingsActivity"
android:label="@string/notifications"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
</intent-filter>
</activity>

<activity
android:name=".ui.activity.ChangePassPhraseActivity"
android:screenOrientation="portrait" />

<activity
android:name=".ui.activity.settings.SecurityAndPrivacySettingsActivity"
android:label="@string/security_and_privacy"
android:screenOrientation="portrait" />

<activity
android:name=".ui.activity.CorruptedStorageActivity"
android:launchMode="singleTop" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ class ChangePassPhraseActivity : BasePassPhraseManagerActivity() {
private fun runBackupKeysActivity() {
isBackEnabled = true
Toast.makeText(this, R.string.back_up_updated_key, Toast.LENGTH_LONG).show()
val intent = Intent(Intent.ACTION_VIEW, Uri.parse("flowcrypt://make_backup"))
val intent =
Intent(Intent.ACTION_VIEW, Uri.parse("flowcrypt://email.flowcrypt.com/settings/make_backup"))
startActivity(intent)
}

Expand Down

This file was deleted.

Loading