Skip to content
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

Identity server & Contact Integration #280

Open
wants to merge 12 commits into
base: stable
Choose a base branch
from
+640 −12
Open

Identity server & Contact Integration #280

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6ee53a0
Initial commit Identity server support
stefanhofman Mar 19, 2021
d99186e
Begin of lookup on new conversation
stefanhofman Mar 22, 2021
ded777c
New settings screen with Privacy Screen
stefanhofman Mar 22, 2021
9eab50b
Remove non-functional contanct sync support
stefanhofman Mar 22, 2021
7d0cc87
Move plist file and add localization support
stefanhofman Mar 22, 2021
f9cf6de
Working contact sync
stefanhofman Mar 23, 2021
d5a5761
Fix linter error
stefanhofman Mar 23, 2021
62c9eb6
Contact persistency
stefanhofman Mar 26, 2021
c8b1e36
Fix reverse spinner
stefanhofman Mar 26, 2021
f73cd3f
Linter
stefanhofman Mar 26, 2021
be9706e
Typo enum UserStatus
stefanhofman Mar 31, 2021
2bc6f32
Review remarks
stefanhofman Mar 31, 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
Prev Previous commit
Next Next commit
Remove non-functional contanct sync support
@stefanhofman
stefanhofman committed Mar 31, 2021
commit 9eab50b7b1126e5db13004254d8428fb0db595b7
8 changes: 4 additions & 4 deletions Nio/Settings/IdentityServerSettings.swift
View file
Original file line number Diff line number Diff line change
@@ -92,9 +92,9 @@ struct InformationContainerView: View {
imageName: "globe"
)

InformationDetailView(title: L10n.SettingsIdentityServer.optionalContactSync,
subTitle: L10n.SettingsIdentityServer.optionalContactSyncText,
imageName: "person")
//InformationDetailView(title: L10n.SettingsIdentityServer.optionalContactSync,
// subTitle: L10n.SettingsIdentityServer.optionalContactSyncText,
// imageName: "person")
}
.padding(.horizontal)
}
@@ -192,7 +192,7 @@ struct IdentityServerSettingsView: View {
)
if identityServerBool {
TextField(L10n.SettingsIdentityServer.url, text: $identityServer)
Toggle(L10n.SettingsIdentityServer.contactSync, isOn: $syncContacts).onChange(of: syncContacts, perform: syncContacts(isSync:))
//Toggle(L10n.SettingsIdentityServer.contactSync, isOn: $syncContacts).onChange(of: syncContacts, perform: syncContacts(isSync:))
}
}
}