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
Open

Identity server & Contact Integration #280

Show file tree
Hide file tree
Changes from all commits
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
30 changes: 27 additions & 3 deletions Nio.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,12 @@
39DD77BB2470C49D00A29DEE /* Six Colors [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 39DD77B92470C49D00A29DEE /* Six Colors [email protected] */; };
39E5032324EAFA8700FED642 /* Introspect in Frameworks */ = {isa = PBXBuildFile; productRef = 39E5032224EAFA8700FED642 /* Introspect */; };
4B0A2E47245E2EF800A79443 /* MultilineTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0A2E46245E2EF800A79443 /* MultilineTextField.swift */; };
4B0B26C826050818009E2D3A /* Contacts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0B26C726050818009E2D3A /* Contacts.swift */; };
4B0B26C926050818009E2D3A /* Contacts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0B26C726050818009E2D3A /* Contacts.swift */; };
4B29F5B52466EC240084043B /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B29F5B42466EC240084043B /* ImagePicker.swift */; };
4B693515249BBBFE0029D549 /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BFEFD7E246F414D00CCF4A0 /* ShareViewController.swift */; };
4B8225A426091A5F0013E733 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4B8225A626091A5F0013E733 /* InfoPlist.strings */; };
4B9AB8C32608D08A005E1092 /* IdentityServerSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B9AB8C22608D08A005E1092 /* IdentityServerSettings.swift */; };
4BD867272460ADEF0014E3D6 /* NewConversationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BD867262460ADEF0014E3D6 /* NewConversationView.swift */; };
4BFEFD86246F414D00CCF4A0 /* NioShareExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 4BFEFD7C246F414D00CCF4A0 /* NioShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
4BFEFD8C246F458000CCF4A0 /* GetURL.js in Resources */ = {isa = PBXBuildFile; fileRef = 4BFEFD8B246F458000CCF4A0 /* GetURL.js */; };
Expand Down Expand Up @@ -348,7 +352,11 @@
4B058B5524573A570059BC75 /* EditEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditEvent.swift; sourceTree = "<group>"; };
4B08F0A82495202A008E4286 /* LocalConfig.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = LocalConfig.xcconfig; sourceTree = "<group>"; };
4B0A2E46245E2EF800A79443 /* MultilineTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultilineTextField.swift; sourceTree = "<group>"; };
4B0B26C726050818009E2D3A /* Contacts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Contacts.swift; sourceTree = "<group>"; };
4B29F5B42466EC240084043B /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePicker.swift; sourceTree = "<group>"; };
4B8225A526091A5F0013E733 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
4B8225AD26091A650013E733 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
4B9AB8C22608D08A005E1092 /* IdentityServerSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdentityServerSettings.swift; sourceTree = "<group>"; };
4BD3D29224951E3B0031846F /* GlobalConfig.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = GlobalConfig.xcconfig; sourceTree = "<group>"; };
4BD3DCA32482FF08009B5048 /* AccountStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountStore.swift; sourceTree = "<group>"; };
4BD867262460ADEF0014E3D6 /* NewConversationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewConversationView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -473,6 +481,7 @@
children = (
3902B8A22395935600698B87 /* SettingsView.swift */,
39DD77AE247006E300A29DEE /* AppIcon.swift */,
4B9AB8C22608D08A005E1092 /* IdentityServerSettings.swift */,
);
path = Settings;
sourceTree = "<group>";
Expand Down Expand Up @@ -661,7 +670,6 @@
39D166C42385C7F6006DD257 /* Extensions */,
3921175D2442563A00892B00 /* Generated */,
39C931E22384328B004449E1 /* Assets.xcassets */,
39C931EA2384328B004449E1 /* Info.plist */,
390D63BA246F4BEE00B8F640 /* Resources */,
39C931F3238449C2004449E1 /* Supporting Files */,
39C931E42384328B004449E1 /* Preview Content */,
Expand All @@ -680,10 +688,12 @@
39C931F3238449C2004449E1 /* Supporting Files */ = {
isa = PBXGroup;
children = (
39C931EA2384328B004449E1 /* Info.plist */,
39C931F623846B2D004449E1 /* .swiftlint.yml */,
3921175B244255D600892B00 /* swiftgen.yml */,
39C931E72384328B004449E1 /* LaunchScreen.storyboard */,
392117592442556700892B00 /* Localizable.strings */,
4B8225A626091A5F0013E733 /* InfoPlist.strings */,
);
path = "Supporting Files";
sourceTree = "<group>";
Expand Down Expand Up @@ -809,6 +819,7 @@
393411C823904428003B49B8 /* MXEvent+Extensions.swift */,
4BEB8C03250403D200E90699 /* UserDefaults.swift */,
E897AA3325F2716F00D11427 /* UXKit.swift */,
4B0B26C726050818009E2D3A /* Contacts.swift */,
);
path = Extensions;
sourceTree = "<group>";
Expand Down Expand Up @@ -1143,6 +1154,7 @@
392117572442556700892B00 /* Localizable.strings in Resources */,
39C931F723846B2D004449E1 /* .swiftlint.yml in Resources */,
39DD77B62470C38300A29DEE /* Six Colors [email protected] in Resources */,
4B8225A426091A5F0013E733 /* InfoPlist.strings in Resources */,
39C931E92384328B004449E1 /* LaunchScreen.storyboard in Resources */,
39C931E62384328B004449E1 /* Preview Assets.xcassets in Resources */,
39DD77BA2470C49D00A29DEE /* Six Colors [email protected] in Resources */,
Expand Down Expand Up @@ -1284,6 +1296,7 @@
3923898F2388707E00B2E1DF /* RoomListItemView.swift in Sources */,
4B29F5B52466EC240084043B /* ImagePicker.swift in Sources */,
CAF2AE8B2458EF0900D84133 /* MarkdownText.swift in Sources */,
4B9AB8C32608D08A005E1092 /* IdentityServerSettings.swift in Sources */,
395E06FD25DDC1790059F6AD /* SFSymbol.swift in Sources */,
39DD77AF247006E300A29DEE /* AppIcon.swift in Sources */,
CAFCB323245F6E6700869320 /* NSAttributedString+Extensions.swift in Sources */,
Expand Down Expand Up @@ -1362,6 +1375,7 @@
E8B4725925F26D5A00ACEFCB /* NIORoomSummary.swift in Sources */,
E8B4725725F26D5A00ACEFCB /* EditEvent.swift in Sources */,
E8B4726125F26D5A00ACEFCB /* AccountStore.swift in Sources */,
4B0B26C826050818009E2D3A /* Contacts.swift in Sources */,
E8B4725825F26D5A00ACEFCB /* CustomEvent.swift in Sources */,
E8B4725F25F26D5A00ACEFCB /* Configuration.swift in Sources */,
E8B4725D25F26D5A00ACEFCB /* EventCollection.swift in Sources */,
Expand Down Expand Up @@ -1445,6 +1459,7 @@
E897AA1B25F2707C00D11427 /* Configuration.swift in Sources */,
E897AA1C25F2707C00D11427 /* CustomEvent.swift in Sources */,
E897AA2325F2707C00D11427 /* Reaction.swift in Sources */,
4B0B26C926050818009E2D3A /* Contacts.swift in Sources */,
E897AA1925F2707C00D11427 /* EditEvent.swift in Sources */,
E897AA1F25F2707C00D11427 /* MX+Identifiable.swift in Sources */,
E897AA1D25F2707C00D11427 /* MXCredentials+Keychain.swift in Sources */,
Expand Down Expand Up @@ -1539,6 +1554,15 @@
name = LaunchScreen.storyboard;
sourceTree = "<group>";
};
4B8225A626091A5F0013E733 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
4B8225A526091A5F0013E733 /* en */,
4B8225AD26091A650013E733 /* nl */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
Expand Down Expand Up @@ -1711,7 +1735,7 @@
CURRENT_PROJECT_VERSION = 33;
DEVELOPMENT_ASSET_PATHS = "\"Nio/Preview Content\"";
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = Nio/Info.plist;
INFOPLIST_FILE = "Nio/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1735,7 +1759,7 @@
DEVELOPMENT_ASSET_PATHS = "\"Nio/Preview Content\"";
DEVELOPMENT_TEAM = HU85FER47E;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = Nio/Info.plist;
INFOPLIST_FILE = "Nio/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
47 changes: 47 additions & 0 deletions Nio/Generated/Strings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ internal enum L10n {
internal static let alertFailed = L10n.tr("Localizable", "new-conversation.alert-failed")
/// Cancel
internal static let cancel = L10n.tr("Localizable", "new-conversation.cancel")
/// Contacts on Matrix
internal static let contactsMatrix = L10n.tr("Localizable", "new-conversation.contacts-matrix")
/// Start Chat
internal static let createRoom = L10n.tr("Localizable", "new-conversation.create-room")
/// Done
Expand All @@ -188,6 +190,8 @@ internal enum L10n {
internal static let titleRoom = L10n.tr("Localizable", "new-conversation.title-room")
/// Matrix ID
internal static let usernamePlaceholder = L10n.tr("Localizable", "new-conversation.username-placeholder")
/// Matrix ID, Phone, or Email
internal static let usernamePlaceholderExtended = L10n.tr("Localizable", "new-conversation.username-placeholder-extended")
}

internal enum ReactionPicker {
Expand Down Expand Up @@ -295,6 +299,49 @@ internal enum L10n {
internal static let title = L10n.tr("Localizable", "settings.title")
}

internal enum SettingsIdentityServer {
/// Closed Federation
internal static let closedFederation = L10n.tr("Localizable", "settings-identity-server.closed-federation")
/// At the moment, the identity servers are in a closed federation configuration. This means that there are only two identity servers (matrix.org, vector.im) and all data uploaded to one is copied to the other.
internal static let closedFederationText = L10n.tr("Localizable", "settings-identity-server.closed-federation-text")
/// Sync Contacts
internal static let contactSync = L10n.tr("Localizable", "settings-identity-server.contact-sync")
/// Continue
internal static let `continue` = L10n.tr("Localizable", "settings-identity-server.continue")
/// Data
internal static let data = L10n.tr("Localizable", "settings-identity-server.data")
/// Data & Privacy
internal static let dataPrivacy = L10n.tr("Localizable", "settings-identity-server.data-privacy")
/// By using the identity server, your email address and phone number will be sent to the identity server and will be linked to your Matrix ID (%@).
internal static func dataText(_ p1: Any) -> String {
return L10n.tr("Localizable", "settings-identity-server.data-text", String(describing: p1))
}
/// Learn More
internal static let learnMore = L10n.tr("Localizable", "settings-identity-server.learn-more")
/// Match
internal static let match = L10n.tr("Localizable", "settings-identity-server.match")
/// Any user can retrieve your Matrix ID by entering your email address or phone number, but cannot find your email address or phone number by entering your Matrix ID.
internal static let matchText = L10n.tr("Localizable", "settings-identity-server.match-text")
/// (Optional) Contact Sync
internal static let optionalContactSync = L10n.tr("Localizable", "settings-identity-server.optional-contact-sync")
/// When activating contact syncronization, Nio will periodically send the email addresses and phone numbers of all your contacts to the identity server to see if that contact has a linked Matrix ID. This contact information is never stored or shared with other parties by Nio.
internal static let optionalContactSyncText = L10n.tr("Localizable", "settings-identity-server.optional-contact-sync-text")
/// Please go to Settings and turn on the permissions.
internal static let permissionAlertBody = L10n.tr("Localizable", "settings-identity-server.permission-alert-body")
/// No permissions
internal static let permissionAlertTitle = L10n.tr("Localizable", "settings-identity-server.permission-alert-title")
/// Cancel
internal static let permissionCancelButton = L10n.tr("Localizable", "settings-identity-server.permission-cancel-button")
/// Settings
internal static let permissionSettingsButton = L10n.tr("Localizable", "settings-identity-server.permission-settings-button")
/// Identity Server
internal static let title = L10n.tr("Localizable", "settings-identity-server.title")
/// Enable Identity Server
internal static let toggle = L10n.tr("Localizable", "settings-identity-server.toggle")
/// Identity URL
internal static let url = L10n.tr("Localizable", "settings-identity-server.url")
}

internal enum TypingIndicator {
/// Several people are typing
internal static let many = L10n.tr("Localizable", "typing-indicator.many")
Expand Down
Loading