mirror of https://github.com/oxen-io/session-ios
Finished off a few remaining bits and pieces
Added the 'outdated client' warning banner Added a unit test to validate the 'group(by:)' method maintains ordering Added an error when trying to message a non-standard session id directly Removed the "hide" logic for groups (don't want it) Removed some unneeded thread fetching Updated the logic to use the 'lastHash' when fetching config messages Updated the logic to use the libSession value restrictions instead of hard-coded values Fixed an issue where members weren't getting removed from legacy groupspull/856/head
Morgan Pretty
2 years ago
parent
972519d7d9
commit
66fd2d4ff8
@ -0,0 +1,188 @@
|
||||
// Copyright © 2023 Rangeproof Pty Ltd. All rights reserved.
|
||||
|
||||
import UIKit
|
||||
import SessionUtilitiesKit
|
||||
|
||||
public class TopBannerController: UIViewController {
|
||||
public enum Warning: String, Codable {
|
||||
case outdatedUserConfig
|
||||
|
||||
var text: String {
|
||||
switch self {
|
||||
case .outdatedUserConfig: return "USER_CONFIG_OUTDATED_WARNING".localized()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static var lastInstance: TopBannerController?
|
||||
private let child: UIViewController
|
||||
private var initialCachedWarning: Warning?
|
||||
|
||||
// MARK: - UI
|
||||
|
||||
private lazy var bottomConstraint: NSLayoutConstraint = bannerLabel
|
||||
.pin(.bottom, to: .bottom, of: bannerContainer, withInset: -Values.verySmallSpacing)
|
||||
|
||||
private let contentStackView: UIStackView = {
|
||||
let result: UIStackView = UIStackView()
|
||||
result.translatesAutoresizingMaskIntoConstraints = false
|
||||
result.axis = .vertical
|
||||
result.distribution = .fill
|
||||
result.alignment = .fill
|
||||
|
||||
return result
|
||||
}()
|
||||
|
||||
private let bannerContainer: UIView = {
|
||||
let result: UIView = UIView()
|
||||
result.translatesAutoresizingMaskIntoConstraints = false
|
||||
result.themeBackgroundColor = .primary
|
||||
result.isHidden = true
|
||||
|
||||
return result
|
||||
}()
|
||||
|
||||
private let bannerLabel: UILabel = {
|
||||
let result: UILabel = UILabel()
|
||||
result.translatesAutoresizingMaskIntoConstraints = false
|
||||
result.setContentHuggingPriority(.required, for: .vertical)
|
||||
result.font = .systemFont(ofSize: Values.verySmallFontSize)
|
||||
result.textAlignment = .center
|
||||
result.themeTextColor = .black
|
||||
result.numberOfLines = 0
|
||||
|
||||
return result
|
||||
}()
|
||||
|
||||
private lazy var closeButton: UIButton = {
|
||||
let result: UIButton = UIButton()
|
||||
result.translatesAutoresizingMaskIntoConstraints = false
|
||||
result.setImage(
|
||||
UIImage(systemName: "xmark", withConfiguration: UIImage.SymbolConfiguration(pointSize: 12, weight: .bold))?
|
||||
.withRenderingMode(.alwaysTemplate),
|
||||
for: .normal
|
||||
)
|
||||
result.contentMode = .center
|
||||
result.themeTintColor = .black
|
||||
result.addTarget(self, action: #selector(dismissBanner), for: .touchUpInside)
|
||||
|
||||
return result
|
||||
}()
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
public init(
|
||||
child: UIViewController,
|
||||
cachedWarning: Warning? = nil
|
||||
) {
|
||||
self.child = child
|
||||
self.initialCachedWarning = cachedWarning
|
||||
|
||||
super.init(nibName: nil, bundle: nil)
|
||||
|
||||
TopBannerController.lastInstance = self
|
||||
}
|
||||
|
||||
required init?(coder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
// MARK: - Lifecycle
|
||||
|
||||
public override func loadView() {
|
||||
super.loadView()
|
||||
|
||||
view.addSubview(contentStackView)
|
||||
|
||||
contentStackView.addArrangedSubview(bannerContainer)
|
||||
|
||||
child.willMove(toParent: self)
|
||||
addChild(child)
|
||||
contentStackView.addArrangedSubview(child.view)
|
||||
child.didMove(toParent: self)
|
||||
|
||||
bannerContainer.addSubview(bannerLabel)
|
||||
bannerContainer.addSubview(closeButton)
|
||||
|
||||
setupLayout()
|
||||
|
||||
// If we had an initial warning then show it
|
||||
if let warning: Warning = self.initialCachedWarning {
|
||||
UIView.performWithoutAnimation {
|
||||
TopBannerController.show(warning: warning)
|
||||
}
|
||||
|
||||
self.initialCachedWarning = nil
|
||||
}
|
||||
}
|
||||
|
||||
private func setupLayout() {
|
||||
contentStackView.pin(.top, to: .top, of: view.safeAreaLayoutGuide)
|
||||
contentStackView.pin(.leading, to: .leading, of: view)
|
||||
contentStackView.pin(.trailing, to: .trailing, of: view)
|
||||
contentStackView.pin(.bottom, to: .bottom, of: view)
|
||||
|
||||
bannerLabel.pin(.top, to: .top, of: view.safeAreaLayoutGuide, withInset: Values.verySmallSpacing)
|
||||
bannerLabel.pin(.leading, to: .leading, of: bannerContainer, withInset: Values.veryLargeSpacing)
|
||||
bannerLabel.pin(.trailing, to: .trailing, of: bannerContainer, withInset: -Values.veryLargeSpacing)
|
||||
bottomConstraint.isActive = false
|
||||
|
||||
let buttonSize: CGFloat = (12 + (Values.smallSpacing * 2))
|
||||
closeButton.center(.vertical, in: bannerLabel)
|
||||
closeButton.pin(.trailing, to: .trailing, of: bannerContainer, withInset: -Values.smallSpacing)
|
||||
closeButton.set(.width, to: buttonSize)
|
||||
closeButton.set(.height, to: buttonSize)
|
||||
}
|
||||
|
||||
// MARK: - Actions
|
||||
|
||||
@objc private func dismissBanner() {
|
||||
// Remove the cached warning
|
||||
UserDefaults.sharedLokiProject?[.topBannerWarningToShow] = nil
|
||||
|
||||
UIView.animate(
|
||||
withDuration: 0.3,
|
||||
animations: { [weak self] in
|
||||
self?.bottomConstraint.isActive = false
|
||||
self?.contentStackView.setNeedsLayout()
|
||||
self?.contentStackView.layoutIfNeeded()
|
||||
},
|
||||
completion: { [weak self] _ in
|
||||
self?.bannerContainer.isHidden = true
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
// MARK: - Functions
|
||||
|
||||
public static func show(warning: Warning, inWindowFor view: UIView? = nil) {
|
||||
guard Thread.isMainThread else {
|
||||
DispatchQueue.main.async {
|
||||
TopBannerController.show(warning: warning, inWindowFor: view)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// Not an ideal approach but should allow
|
||||
guard let instance: TopBannerController = ((view?.window?.rootViewController as? TopBannerController) ?? TopBannerController.lastInstance) else {
|
||||
return
|
||||
}
|
||||
|
||||
// Cache the banner to show (so we can show it on re-launch)
|
||||
UserDefaults.sharedLokiProject?[.topBannerWarningToShow] = warning.rawValue
|
||||
|
||||
UIView.performWithoutAnimation {
|
||||
instance.bannerLabel.text = warning.text
|
||||
instance.bannerLabel.setNeedsLayout()
|
||||
instance.bannerLabel.layoutIfNeeded()
|
||||
instance.bottomConstraint.isActive = false
|
||||
instance.bannerContainer.isHidden = false
|
||||
}
|
||||
|
||||
UIView.animate(withDuration: 0.3) { [weak instance] in
|
||||
instance?.bottomConstraint.isActive = true
|
||||
instance?.contentStackView.setNeedsLayout()
|
||||
instance?.contentStackView.layoutIfNeeded()
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
// Copyright © 2022 Rangeproof Pty Ltd. All rights reserved.
|
||||
|
||||
import Foundation
|
||||
|
||||
public extension Data {
|
||||
|
||||
/// Returns `size` bytes of random data generated using the default secure random number generator. See
|
||||
/// [SecRandomCopyBytes](https://developer.apple.com/documentation/security/1399291-secrandomcopybytes) for more information.
|
||||
static func getSecureRandomData(ofSize size: UInt) -> Data? {
|
||||
var data = Data(count: Int(size))
|
||||
let result = data.withUnsafeMutableBytes { SecRandomCopyBytes(kSecRandomDefault, Int(size), $0.baseAddress!) }
|
||||
guard result == errSecSuccess else { return nil }
|
||||
return data
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,86 @@
|
||||
// Copyright © 2023 Rangeproof Pty Ltd. All rights reserved.
|
||||
|
||||
import Foundation
|
||||
|
||||
import Quick
|
||||
import Nimble
|
||||
|
||||
@testable import SessionUtilitiesKit
|
||||
|
||||
class ArrayUtilitiesSpec: QuickSpec {
|
||||
private struct TestType: Equatable {
|
||||
let stringValue: String
|
||||
let intValue: Int
|
||||
}
|
||||
|
||||
// MARK: - Spec
|
||||
|
||||
override func spec() {
|
||||
describe("an Array") {
|
||||
context("when grouping") {
|
||||
it("maintains the original array ordering") {
|
||||
let data: [TestType] = [
|
||||
TestType(stringValue: "b", intValue: 5),
|
||||
TestType(stringValue: "A", intValue: 2),
|
||||
TestType(stringValue: "z", intValue: 1),
|
||||
TestType(stringValue: "x", intValue: 3),
|
||||
TestType(stringValue: "7", intValue: 6),
|
||||
TestType(stringValue: "A", intValue: 7),
|
||||
TestType(stringValue: "z", intValue: 8),
|
||||
TestType(stringValue: "7", intValue: 9),
|
||||
TestType(stringValue: "7", intValue: 4),
|
||||
TestType(stringValue: "h", intValue: 2),
|
||||
TestType(stringValue: "z", intValue: 1),
|
||||
TestType(stringValue: "m", intValue: 2)
|
||||
]
|
||||
|
||||
let result1: [String: [TestType]] = data.grouped(by: \.stringValue)
|
||||
let result2: [Int: [TestType]] = data.grouped(by: \.intValue)
|
||||
|
||||
expect(result1).to(equal(
|
||||
[
|
||||
"b": [TestType(stringValue: "b", intValue: 5)],
|
||||
"A": [
|
||||
TestType(stringValue: "A", intValue: 2),
|
||||
TestType(stringValue: "A", intValue: 7)
|
||||
],
|
||||
"z": [
|
||||
TestType(stringValue: "z", intValue: 1),
|
||||
TestType(stringValue: "z", intValue: 8),
|
||||
TestType(stringValue: "z", intValue: 1)
|
||||
],
|
||||
"x": [TestType(stringValue: "x", intValue: 3)],
|
||||
"7": [
|
||||
TestType(stringValue: "7", intValue: 6),
|
||||
TestType(stringValue: "7", intValue: 9),
|
||||
TestType(stringValue: "7", intValue: 4)
|
||||
],
|
||||
"h": [TestType(stringValue: "h", intValue: 2)],
|
||||
"m": [TestType(stringValue: "m", intValue: 2)]
|
||||
]
|
||||
))
|
||||
expect(result2).to(equal(
|
||||
[
|
||||
1: [
|
||||
TestType(stringValue: "z", intValue: 1),
|
||||
TestType(stringValue: "z", intValue: 1),
|
||||
],
|
||||
2: [
|
||||
TestType(stringValue: "A", intValue: 2),
|
||||
TestType(stringValue: "h", intValue: 2),
|
||||
TestType(stringValue: "m", intValue: 2)
|
||||
],
|
||||
3: [TestType(stringValue: "x", intValue: 3)],
|
||||
4: [TestType(stringValue: "7", intValue: 4)],
|
||||
5: [TestType(stringValue: "b", intValue: 5)],
|
||||
6: [TestType(stringValue: "7", intValue: 6)],
|
||||
7: [TestType(stringValue: "A", intValue: 7)],
|
||||
9: [TestType(stringValue: "7", intValue: 9)],
|
||||
8: [TestType(stringValue: "z", intValue: 8)]
|
||||
]
|
||||
))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue