diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/AttesterSettingsActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/AttesterSettingsFragmentTest.kt similarity index 90% rename from FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/AttesterSettingsActivityTest.kt rename to FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/AttesterSettingsFragmentTest.kt index 633909dc79..6f9d6ef5e9 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/AttesterSettingsActivityTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/AttesterSettingsFragmentTest.kt @@ -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 @@ -44,8 +44,12 @@ import org.junit.runner.RunWith */ @MediumTest @RunWith(AndroidJUnit4::class) -class AttesterSettingsActivityTest : BaseTest() { - override val activityScenarioRule = activityScenarioRule() +class AttesterSettingsFragmentTest : BaseTest() { + override val activityScenarioRule = activityScenarioRule( + TestGeneralUtil.genIntentForNavigationComponent( + uri = "flowcrypt://email.flowcrypt.com/settings/attester" + ) + ) private val accountRule = AddAccountToDatabaseRule() @get:Rule diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ContactsSettingsActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ContactsListFragmentTest.kt similarity index 91% rename from FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ContactsSettingsActivityTest.kt rename to FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ContactsListFragmentTest.kt index b649e9c8b9..7c4aeb3ad3 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ContactsSettingsActivityTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/ContactsListFragmentTest.kt @@ -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 @@ -44,9 +45,13 @@ import org.junit.runner.RunWith */ @MediumTest @RunWith(AndroidJUnit4::class) -class ContactsSettingsActivityTest : BaseTest() { +class ContactsListFragmentTest : BaseTest() { - override val activityScenarioRule = activityScenarioRule() + override val activityScenarioRule = activityScenarioRule( + TestGeneralUtil.genIntentForNavigationComponent( + uri = "flowcrypt://email.flowcrypt.com/settings/contacts" + ) + ) @get:Rule var ruleChain: TestRule = RuleChain diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/LegalSettingsActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/LegalSettingsFragmentTest.kt similarity index 88% rename from FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/LegalSettingsActivityTest.kt rename to FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/LegalSettingsFragmentTest.kt index b829f60bc8..4774f96397 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/LegalSettingsActivityTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/LegalSettingsFragmentTest.kt @@ -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 @@ -39,8 +40,12 @@ import org.junit.runner.RunWith */ @MediumTest @RunWith(AndroidJUnit4::class) -class LegalSettingsActivityTest : BaseTest() { - override val activityScenarioRule = activityScenarioRule() +class LegalSettingsFragmentTest : BaseTest() { + override val activityScenarioRule = activityScenarioRule( + TestGeneralUtil.genIntentForNavigationComponent( + uri = "flowcrypt://email.flowcrypt.com/settings/legal" + ) + ) @get:Rule var ruleChain: TestRule = RuleChain diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/KeysSettingsActivityTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PrivateKeysListFragmentTest.kt similarity index 95% rename from FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/KeysSettingsActivityTest.kt rename to FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PrivateKeysListFragmentTest.kt index cb4387dc9f..8673408311 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/KeysSettingsActivityTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PrivateKeysListFragmentTest.kt @@ -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 @@ -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() + override val activityScenarioRule = activityScenarioRule( + TestGeneralUtil.genIntentForNavigationComponent( + uri = "flowcrypt://email.flowcrypt.com/settings/keys" + ) + ) private val addAccountToDatabaseRule = AddAccountToDatabaseRule() private val addPrivateKeyToDatabaseRule = AddPrivateKeyToDatabaseRule() diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PublicKeyDetailsFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PublicKeyDetailsFragmentTest.kt index 86a03ccc0d..d95eb72ff1 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PublicKeyDetailsFragmentTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/PublicKeyDetailsFragmentTest.kt @@ -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 @@ -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 @@ -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 @@ -66,12 +64,24 @@ import java.util.Date @MediumTest @RunWith(AndroidJUnit4::class) class PublicKeyDetailsFragmentTest : BaseTest() { - override val useIntents: Boolean = true - override val activityScenarioRule = activityScenarioRule() - private val keyDetails = PrivateKeysManager.getPgpKeyDetailsFromAssets("pgp/expired@flowcrypt.test_pub.asc") + override val useIntents: Boolean = true + override val activityScenarioRule = activityScenarioRule( + 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()) @@ -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())) @@ -139,8 +140,6 @@ class PublicKeyDetailsFragmentTest : BaseTest() { @Test fun testActionCopy() { - chooseContact() - onView(withId(R.id.menuActionCopy)) .check(matches(isDisplayed())) .perform(click()) @@ -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" @@ -185,16 +182,10 @@ 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 @@ -202,11 +193,6 @@ class PublicKeyDetailsFragmentTest : BaseTest() { testHelpScreen() } - private fun chooseContact() { - onView(withId(R.id.recyclerViewContacts)) - .perform(RecyclerViewActions.actionOnItemAtPosition(0, click())) - } - /** * Match an item in an adapter which has the given text */ diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/base/BaseBackupKeysFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/base/BaseBackupKeysFragmentTest.kt index c13665d4ba..c80ef1fc80 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/base/BaseBackupKeysFragmentTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/activity/base/BaseBackupKeysFragmentTest.kt @@ -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 @@ -28,7 +29,9 @@ import java.io.File abstract class BaseBackupKeysFragmentTest : BaseTest() { override val useIntents: Boolean = true override val activityScenarioRule = activityScenarioRule( - Intent(Intent.ACTION_VIEW, Uri.parse("flowcrypt://make_backup")) + TestGeneralUtil.genIntentForNavigationComponent( + uri = "flowcrypt://email.flowcrypt.com/settings/make_backup" + ) ) val addAccountToDatabaseRule = AddAccountToDatabaseRule() diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/util/TestGeneralUtil.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/util/TestGeneralUtil.kt index e7d185735d..97dd4512e6 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/util/TestGeneralUtil.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/util/TestGeneralUtil.kt @@ -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 @@ -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) diff --git a/FlowCrypt/src/main/AndroidManifest.xml b/FlowCrypt/src/main/AndroidManifest.xml index fa8c81f238..4f912dbff3 100644 --- a/FlowCrypt/src/main/AndroidManifest.xml +++ b/FlowCrypt/src/main/AndroidManifest.xml @@ -142,47 +142,17 @@ - - - - - - - - - - - - @@ -205,25 +175,10 @@ android:label="@string/add_contact" android:screenOrientation="portrait" /> - - - - - - - - - diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/ChangePassPhraseActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/ChangePassPhraseActivity.kt index 1eeaef26e2..2a4f348688 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/ChangePassPhraseActivity.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/ChangePassPhraseActivity.kt @@ -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) } diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/DevSettingsActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/DevSettingsActivity.kt deleted file mode 100644 index 80b2c9862e..0000000000 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/DevSettingsActivity.kt +++ /dev/null @@ -1,27 +0,0 @@ -/* - * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 - */ - -package com.flowcrypt.email.ui.activity - -import android.view.View - -import com.flowcrypt.email.R -import com.flowcrypt.email.ui.activity.base.BaseBackStackActivity - -/** - * The developer setting activity. This activity will be used to setup the debug process. - * - * @author Denis Bondarenko - * Date: 10.07.2017 - * Time: 10:55 - * E-mail: DenBond7@gmail.com - */ -class DevSettingsActivity : BaseBackStackActivity() { - override val contentViewResourceId: Int - get() = R.layout.activity_dev_settings - - override val rootView: View - get() = View(this) -} diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/AttesterSettingsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/AttesterSettingsFragment.kt index 0e65c83150..c19e5e9465 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/AttesterSettingsFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/AttesterSettingsFragment.kt @@ -24,6 +24,9 @@ import com.flowcrypt.email.ui.adapter.AttesterKeyAdapter import com.google.android.material.snackbar.Snackbar /** + * Basically, this Fragment gets all known addresses of the user, and then submits one call with all addresses to + * /lookup/email/ Attester API, then compares the results. + * * @author Denis Bondarenko * Date: 2/18/20 * Time: 9:46 AM @@ -47,6 +50,7 @@ class AttesterSettingsFragment : BaseFragment(), ListProgressBehaviour { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + supportActionBar?.title = getString(R.string.attester) initViews(view) setupAccountKeysInfoViewModel() } diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ContactsListFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ContactsListFragment.kt index e8d315956d..111c95da4a 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ContactsListFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ContactsListFragment.kt @@ -19,6 +19,7 @@ import androidx.recyclerview.widget.RecyclerView import com.flowcrypt.email.R import com.flowcrypt.email.api.retrofit.response.base.Result import com.flowcrypt.email.database.entity.ContactEntity +import com.flowcrypt.email.extensions.navController import com.flowcrypt.email.jetpack.viewmodel.ContactsViewModel import com.flowcrypt.email.ui.activity.ImportPgpContactActivity import com.flowcrypt.email.ui.activity.fragment.base.BaseFragment @@ -53,12 +54,8 @@ class ContactsListFragment : BaseFragment(), ContactsRecyclerViewAdapter.OnDelet override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - initViews(view) - } - - override fun onActivityCreated(savedInstanceState: Bundle?) { - super.onActivityCreated(savedInstanceState) supportActionBar?.setTitle(R.string.contacts) + initViews(view) setupContactsViewModel() } @@ -77,11 +74,10 @@ class ContactsListFragment : BaseFragment(), ContactsRecyclerViewAdapter.OnDelet } override fun onContactClick(contactEntity: ContactEntity) { - parentFragmentManager - .beginTransaction() - .replace(R.id.layoutContent, PublicKeyDetailsFragment.newInstance(contactEntity)) - .addToBackStack(null) - .commit() + navController?.navigate( + ContactsListFragmentDirections + .actionContactsListFragmentToPublicKeyDetailsFragment(contactEntity) + ) } override fun onDeleteContact(contactEntity: ContactEntity) { @@ -141,9 +137,5 @@ class ContactsListFragment : BaseFragment(), ContactsRecyclerViewAdapter.OnDelet companion object { private const val REQUEST_CODE_START_IMPORT_PUB_KEY_ACTIVITY = 0 - - fun newInstance(): ContactsListFragment { - return ContactsListFragment() - } } } diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/LegalSettingsActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/LegalSettingsFragment.kt similarity index 90% rename from FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/LegalSettingsActivity.kt rename to FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/LegalSettingsFragment.kt index 891a16df2d..fe761e7537 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/LegalSettingsActivity.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/LegalSettingsFragment.kt @@ -3,7 +3,7 @@ * Contributors: DenBond7 */ -package com.flowcrypt.email.ui.activity.settings +package com.flowcrypt.email.ui.activity.fragment import android.net.Uri import android.os.Bundle @@ -26,38 +26,33 @@ import com.flowcrypt.email.ui.activity.fragment.base.BaseFragment import com.google.android.material.tabs.TabLayout /** - * This Activity consists information about a legal. + * This [Fragment] consists information about a legal. * * @author DenBond7 * Date: 26.05.2017 * Time: 13:27 * E-mail: DenBond7@gmail.com */ -class LegalSettingsActivity : BaseSettingsActivity() { - - private var tabPagerAdapter: TabPagerAdapter = TabPagerAdapter(supportFragmentManager) +class LegalSettingsFragment : BaseFragment() { private var viewPager: ViewPager? = null private var tabLayout: TabLayout? = null - override val contentViewResourceId: Int - get() = R.layout.activity_legal - - override val rootView: View - get() = View(this) + override val contentResourceId: Int = R.layout.fragment_legal - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - initViews() + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + supportActionBar?.title = getString(R.string.legal) + initViews(view) updateViews() } - private fun initViews() { - viewPager = findViewById(R.id.viewPager) - tabLayout = findViewById(R.id.tabLayout) + private fun initViews(view: View) { + viewPager = view.findViewById(R.id.viewPager) + tabLayout = view.findViewById(R.id.tabLayout) } private fun updateViews() { - viewPager?.adapter = tabPagerAdapter + viewPager?.adapter = TabPagerAdapter(childFragmentManager) tabLayout?.setupWithViewPager(viewPager) } diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MainSettingsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MainSettingsFragment.kt index 5e0f9ec810..9479b85a39 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MainSettingsFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MainSettingsFragment.kt @@ -33,19 +33,77 @@ class MainSettingsFragment : BasePreferenceFragment() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { addPreferencesFromResource(R.xml.preferences_main_settings) - findPreference(getString(R.string.pref_key_server_settings))?.setOnPreferenceClickListener { - navController?.navigate( - MainSettingsFragmentDirections.actionMainSettingsFragmentToServerSettingsFragment() - ) - true - } + findPreference(getString(R.string.pref_key_backups)) + ?.setOnPreferenceClickListener { + navController?.navigate( + MainSettingsFragmentDirections.actionMainSettingsFragmentToSearchBackupsInEmailFragment() + ) + true + } - findPreference(getString(R.string.pref_key_backups))?.setOnPreferenceClickListener { - navController?.navigate( - MainSettingsFragmentDirections.actionMainSettingsFragmentToSearchBackupsInEmailFragment() - ) - true - } + findPreference(getString(R.string.pref_key_security)) + ?.setOnPreferenceClickListener { + navController?.navigate( + MainSettingsFragmentDirections.actionMainSettingsFragmentToSecuritySettingsFragment() + ) + true + } + + findPreference(getString(R.string.pref_key_contacts)) + ?.setOnPreferenceClickListener { + navController?.navigate( + MainSettingsFragmentDirections.actionMainSettingsFragmentToContactsListFragment() + ) + true + } + + findPreference(getString(R.string.pref_key_keys)) + ?.setOnPreferenceClickListener { + navController?.navigate( + MainSettingsFragmentDirections.actionMainSettingsFragmentToPrivateKeysListFragment() + ) + true + } + + findPreference(getString(R.string.pref_key_attester)) + ?.setOnPreferenceClickListener { + navController?.navigate( + MainSettingsFragmentDirections.actionMainSettingsFragmentToAttesterSettingsFragment() + ) + true + } + + findPreference(getString(R.string.pref_key_notification)) + ?.setOnPreferenceClickListener { + navController?.navigate( + MainSettingsFragmentDirections.actionMainSettingsFragmentToNotificationsSettingsFragment() + ) + true + } + + findPreference(getString(R.string.pref_key_server_settings)) + ?.setOnPreferenceClickListener { + navController?.navigate( + MainSettingsFragmentDirections.actionMainSettingsFragmentToServerSettingsFragment() + ) + true + } + + findPreference(getString(R.string.pref_key_legal)) + ?.setOnPreferenceClickListener { + navController?.navigate( + MainSettingsFragmentDirections.actionMainSettingsFragmentToLegalSettingsFragment() + ) + true + } + + findPreference(getString(R.string.pref_key_experimental)) + ?.setOnPreferenceClickListener { + navController?.navigate( + MainSettingsFragmentDirections.actionMainSettingsFragmentToExperimentalSettingsFragment() + ) + true + } } override fun onAccountInfoRefreshed(accountEntity: AccountEntity?) { diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragment.kt index 5c656ffa8e..fc43dcfcbf 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeyDetailsFragment.kt @@ -24,6 +24,7 @@ import android.widget.TextView import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels +import androidx.navigation.fragment.navArgs import com.flowcrypt.email.Constants import com.flowcrypt.email.R import com.flowcrypt.email.api.retrofit.response.base.Result @@ -61,12 +62,7 @@ import java.util.* * E-mail: DenBond7@gmail.com */ class PrivateKeyDetailsFragment : BaseFragment(), ProgressBehaviour { - override val progressView: View? - get() = view?.findViewById(R.id.progress) - override val contentView: View? - get() = view?.findViewById(R.id.content) - override val statusView: View? - get() = view?.findViewById(R.id.status) + private val args by navArgs() private var tVFingerprint: TextView? = null private var tVDate: TextView? = null @@ -78,12 +74,16 @@ class PrivateKeyDetailsFragment : BaseFragment(), ProgressBehaviour { private val privateKeysViewModel: PrivateKeysViewModel by viewModels() private val checkPrivateKeysViewModel: CheckPrivateKeysViewModel by viewModels() private val pgpKeyDetailsViewModel: PgpKeyDetailsViewModel by viewModels { - PgpKeyDetailsViewModelFactory( - arguments?.getString(KEY_PGP_KEY_FINGERPRINT), - requireActivity().application - ) + PgpKeyDetailsViewModelFactory(args.fingerprint, requireActivity().application) } + override val progressView: View? + get() = view?.findViewById(R.id.progress) + override val contentView: View? + get() = view?.findViewById(R.id.content) + override val statusView: View? + get() = view?.findViewById(R.id.status) + override val contentResourceId: Int = R.layout.fragment_private_key_details override fun onCreate(savedInstanceState: Bundle?) { @@ -435,20 +435,7 @@ class PrivateKeyDetailsFragment : BaseFragment(), ProgressBehaviour { } companion object { - private val KEY_PGP_KEY_FINGERPRINT = - GeneralUtil.generateUniqueExtraKey( - "KEY_PGP_KEY_FINGERPRINT", - PrivateKeyDetailsFragment::class.java - ) private const val REQUEST_CODE_GET_URI_FOR_SAVING_KEY = 1 private const val REQUEST_CODE_DELETE_KEY_DIALOG = 100 - - fun newInstance(fingerprint: String): PrivateKeyDetailsFragment { - val keyDetailsFragment = PrivateKeyDetailsFragment() - val args = Bundle() - args.putString(KEY_PGP_KEY_FINGERPRINT, fingerprint) - keyDetailsFragment.arguments = args - return keyDetailsFragment - } } } diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeysListFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeysListFragment.kt index 5ffea4d179..acd792e741 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeysListFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PrivateKeysListFragment.kt @@ -27,6 +27,7 @@ import com.flowcrypt.email.R import com.flowcrypt.email.api.retrofit.response.base.Result import com.flowcrypt.email.extensions.decrementSafely import com.flowcrypt.email.extensions.incrementSafely +import com.flowcrypt.email.extensions.navController import com.flowcrypt.email.extensions.showTwoWayDialog import com.flowcrypt.email.jetpack.viewmodel.PrivateKeysViewModel import com.flowcrypt.email.security.model.PgpKeyDetails @@ -89,6 +90,7 @@ class PrivateKeysListFragment : BaseFragment(), View.OnClickListener, override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + supportActionBar?.setTitle(R.string.keys) initViews(view) setupPrivateKeysViewModel() } @@ -107,11 +109,6 @@ class PrivateKeysListFragment : BaseFragment(), View.OnClickListener, tracker?.onSaveInstanceState(outState) } - override fun onActivityCreated(savedInstanceState: Bundle?) { - super.onActivityCreated(savedInstanceState) - supportActionBar?.setTitle(R.string.keys) - } - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { when (requestCode) { REQUEST_CODE_START_IMPORT_KEY_ACTIVITY -> when (resultCode) { @@ -163,11 +160,10 @@ class PrivateKeysListFragment : BaseFragment(), View.OnClickListener, } pgpKeyDetails?.let { - parentFragmentManager - .beginTransaction() - .replace(R.id.layoutContent, PrivateKeyDetailsFragment.newInstance(it.fingerprint)) - .addToBackStack(null) - .commit() + navController?.navigate( + PrivateKeysListFragmentDirections + .actionPrivateKeysListFragmentToPrivateKeyDetailsFragment(it.fingerprint) + ) } } diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PublicKeyDetailsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PublicKeyDetailsFragment.kt index c6557d8a7f..ec6dfdaf25 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PublicKeyDetailsFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/PublicKeyDetailsFragment.kt @@ -22,11 +22,13 @@ import android.widget.TextView import android.widget.Toast import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope +import androidx.navigation.fragment.navArgs import com.flowcrypt.email.Constants import com.flowcrypt.email.R import com.flowcrypt.email.api.retrofit.response.base.Result import com.flowcrypt.email.database.FlowCryptRoomDatabase import com.flowcrypt.email.database.entity.ContactEntity +import com.flowcrypt.email.extensions.navController import com.flowcrypt.email.jetpack.viewmodel.ContactsViewModel import com.flowcrypt.email.jetpack.viewmodel.ParseKeysViewModel import com.flowcrypt.email.security.model.PgpKeyDetails @@ -49,6 +51,8 @@ import java.util.Date * E-mail: DenBond7@gmail.com */ class PublicKeyDetailsFragment : BaseFragment() { + private val args by navArgs() + private val contactsViewModel: ContactsViewModel by viewModels() private val parseKeysViewModel: ParseKeysViewModel by viewModels() @@ -66,10 +70,7 @@ class PublicKeyDetailsFragment : BaseFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setHasOptionsMenu(true) - contactEntity = arguments?.getParcelable(KEY_CONTACT) - if (contactEntity == null) { - parentFragmentManager.popBackStack() - } + contactEntity = args.contactEntity } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -89,12 +90,12 @@ class PublicKeyDetailsFragment : BaseFragment() { } Result.Status.SUCCESS -> { - val nodeKeyDetailsList = it.data - if (nodeKeyDetailsList.isNullOrEmpty()) { + val pgpKeyDetailsList = it.data + if (pgpKeyDetailsList.isNullOrEmpty()) { Toast.makeText(context, R.string.error_no_keys, Toast.LENGTH_SHORT).show() - parentFragmentManager.popBackStack() + navController?.navigateUp() } else { - details = nodeKeyDetailsList.first() + details = pgpKeyDetailsList.first() updateViews() UIUtil.exchangeViewVisibility(false, progressBar, content) } @@ -146,7 +147,7 @@ class PublicKeyDetailsFragment : BaseFragment() { lifecycleScope.launch { val roomDatabase = FlowCryptRoomDatabase.getDatabase(requireContext()) contactEntity?.let { roomDatabase.contactsDao().deleteSuspend(it) } - parentFragmentManager.popBackStack() + navController?.navigateUp() } return true } @@ -253,18 +254,6 @@ class PublicKeyDetailsFragment : BaseFragment() { } companion object { - private val KEY_CONTACT = GeneralUtil.generateUniqueExtraKey( - "KEY_CONTACT", - PublicKeyDetailsFragment::class.java - ) private const val REQUEST_CODE_GET_URI_FOR_SAVING_KEY = 1 - - fun newInstance(contactEntity: ContactEntity): PublicKeyDetailsFragment { - val fragment = PublicKeyDetailsFragment() - val args = Bundle() - args.putParcelable(KEY_CONTACT, contactEntity) - fragment.arguments = args - return fragment - } } } diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/ExperimentalSettingsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/ExperimentalSettingsFragment.kt index 2f510d68a8..e1434c868d 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/ExperimentalSettingsFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/ExperimentalSettingsFragment.kt @@ -5,11 +5,12 @@ package com.flowcrypt.email.ui.activity.fragment.preferences -import android.content.Intent import android.os.Bundle +import android.view.View +import androidx.appcompat.app.AppCompatActivity import androidx.preference.Preference import com.flowcrypt.email.R -import com.flowcrypt.email.ui.activity.DevSettingsActivity +import com.flowcrypt.email.extensions.navController import com.flowcrypt.email.ui.activity.fragment.base.BasePreferenceFragment import com.flowcrypt.email.util.GeneralUtil @@ -21,6 +22,12 @@ import com.flowcrypt.email.util.GeneralUtil */ class ExperimentalSettingsFragment : BasePreferenceFragment() { + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + (activity as AppCompatActivity?)?.supportActionBar?.title = + getString(R.string.experimental_settings) + } + override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.preferences_experimental_settings, rootKey) @@ -28,7 +35,13 @@ class ExperimentalSettingsFragment : BasePreferenceFragment() { val preference = Preference(context) preference.setTitle(R.string.action_dev_settings) preference.isIconSpaceReserved = false - preference.intent = Intent(context, DevSettingsActivity::class.java) + preference.setOnPreferenceClickListener { + navController?.navigate( + ExperimentalSettingsFragmentDirections + .actionExperimentalSettingsFragmentToMainDevPreferencesFragment() + ) + true + } preferenceScreen.addPreference(preference) } diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/MainDevPreferencesFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/MainDevPreferencesFragment.kt index ab5ce14830..e7e9d23b80 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/MainDevPreferencesFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/MainDevPreferencesFragment.kt @@ -10,7 +10,9 @@ import android.content.SharedPreferences import android.net.Uri import android.os.Bundle import android.provider.Settings +import android.view.View import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import androidx.preference.Preference import androidx.preference.PreferenceManager import com.flowcrypt.email.Constants @@ -34,6 +36,12 @@ class MainDevPreferencesFragment : BaseDevPreferencesFragment(), sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + (activity as AppCompatActivity?)?.supportActionBar?.title = + getString(R.string.action_dev_settings) + } + override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.dev_preferences, rootKey) } diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/NotificationsSettingsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/NotificationsSettingsFragment.kt index bc4811f60e..bfddea42ac 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/NotificationsSettingsFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/NotificationsSettingsFragment.kt @@ -8,6 +8,8 @@ package com.flowcrypt.email.ui.activity.fragment.preferences import android.content.Intent import android.os.Bundle import android.provider.Settings +import android.view.View +import androidx.appcompat.app.AppCompatActivity import androidx.preference.ListPreference import androidx.preference.Preference import androidx.preference.PreferenceManager @@ -38,6 +40,11 @@ open class NotificationsSettingsFragment : BasePreferenceFragment(), setPreferencesFromResource(R.xml.preferences_notifications_settings, rootKey) } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + (activity as AppCompatActivity?)?.supportActionBar?.title = getString(R.string.notifications) + } + override fun onPreferenceClick(preference: Preference?): Boolean { return when (preference?.key) { Constants.PREF_KEY_MANAGE_NOTIFICATIONS -> { diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/SecuritySettingsFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/SecuritySettingsFragment.kt index 8868d1aac5..22cd8cd5f1 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/SecuritySettingsFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/preferences/SecuritySettingsFragment.kt @@ -6,6 +6,8 @@ package com.flowcrypt.email.ui.activity.fragment.preferences import android.os.Bundle +import android.view.View +import androidx.appcompat.app.AppCompatActivity import androidx.preference.Preference import com.flowcrypt.email.Constants import com.flowcrypt.email.R @@ -23,6 +25,12 @@ import com.flowcrypt.email.util.UIUtil * E-mail: DenBond7@gmail.com */ class SecuritySettingsFragment : BasePreferenceFragment(), Preference.OnPreferenceClickListener { + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + (activity as AppCompatActivity?)?.supportActionBar?.title = + getString(R.string.security_and_privacy) + } + override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.preferences_security_settings, rootKey) findPreference(Constants.PREF_KEY_SECURITY_CHANGE_PASS_PHRASE)?.onPreferenceClickListener = diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/AttesterSettingsActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/AttesterSettingsActivity.kt deleted file mode 100644 index 935adc612d..0000000000 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/AttesterSettingsActivity.kt +++ /dev/null @@ -1,27 +0,0 @@ -/* - * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 - */ - -package com.flowcrypt.email.ui.activity.settings - -import android.view.View -import com.flowcrypt.email.R -import com.flowcrypt.email.ui.activity.base.BaseBackStackActivity - -/** - * Basically, this Activity gets all known addresses of the user, and then submits one call with all addresses to - * /lookup/email/ Attester API, then compares the results. - * - * @author DenBond7 - * Date: 13.11.2017 - * Time: 15:07 - * E-mail: DenBond7@gmail.com - */ -class AttesterSettingsActivity : BaseBackStackActivity() { - override val contentViewResourceId: Int - get() = R.layout.activity_attester_settings - - override val rootView: View - get() = findViewById(R.id.attesterSettingsFragment) -} diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/ContactsSettingsActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/ContactsSettingsActivity.kt deleted file mode 100644 index 6795515c9e..0000000000 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/ContactsSettingsActivity.kt +++ /dev/null @@ -1,47 +0,0 @@ -/* - * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 - */ - -package com.flowcrypt.email.ui.activity.settings - -import android.os.Bundle -import android.view.View -import com.flowcrypt.email.R -import com.flowcrypt.email.ui.activity.fragment.ContactsListFragment - -/** - * This Activity show information about contacts where has_pgp == true. - * - * - * Clicking the delete button will remove a contact from the db. This is useful if the contact - * now has a new public key attested: next time the user writes them, it will pull a new public key. - * - * @author DenBond7 - * Date: 26.05.2017 - * Time: 17:35 - * E-mail: DenBond7@gmail.com - */ -class ContactsSettingsActivity : BaseSettingsActivity() { - private var contactsListFragment: ContactsListFragment? = null - - override val contentViewResourceId: Int - get() = R.layout.activity_contacts_settings - - override val rootView: View - get() = View(this) - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - if (savedInstanceState == null) { - contactsListFragment = ContactsListFragment.newInstance() - contactsListFragment?.let { - supportFragmentManager - .beginTransaction() - .replace(R.id.layoutContent, it) - .commitNow() - } - } - } -} diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/ExperimentalSettingsActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/ExperimentalSettingsActivity.kt deleted file mode 100644 index ab82585130..0000000000 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/ExperimentalSettingsActivity.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 - */ - -package com.flowcrypt.email.ui.activity.settings - -import android.view.View - -import com.flowcrypt.email.R - -/** - * @author DenBond7 - * Date: 29.09.2017. - * Time: 22:42. - * E-mail: DenBond7@gmail.com - */ -class ExperimentalSettingsActivity : BaseSettingsActivity() { - override val contentViewResourceId: Int - get() = R.layout.activity_experimental_settings - - override val rootView: View - get() = View(this) -} diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/KeysSettingsActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/KeysSettingsActivity.kt deleted file mode 100644 index 13507cb9dc..0000000000 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/KeysSettingsActivity.kt +++ /dev/null @@ -1,41 +0,0 @@ -/* - * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 - */ - -package com.flowcrypt.email.ui.activity.settings - -import android.app.Activity -import android.os.Bundle -import android.view.View -import com.flowcrypt.email.R -import com.flowcrypt.email.ui.activity.base.BaseBackStackActivity -import com.flowcrypt.email.ui.activity.fragment.PrivateKeysListFragment - -/** - * This [Activity] shows information about available keys in the database. - * - * Here we can import new keys. - * - * @author DenBond7 - * Date: 29.05.2017 - * Time: 11:30 - * E-mail: DenBond7@gmail.com - */ -class KeysSettingsActivity : BaseBackStackActivity() { - override val contentViewResourceId: Int - get() = R.layout.activity_keys_settings - - override val rootView: View - get() = View(this) - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - if (savedInstanceState == null) { - val keysListFragment = PrivateKeysListFragment.newInstance() - supportFragmentManager.beginTransaction().replace(R.id.layoutContent, keysListFragment) - .commitNow() - } - } -} diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/NotificationsSettingsActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/NotificationsSettingsActivity.kt deleted file mode 100644 index 7796c12914..0000000000 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/NotificationsSettingsActivity.kt +++ /dev/null @@ -1,26 +0,0 @@ -/* - * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 - */ - -package com.flowcrypt.email.ui.activity.settings - -import android.view.View - -import com.flowcrypt.email.R - -/** - * This activity describes notification settings. - * - * @author Denis Bondarenko - * Date: 19.07.2018 - * Time: 11:59 - * E-mail: DenBond7@gmail.com - */ -class NotificationsSettingsActivity : BaseSettingsActivity() { - override val contentViewResourceId: Int - get() = R.layout.activity_notifications_settings - - override val rootView: View - get() = findViewById(R.id.notificationsSettingsFragment) -} diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/SecurityAndPrivacySettingsActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/SecurityAndPrivacySettingsActivity.kt deleted file mode 100644 index 2d10c9b28b..0000000000 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/settings/SecurityAndPrivacySettingsActivity.kt +++ /dev/null @@ -1,26 +0,0 @@ -/* - * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 - */ - -package com.flowcrypt.email.ui.activity.settings - -import android.view.View - -import com.flowcrypt.email.R - -/** - * This activity contains actions which related to Security options. - * - * @author DenBond7 - * Date: 08.08.2018. - * Time: 10:48. - * E-mail: DenBond7@gmail.com - */ -class SecurityAndPrivacySettingsActivity : BaseSettingsActivity() { - override val contentViewResourceId: Int - get() = R.layout.activity_security_settings - - override val rootView: View - get() = View(this) -} diff --git a/FlowCrypt/src/main/res/layout/activity_attester_settings.xml b/FlowCrypt/src/main/res/layout/activity_attester_settings.xml deleted file mode 100644 index 90a97f77b3..0000000000 --- a/FlowCrypt/src/main/res/layout/activity_attester_settings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/FlowCrypt/src/main/res/layout/activity_dev_settings.xml b/FlowCrypt/src/main/res/layout/activity_dev_settings.xml deleted file mode 100644 index 51aa7b8da8..0000000000 --- a/FlowCrypt/src/main/res/layout/activity_dev_settings.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/FlowCrypt/src/main/res/layout/activity_experimental_settings.xml b/FlowCrypt/src/main/res/layout/activity_experimental_settings.xml deleted file mode 100644 index 0585376cc9..0000000000 --- a/FlowCrypt/src/main/res/layout/activity_experimental_settings.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - diff --git a/FlowCrypt/src/main/res/layout/activity_keys_settings.xml b/FlowCrypt/src/main/res/layout/activity_keys_settings.xml deleted file mode 100644 index a459ceff12..0000000000 --- a/FlowCrypt/src/main/res/layout/activity_keys_settings.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/FlowCrypt/src/main/res/layout/activity_legal.xml b/FlowCrypt/src/main/res/layout/activity_legal.xml deleted file mode 100644 index 972f80b406..0000000000 --- a/FlowCrypt/src/main/res/layout/activity_legal.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - diff --git a/FlowCrypt/src/main/res/layout/activity_notifications_settings.xml b/FlowCrypt/src/main/res/layout/activity_notifications_settings.xml deleted file mode 100644 index 8be7c36ba2..0000000000 --- a/FlowCrypt/src/main/res/layout/activity_notifications_settings.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - diff --git a/FlowCrypt/src/main/res/layout/activity_security_settings.xml b/FlowCrypt/src/main/res/layout/activity_security_settings.xml deleted file mode 100644 index 727360bf24..0000000000 --- a/FlowCrypt/src/main/res/layout/activity_security_settings.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - diff --git a/FlowCrypt/src/main/res/layout/activity_contacts_settings.xml b/FlowCrypt/src/main/res/layout/fragment_legal.xml similarity index 62% rename from FlowCrypt/src/main/res/layout/activity_contacts_settings.xml rename to FlowCrypt/src/main/res/layout/fragment_legal.xml index a459ceff12..35080f89b3 100644 --- a/FlowCrypt/src/main/res/layout/activity_contacts_settings.xml +++ b/FlowCrypt/src/main/res/layout/fragment_legal.xml @@ -5,25 +5,25 @@ - - + app:layout_constraintStart_toStartOf="@+id/tabLayout" + app:layout_constraintTop_toBottomOf="@+id/tabLayout" /> diff --git a/FlowCrypt/src/main/res/navigation/nav_graph.xml b/FlowCrypt/src/main/res/navigation/nav_graph.xml index 9ac279e831..7c4943f400 100644 --- a/FlowCrypt/src/main/res/navigation/nav_graph.xml +++ b/FlowCrypt/src/main/res/navigation/nav_graph.xml @@ -19,6 +19,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + app:uri="flowcrypt://email.flowcrypt.com/settings/make_backup" /> + + + + + + - preferences_key_settings_security preferences_key_messages_notification_filter preferences_key_manage_notifications preferences_key_security_change_pass_phrase pref_key_backups pref_key_server_settings + pref_key_attester + pref_key_legal + pref_key_notification + pref_key_security + pref_key_keys + pref_key_experimental + pref_key_contacts Allow anonymous crash reports diff --git a/FlowCrypt/src/main/res/values/themes.xml b/FlowCrypt/src/main/res/values/themes.xml index 4400b69adc..d23b2f251e 100644 --- a/FlowCrypt/src/main/res/values/themes.xml +++ b/FlowCrypt/src/main/res/values/themes.xml @@ -21,10 +21,6 @@ true - - diff --git a/FlowCrypt/src/main/res/xml/preferences_main_settings.xml b/FlowCrypt/src/main/res/xml/preferences_main_settings.xml index d811daf2a3..9211e87c71 100644 --- a/FlowCrypt/src/main/res/xml/preferences_main_settings.xml +++ b/FlowCrypt/src/main/res/xml/preferences_main_settings.xml @@ -8,49 +8,32 @@ - + app:iconSpaceReserved="false" /> - - + app:iconSpaceReserved="false" /> - - + app:iconSpaceReserved="false" /> - - + app:iconSpaceReserved="false" /> - - + app:iconSpaceReserved="false" /> - - + app:iconSpaceReserved="false" /> - - + app:iconSpaceReserved="false" /> - - + app:iconSpaceReserved="false" />