Skip to content

Issue 1202 org rules from fes #1369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DenBond7 merged 20 commits into from
Jul 29, 2021
Merged

Issue 1202 org rules from fes #1369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c52fd04
Added CheckFesServerViewModel. Added a new logic to check FES.| #1202
DenBond7 Jul 23, 2021
37315b7
Added fetching OrgRules via FES for a simple success case.| #1202
DenBond7 Jul 26, 2021
1efe175
Added handling 'retry' for "https://fes.$domain/api/v1/client-configu…
DenBond7 Jul 26, 2021
826a794
Added handling 'retry' for "service == enterprise-server".| #1202
DenBond7 Jul 26, 2021
db85a35
Added completed logic to MainSignInFragment.| #1202
DenBond7 Jul 27, 2021
2c7c78f
Removed unused resources.| #1202
DenBond7 Jul 27, 2021
db6feda
Fixed names.| #1202
DenBond7 Jul 27, 2021
a899280
MainSignInFragment. Fixed showing content if an error was received.| …
DenBond7 Jul 27, 2021
06e04c6
ApiService. Renamed API(s).| #1202
DenBond7 Jul 27, 2021
f93bdca
Added ClientConfigurationResponse. Refactored code.| #1202
DenBond7 Jul 27, 2021
ed577cf
SignInActivityEnterpriseTest. Added test request timeout.| #1202
DenBond7 Jul 27, 2021
26e536d
Fixed openssl-ca.cnf.| #1202
DenBond7 Jul 28, 2021
2e2f0ae
Regen a cert for localhost to allow https connection for *.localhost.…
DenBond7 Jul 28, 2021
3ccd2d3
Added one more case to test "fes availability == false && request tim…
DenBond7 Jul 28, 2021
0dca576
Added testing "fes availability == false && connection_issue == false…
DenBond7 Jul 28, 2021
dc3a103
Added testing "fes availability == false && connection_issue == false…
DenBond7 Jul 28, 2021
b396aaa
Added testing "fes availability == true && service != "enterprise-ser…
DenBond7 Jul 28, 2021
ec9fff3
Added testing "fes availability == true && service == "enterprise-ser…
DenBond7 Jul 28, 2021
cd93bab
Added testing "fes availability == true && service == "enterprise-ser…
DenBond7 Jul 28, 2021
081d472
Improved tests in SignInActivityEnterpriseTest.| #1202
DenBond7 Jul 29, 2021
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
15 changes: 15 additions & 0 deletions FlowCrypt/src/androidTest/assets/pgp/fes@flowcrypt.test_prv_decrypted.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
-----BEGIN PGP PRIVATE KEY BLOCK-----
Version: PGPainless

lFgEYQEt2hYJKwYBBAHaRw8BAQdABuJKFITCzpGGj80h5+gUnRd7pvJIm6AlA+fX
V45W30gAAQD83U7jx82N0U2p3B8H9Jynw0y97Nin4poW6z15TCV8XhLhtBJmZXNA
Zmxvd2NyeXB0LnRlc3SIeAQTFgoAIAUCYQEt2wIbAwUWAgMBAAQLCQgHBRUKCQgL
Ah4BAhkBAAoJEESQDK1IVvjzlyEBAJGoHsolKu8jg5hT5mBMOSb5XITnsPj/GHcl
TTRHFYrGAP43g1wz8veMOk2yqnLtt8lACLfBQjsEgwM0OIVB8IQrCpxdBGEBLdsS
CisGAQQBl1UBBQEBB0BZ9rSW4/F6UEp6tbwpk6G9+Vgd52V3cSJ6emKtN03QQgMB
CAcAAP9+QlakDhqGJhebzZ6/0a1ViPYIGvnEAznrs38JKUqesA+8iHUEGBYKAB0F
AmEBLdsCGwwFFgIDAQAECwkIBwUVCgkICwIeAQAKCRBEkAytSFb4841gAQDgNecq
7f5b1hqgPDpJc8Snr9KaRjZLCnm9uPFq9ywvXAEApYnSbi02T7UYeWOnOL2adzyL
rHRIpa4meIEV8C+Gng4=
=H5XH
-----END PGP PRIVATE KEY BLOCK-----
8 changes: 8 additions & 0 deletions FlowCrypt/src/androidTest/java/com/flowcrypt/email/base/BaseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,14 @@ abstract class BaseTest : BaseActivityTestImplementation {
return Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY).toString()
}

protected fun changeConnectionState(isConnected: Boolean) {
val state = if (isConnected) "enable" else "disable"
InstrumentationRegistry.getInstrumentation().uiAutomation
.executeShellCommand("svc wifi $state")
InstrumentationRegistry.getInstrumentation().uiAutomation
.executeShellCommand("svc data $state")
}

fun getTargetContext(): Context {
return InstrumentationRegistry.getInstrumentation().targetContext
}
Expand Down
Loading