diff --git a/Session/Storage+SessionProtocolKit.swift b/Session/Database/Storage+SessionProtocolKit.swift similarity index 100% rename from Session/Storage+SessionProtocolKit.swift rename to Session/Database/Storage+SessionProtocolKit.swift diff --git a/Session/Storage+SessionSnodeKit.swift b/Session/Database/Storage+SessionSnodeKit.swift similarity index 100% rename from Session/Storage+SessionSnodeKit.swift rename to Session/Database/Storage+SessionSnodeKit.swift diff --git a/Session/Storage+Shared.swift b/Session/Database/Storage+Shared.swift similarity index 100% rename from Session/Storage+Shared.swift rename to Session/Database/Storage+Shared.swift diff --git a/Session/View Controllers/HomeVC.swift b/Session/View Controllers/HomeVC.swift index 0b3158d96..37cd7d0bc 100644 --- a/Session/View Controllers/HomeVC.swift +++ b/Session/View Controllers/HomeVC.swift @@ -126,10 +126,6 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, UIScrol emptyStateView.center(.horizontal, in: view) let verticalCenteringConstraint = emptyStateView.center(.vertical, in: view) verticalCenteringConstraint.constant = -16 // Makes things appear centered visually - // Set up search bar -// tableView.tableHeaderView = searchBar -// searchBar.sizeToFit() -// tableView.contentOffset = CGPoint(x: 0, y: searchBar.frame.height) // Set up new conversation button set view.addSubview(newConversationButtonSet) newConversationButtonSet.center(.horizontal, in: view) diff --git a/Session/View Controllers/Modal.swift b/Session/View Controllers/Modal.swift index 26e5e6950..80e0e6317 100644 --- a/Session/View Controllers/Modal.swift +++ b/Session/View Controllers/Modal.swift @@ -53,16 +53,6 @@ class Modal : BaseVC { preconditionFailure("populateContentView() is abstract and must be overridden.") } - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) -// verticalCenteringConstraint.constant = contentView.height() / 2 + view.height() / 2 -// view.layoutIfNeeded() -// verticalCenteringConstraint.constant = 0 -// UIView.animate(withDuration: 0.25) { -// self.view.layoutIfNeeded() -// } - } - // MARK: Interaction override func touchesBegan(_ touches: Set, with event: UIEvent?) { let touch = touches.first! diff --git a/Session/View Controllers/MultiDeviceRemovalSheet.swift b/Session/View Controllers/MultiDeviceRemovalSheet.swift deleted file mode 100644 index e78543eb3..000000000 --- a/Session/View Controllers/MultiDeviceRemovalSheet.swift +++ /dev/null @@ -1,93 +0,0 @@ -import PromiseKit - -final class MultiDeviceRemovalSheet : Sheet { - - private lazy var removalDate: Date = { - let calendar = Calendar(identifier: .gregorian) - let timezone = TimeZone(identifier: "Australia/Melbourne") - let components = DateComponents(calendar: calendar, timeZone: timezone, year: 2020, month: 8, day: 6, hour: 17) - return calendar.date(from: components)! - }() - - private lazy var removalDateDescription: String = { - let formatter = DateFormatter() - formatter.dateFormat = "MMMM d" - return formatter.string(from: removalDate) - }() - - private lazy var explanation: String = { - if UserDefaults.standard[.masterHexEncodedPublicKey] != nil { - let format = """ - You’re seeing this because this is a secondary device in a multi-device setup. To improve reliability and stability, we’ve decided to temporarily disable Session’s multi-device functionality. Device linking has been disabled, and existing secondary clients will be erased on %@. - - To read more about this change, visit the Session FAQ at getsession.org/faq. - """ - return String(format: format, removalDateDescription) - } else { - let format = """ - You’re seeing this because you have a secondary device linked to your Session ID. To improve reliability and stability, we’ve decided to temporarily disable Session’s multi-device functionality. Device linking has been disabled, and existing secondary clients will be erased on %@. - - To read more about this change, visit the Session FAQ at getsession.org/faq - """ - return String(format: format, removalDateDescription) - } - }() - - private lazy var attributedExplanation: NSAttributedString = { - let result = NSMutableAttributedString(string: explanation) - result.addAttribute(.font, value: UIFont.boldSystemFont(ofSize: Values.smallFontSize), range: (explanation as NSString).range(of: removalDateDescription)) - result.addAttribute(.foregroundColor, value: Colors.accent, range: (explanation as NSString).range(of: removalDateDescription)) - result.addAttribute(.font, value: UIFont.boldSystemFont(ofSize: Values.smallFontSize), range: (explanation as NSString).range(of: "getsession.org/faq")) - result.addAttribute(.foregroundColor, value: Colors.accent, range: (explanation as NSString).range(of: "getsession.org/faq")) - return result - }() - - private lazy var explanationLabel: UILabel = { - let result = UILabel() - result.textColor = Colors.text - result.font = .systemFont(ofSize: Values.smallFontSize) - result.attributedText = attributedExplanation - result.numberOfLines = 0 - result.lineBreakMode = .byWordWrapping - return result - }() - - override func populateContentView() { - // Set up title label - let titleLabel = UILabel() - titleLabel.textColor = Colors.text - titleLabel.font = .boldSystemFont(ofSize: isIPhone5OrSmaller ? Values.largeFontSize : Values.veryLargeFontSize) - titleLabel.text = "Changes to Multi-Device" - titleLabel.numberOfLines = 0 - titleLabel.lineBreakMode = .byWordWrapping - // Set up explanation label - explanationLabel.isUserInteractionEnabled = true - let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(handleExplanationLabelTapped)) - explanationLabel.addGestureRecognizer(tapGestureRecognizer) - // Set up OK button - let okButton = Button(style: .prominentOutline, size: .large) - okButton.set(.width, to: 240) - okButton.setTitle(NSLocalizedString("OK", comment: ""), for: UIControl.State.normal) - okButton.addTarget(self, action: #selector(close), for: UIControl.Event.touchUpInside) - // Set up main stack view - let stackView = UIStackView(arrangedSubviews: [ titleLabel, explanationLabel, okButton ]) - stackView.axis = .vertical - stackView.spacing = Values.veryLargeSpacing - stackView.alignment = .center - // Set up constraints - contentView.addSubview(stackView) - stackView.pin(.leading, to: .leading, of: contentView, withInset: Values.veryLargeSpacing) - stackView.pin(.top, to: .top, of: contentView, withInset: Values.largeSpacing) - contentView.pin(.trailing, to: .trailing, of: stackView, withInset: Values.veryLargeSpacing) - contentView.pin(.bottom, to: .bottom, of: stackView, withInset: Values.veryLargeSpacing + overshoot) - } - - @objc private func handleExplanationLabelTapped(_ tapGestureRecognizer: UITapGestureRecognizer) { - let range = (explanationLabel.text! as NSString).range(of: "getsession.org/faq") - let touchInExplanationLabelCoordinates = tapGestureRecognizer.location(in: explanationLabel) - let characterIndex = explanationLabel.characterIndex(for: touchInExplanationLabelCoordinates) - guard range.contains(characterIndex) else { return } - let url = URL(string: "https://getsession.org/faq")! - UIApplication.shared.open(url) - } -} diff --git a/Session/View Controllers/OpenGroupSuggestionSheet.swift b/Session/View Controllers/OpenGroupSuggestionSheet.swift deleted file mode 100644 index 0c9d51571..000000000 --- a/Session/View Controllers/OpenGroupSuggestionSheet.swift +++ /dev/null @@ -1,72 +0,0 @@ - -final class OpenGroupSuggestionSheet : Sheet { - - override func populateContentView() { - // Set up image view - let imageView = UIImageView(image: #imageLiteral(resourceName: "ChatBubbles")) - // Set up title label - let titleLabel = UILabel() - titleLabel.textColor = Colors.text - titleLabel.font = .boldSystemFont(ofSize: Values.largeFontSize) - titleLabel.text = NSLocalizedString("No messages yet", comment: "") - titleLabel.numberOfLines = 0 - titleLabel.lineBreakMode = .byWordWrapping - titleLabel.textAlignment = .center - // Set up top explanation label - let topExplanationLabel = UILabel() - topExplanationLabel.textColor = Colors.text - topExplanationLabel.font = .systemFont(ofSize: Values.mediumFontSize) - topExplanationLabel.text = NSLocalizedString("Would you like to join the Session Public Chat?", comment: "") - topExplanationLabel.numberOfLines = 0 - topExplanationLabel.textAlignment = .center - topExplanationLabel.lineBreakMode = .byWordWrapping - // Set up join button - let joinButton = Button(style: .prominentOutline, size: .medium) - joinButton.set(.width, to: 240) - joinButton.setTitle(NSLocalizedString("Join Public Chat", comment: ""), for: UIControl.State.normal) - joinButton.addTarget(self, action: #selector(joinSessionPublicChat), for: UIControl.Event.touchUpInside) - // Set up dismiss button - let dismissButton = Button(style: .regular, size: .medium) - dismissButton.set(.width, to: 240) - dismissButton.setTitle(NSLocalizedString("No, thank you", comment: ""), for: UIControl.State.normal) - dismissButton.addTarget(self, action: #selector(close), for: UIControl.Event.touchUpInside) - // Set up bottom explanation label - let bottomExplanationLabel = UILabel() - bottomExplanationLabel.textColor = Colors.text.withAlphaComponent(Values.unimportantElementOpacity) - bottomExplanationLabel.font = .systemFont(ofSize: Values.verySmallFontSize) - bottomExplanationLabel.text = NSLocalizedString("Open groups can be joined by anyone and do not provide full privacy protection", comment: "") - bottomExplanationLabel.numberOfLines = 0 - bottomExplanationLabel.textAlignment = .center - bottomExplanationLabel.lineBreakMode = .byWordWrapping - // Set up button stack view - let bottomStackView = UIStackView(arrangedSubviews: [ joinButton, dismissButton, bottomExplanationLabel ]) - bottomStackView.axis = .vertical - bottomStackView.spacing = Values.mediumSpacing - bottomStackView.alignment = .fill - // Set up main stack view - let stackView = UIStackView(arrangedSubviews: [ imageView, titleLabel, topExplanationLabel, bottomStackView ]) - stackView.axis = .vertical - stackView.spacing = Values.largeSpacing - stackView.alignment = .center - // Set up constraints - contentView.addSubview(stackView) - stackView.pin(.leading, to: .leading, of: contentView, withInset: Values.largeSpacing) - stackView.pin(.top, to: .top, of: contentView, withInset: Values.largeSpacing) - contentView.pin(.trailing, to: .trailing, of: stackView, withInset: Values.largeSpacing) - contentView.pin(.bottom, to: .bottom, of: stackView, withInset: Values.veryLargeSpacing + overshoot) - } - - @objc private func joinSessionPublicChat() { - // TODO: Duplicate of the code in JoinPublicChatVC - let channelID: UInt64 = 1 - let url = "https://chat.getsession.org" - let displayName = OWSProfileManager.shared().localProfileName() - // TODO: Profile picture & profile key - let _ = PublicChatManager.shared.addChat(server: url, channel: channelID).done(on: .main) { _ in - let _ = OpenGroupAPI.getMessages(for: channelID, on: url) - let _ = OpenGroupAPI.setDisplayName(to: displayName, on: url) - let _ = OpenGroupAPI.join(channelID, on: url) - } - close() - } -} diff --git a/Session/View Controllers/SettingsVC.swift b/Session/View Controllers/SettingsVC.swift index 5c7a96723..35099394b 100644 --- a/Session/View Controllers/SettingsVC.swift +++ b/Session/View Controllers/SettingsVC.swift @@ -188,8 +188,6 @@ final class SettingsVC : BaseVC, AvatarViewHelperDelegate { ] let isMasterDevice = UserDefaults.standard.isMasterDevice if isMasterDevice { -// result.append(getSeparator()) -// result.append(getSettingButton(withTitle: NSLocalizedString("vc_settings_devices_button_title", comment: ""), color: Colors.text, action: #selector(showLinkedDevices))) result.append(getSeparator()) result.append(getSettingButton(withTitle: NSLocalizedString("vc_settings_recovery_phrase_button_title", comment: ""), color: Colors.text, action: #selector(showSeed))) } diff --git a/Session/View Controllers/Sheet.swift b/Session/View Controllers/Sheet.swift index b34530dcd..d68eda8d2 100644 --- a/Session/View Controllers/Sheet.swift +++ b/Session/View Controllers/Sheet.swift @@ -43,17 +43,6 @@ class Sheet : BaseVC { preconditionFailure("populateContentView() is abstract and must be overridden.") } - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - // TODO: Animate -// bottomConstraint.constant = contentView.height() -// view.layoutIfNeeded() -// bottomConstraint.constant = overshoot -// UIView.animate(withDuration: 0.25) { -// self.view.layoutIfNeeded() -// } - } - // MARK: Interaction override func touchesBegan(_ touches: Set, with event: UIEvent?) { let touch = touches.first! diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 6223796f4..06413a28e 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -806,7 +806,6 @@ C35E8AAE2485E51D00ACB629 /* IP2Country.swift in Sources */ = {isa = PBXBuildFile; fileRef = C35E8AAD2485E51D00ACB629 /* IP2Country.swift */; }; C3645350252449260045C478 /* VoiceMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C364534F252449260045C478 /* VoiceMessageView.swift */; }; C364535C252467900045C478 /* AudioUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = C364535B252467900045C478 /* AudioUtilities.swift */; }; - C369549D24D27A3500CEB4E3 /* MultiDeviceRemovalSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C369549C24D27A3500CEB4E3 /* MultiDeviceRemovalSheet.swift */; }; C37F5385255B94F6002AEA92 /* SelectRecipientViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF34E255B6DC8007E1867 /* SelectRecipientViewController.h */; settings = {ATTRIBUTES = (Public, ); }; }; C37F5396255B95BD002AEA92 /* OWSAnyTouchGestureRecognizer.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF302255B6DBE007E1867 /* OWSAnyTouchGestureRecognizer.h */; settings = {ATTRIBUTES = (Public, ); }; }; C37F53A7255B96E0002AEA92 /* OWSAudioPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = C38EF2F5255B6DBC007E1867 /* OWSAudioPlayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -1156,7 +1155,6 @@ C3D0972B2510499C00F6E3E4 /* BackgroundPoller.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3D0972A2510499C00F6E3E4 /* BackgroundPoller.swift */; }; C3DAB3242480CB2B00725F25 /* SRCopyableLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3DAB3232480CB2A00725F25 /* SRCopyableLabel.swift */; }; C3DFFAC623E96F0D0058DAF8 /* Sheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3DFFAC523E96F0D0058DAF8 /* Sheet.swift */; }; - C3DFFAC823E970080058DAF8 /* OpenGroupSuggestionSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3DFFAC723E970080058DAF8 /* OpenGroupSuggestionSheet.swift */; }; C3E5C2FA251DBABB0040DFFC /* EditClosedGroupVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3E5C2F9251DBABB0040DFFC /* EditClosedGroupVC.swift */; }; C3E7134F251C867C009649BB /* Sodium+Conversion.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3E7134E251C867C009649BB /* Sodium+Conversion.swift */; }; C3F0A530255C80BC007BE2A3 /* NoopNotificationsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F0A52F255C80BC007BE2A3 /* NoopNotificationsManager.swift */; }; @@ -2169,7 +2167,6 @@ C35E8AAD2485E51D00ACB629 /* IP2Country.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IP2Country.swift; sourceTree = ""; }; C364534F252449260045C478 /* VoiceMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceMessageView.swift; sourceTree = ""; }; C364535B252467900045C478 /* AudioUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioUtilities.swift; sourceTree = ""; }; - C369549C24D27A3500CEB4E3 /* MultiDeviceRemovalSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiDeviceRemovalSheet.swift; sourceTree = ""; }; C37F53E8255BA9BB002AEA92 /* Environment.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Environment.h; sourceTree = ""; }; C37F5402255BA9ED002AEA92 /* Environment.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Environment.m; sourceTree = ""; }; C38EEF09255B49A8007E1867 /* SSKProtoEnvelope+Conversion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SSKProtoEnvelope+Conversion.swift"; sourceTree = ""; }; @@ -2523,7 +2520,6 @@ C3D0972A2510499C00F6E3E4 /* BackgroundPoller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundPoller.swift; sourceTree = ""; }; C3DAB3232480CB2A00725F25 /* SRCopyableLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SRCopyableLabel.swift; sourceTree = ""; }; C3DFFAC523E96F0D0058DAF8 /* Sheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sheet.swift; sourceTree = ""; }; - C3DFFAC723E970080058DAF8 /* OpenGroupSuggestionSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenGroupSuggestionSheet.swift; sourceTree = ""; }; C3E5C2F9251DBABB0040DFFC /* EditClosedGroupVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditClosedGroupVC.swift; sourceTree = ""; }; C3E7134E251C867C009649BB /* Sodium+Conversion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Sodium+Conversion.swift"; sourceTree = ""; }; C3F0A52F255C80BC007BE2A3 /* NoopNotificationsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoopNotificationsManager.swift; sourceTree = ""; }; @@ -3179,11 +3175,9 @@ B85357C423A1F13800AAF6CD /* LinkDeviceVC.swift */, B85357C623A1FB5100AAF6CD /* LinkDeviceVCDelegate.swift */, B86BD08323399ACF000F5AE3 /* Modal.swift */, - C369549C24D27A3500CEB4E3 /* MultiDeviceRemovalSheet.swift */, B80A579E23DFF1F300876683 /* NewClosedGroupVC.swift */, B8CCF63623961D6D0091D419 /* NewPrivateChatVC.swift */, B894D0742339EDCF00B4D94D /* NukeDataModal.swift */, - C3DFFAC723E970080058DAF8 /* OpenGroupSuggestionSheet.swift */, B879D448247E1BE300DB3608 /* PathVC.swift */, C3548F0524456447009433A8 /* PNModeVC.swift */, B886B4A62398B23E00211ABE /* QRCodeVC.swift */, @@ -3270,6 +3264,9 @@ C31F812425258F9C00DD9FD9 /* Database */ = { isa = PBXGroup; children = ( + C3F0A619255C9902007BE2A3 /* Storage+SessionProtocolKit.swift */, + C3F0A607255C98A6007BE2A3 /* Storage+SessionSnodeKit.swift */, + C3F0A5FD255C988A007BE2A3 /* Storage+Shared.swift */, C31F812525258FB000DD9FD9 /* Storage+VolumeSamples.swift */, ); path = Database; @@ -4462,9 +4459,6 @@ C3F0A58F255C8E3D007BE2A3 /* Meta */, C3F0A62B255C9937007BE2A3 /* AppDelegate+SharedSenderKeys.swift */, C3F0A5EB255C970D007BE2A3 /* Configuration.swift */, - C3F0A619255C9902007BE2A3 /* Storage+SessionProtocolKit.swift */, - C3F0A607255C98A6007BE2A3 /* Storage+SessionSnodeKit.swift */, - C3F0A5FD255C988A007BE2A3 /* Storage+Shared.swift */, B8CCF63B239757C10091D419 /* Components */, C31F812425258F9C00DD9FD9 /* Database */, C32B405424A961E1001117B5 /* Dependencies */, @@ -6238,7 +6232,6 @@ C331FFF32558FF0300070591 /* PathStatusView.swift in Sources */, 4C13C9F620E57BA30089A98B /* ColorPickerViewController.swift in Sources */, 4CC1ECFB211A553000CC13BE /* AppUpdateNag.swift in Sources */, - C369549D24D27A3500CEB4E3 /* MultiDeviceRemovalSheet.swift in Sources */, 34B6A903218B3F63007C4606 /* TypingIndicatorView.swift in Sources */, C3F0A608255C98A6007BE2A3 /* Storage+SessionSnodeKit.swift in Sources */, 458E38371D668EBF0094BD24 /* OWSDeviceProvisioningURLParser.m in Sources */, @@ -6335,7 +6328,6 @@ 4579431E1E7C8CE9008ED0C0 /* Pastelog.m in Sources */, 340FC8B0204DAC8D007AEB0F /* AddToBlockListViewController.m in Sources */, 3496957321A301A100DCFE74 /* OWSBackupJob.m in Sources */, - C3DFFAC823E970080058DAF8 /* OpenGroupSuggestionSheet.swift in Sources */, 34C4E2572118957600BEA353 /* OWSWebRTCDataProtos.pb.swift in Sources */, B894D0752339EDCF00B4D94D /* NukeDataModal.swift in Sources */, 346B66311F4E29B200E5122F /* CropScaleImageViewController.swift in Sources */,