Skip to content

Commit aecb1f6

Browse files
committed
Merge branch 'fix/remove-byoe-ff' into 'develop'
Remove feature flag See merge request ProtonMail/protonmail-ios!4425
2 parents a324a35 + 329eb85 commit aecb1f6

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

ProtonMail/ProtonMail/Utilities/APP_share/MailFeatureFlag.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ enum MailFeatureFlag: String, FeatureFlagTypeProtocol {
2121
case alwaysShowUpsellButton = "MailiosAlwaysShowUpsellButton"
2222
case answerInvitation = "MailiosAnswerInvitation"
2323
case autoImportContacts = "MailiosAutoImportContacts"
24-
case byoeLogin = "InboxBringYourOwnEmail"
2524
case calendarMiniLandingPage = "MailiosCalendarMiniLandingPage"
2625
case dynamicFontSizeInMessageBody = "MailiosDynamicFontSizeInMessageBody"
2726
case headerUpsellExperiment1 = "MailiosHeaderUpsellExperiment1"

ProtonMail/ProtonMail/ViewControllers/APP/SignIn/SignInCoordinatorEnvironment.swift

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import PromiseKit
2323
import ProtonCoreCrypto
2424
import ProtonCoreDataModel
2525
import ProtonCoreDoh
26-
import ProtonCoreFeatureFlags
2726
import ProtonCoreLogin
2827
import ProtonCoreLoginUI
2928
import ProtonCoreNetworking
@@ -33,7 +32,6 @@ import UIKit
3332

3433
struct SignInCoordinatorEnvironment {
3534
typealias Dependencies = AuthManagerForUnauthorizedAPIService.Dependencies
36-
& HasFeatureFlagsRepository
3735
& HasSignInManager
3836
& HasUnlockManager
3937
& HasUsersManager
@@ -77,8 +75,6 @@ extension SignInCoordinatorEnvironment {
7775
// swiftlint:disable function_body_length
7876
static func live(dependencies: Dependencies) -> SignInCoordinatorEnvironment {
7977
let apiService = PMAPIService.unauthorized(dependencies: dependencies)
80-
let minimumAccountTypes = minimumAccountTypes(featureFlagsRepository: dependencies.featureFlagsRepository)
81-
8278
return .init(apiService: apiService,
8379
userDefaults: dependencies.userDefaults,
8480
mailboxPassword: dependencies.signInManager
@@ -113,7 +109,7 @@ extension SignInCoordinatorEnvironment {
113109
return LoginAndSignup(appName: appName,
114110
clientApp: .mail,
115111
apiService: apiService,
116-
minimumAccountTypes: minimumAccountTypes,
112+
minimumAccountTypes: .init(login: .external, signup: .internal),
117113
isCloseButtonAvailable: isCloseButtonAvailable,
118114
paymentsAvailability: payment,
119115
signupAvailability: signup)
@@ -126,11 +122,4 @@ extension SignInCoordinatorEnvironment {
126122
return dependencies.signInManager.saveLoginData(loginData: $0)
127123
})
128124
}
129-
130-
private static func minimumAccountTypes(featureFlagsRepository: FeatureFlagsRepository) -> AccountTypes {
131-
.init(
132-
login: featureFlagsRepository.isEnabled(MailFeatureFlag.byoeLogin) ? .external : .internal,
133-
signup: .internal
134-
)
135-
}
136125
}

0 commit comments

Comments
 (0)