Skip to content

Temporary disable search contacts #218

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
tomholub merged 3 commits into from
Mar 16, 2020
Merged

Temporary disable search contacts #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e61bc4
Temporary disable search contacts
Kharchevskyi Mar 16, 2020
aeb27e7
Update makefile
Kharchevskyi Mar 16, 2020
4278dd9
small cleanup
Kharchevskyi Mar 16, 2020
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
21 changes: 12 additions & 9 deletions FlowCrypt/Controllers/Compose/ComposeViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@ final class ComposeViewController: ASViewController<TableNode> {

override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
showScopeAlertIfNeeded()

// temporary disable search contacts - https://github.com/FlowCrypt/flowcrypt-ios/issues/217
// showScopeAlertIfNeeded()
}

deinit {
Expand Down Expand Up @@ -589,14 +591,15 @@ extension ComposeViewController {
}

private func handleEditingChanged(with text: String?) {
guard let text = text, text.isNotEmpty else {
updateState(with: .main)
return
}

searchThrottler.throttle { [weak self] in
self?.searchEmail(with: text)
}
// temporary disable search contacts - https://github.com/FlowCrypt/flowcrypt-ios/issues/217
// guard let text = text, text.isNotEmpty else {
// updateState(with: .main)
// return
// }
//
// searchThrottler.throttle { [weak self] in
// self?.searchEmail(with: text)
// }
}

private func handleDidBeginEditing() {
Expand Down
2 changes: 1 addition & 1 deletion FlowCrypt/Controllers/Setup/SetupViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ extension SetupViewController {
private func renderNoBackupsFoundOptions(_ msg: String, error: Error? = nil) {
let errStr = error != nil ? "\n\n\(error!)" : ""
let alert = UIAlertController(title: "Notice", message: msg + errStr, preferredStyle: .alert)
if error == nil { // no backous found, not an error: show option to create a key or import key
if error == nil { // no backups found, not an error: show option to create a key or import key
alert.addAction(UIAlertAction(title: "Import existing Private Key", style: .default) { [weak self] _ in
self?.handleImportKey()
})
Expand Down
7 changes: 6 additions & 1 deletion FlowCrypt/Functionality/Services/Google/GoogleService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,12 @@ extension GoogleService: GoogleServiceType {
func setUpAuthentication() throws {
guard let googleSignIn = instance else { throw AppErr.general("Unexpected nil GIDSignIn") }
googleSignIn.clientID = "679326713487-8f07eqt1hvjvopgcjeie4dbtni4ig0rc.apps.googleusercontent.com"
googleSignIn.scopes = Scope.allCases.compactMap { $0.value }

// temporary disable search contacts - https://github.com/FlowCrypt/flowcrypt-ios/issues/217
// let scopes = Scope.allCases.compactMap { $0.value }

let scopes = [Scope.mail, Scope.userInfo].compactMap { $0.value }
googleSignIn.scopes = scopes
googleSignIn.delegate = UserService.shared
}

Expand Down
3 changes: 2 additions & 1 deletion FlowCryptUITests/SignInTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,9 @@ class SignInTest: XCTestCase {
app.buttons["+"].tap()
wait(0.2)
app.typeText(user.email)
app.tables.textFields["Subject"].tap()

app.tables/*@START_MENU_TOKEN@*/.textFields["Subject"]/*[[".cells.textFields[\"Subject\"]",".textFields[\"Subject\"]"],[[[-1,1],[-1,0]]],[0]]@END_MENU_TOKEN@*/.tap()
app.tables.textFields["Subject"].tap()
app.typeText("Some Subject")
let nextCompose = goKeyboardButton()
nextCompose.tap()
Expand Down
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ all: ui_tests

dependencies:
bundle config set path 'vendor/bundle'
bundle install

ui_tests: dependencies
bundle exec fastlane test_ui --verbose
bundle exec fastlane test_ui --verbose