keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed a number of QA issues

Browse Source 
• Fixed some incorrect copy when joining a community
• Fixed a missing space in the legacy groups banner
• Fixed an issue where voice recordings weren't working
• Fixed an issue where the clear data modal wouldn't timeout quickly enough
• Fixed an issue where the clear data modal wasn't showing the fallback modal
• Fixed an issue where the clear data request wasn't structured correctly
• Fixed an issue where modals with input fields would always reposition (rather than only when keyboard avoidance required it)
pull/894/head
Morgan Pretty 4 months ago
parent 7c4f0e8ef2
commit a5df142c69
11 changed files with 44 additions and 65 deletions
Show Stats Download Patch File Download Diff File

4
Session.xcodeproj/project.pbxproj
Unescape Escape View File

@ -7888,7 +7888,7 @@
CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 508;
CURRENT_PROJECT_VERSION = 515;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -7964,7 +7964,7 @@
CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 508;
CURRENT_PROJECT_VERSION = 515;
ENABLE_BITCODE = NO;
ENABLE_MODULE_VERIFIER = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;

22
Session/Conversations/ConversationVC+Interaction.swift
Unescape Escape View File

@ -1782,19 +1782,13 @@ extension ConversationVC:
func joinOpenGroup(name: String?, url: String) {
// Open groups can be unsafe, so always ask the user whether they want to join one
let finalName: String = (name ?? "communityUnknown".localized())
let message: String = "communityJoinDescription"
.put(key: "community_name", value: finalName)
.localized()
let modal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "join".localized() + " \(finalName)?",
title: "communityJoin".localized(),
body: .attributedText(
NSMutableAttributedString(string: message)
.adding(
attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.smallFontSize) ],
range: (message as NSString).range(of: finalName)
)
"communityJoinDescription"
.put(key: "community_name", value: (name ?? "communityUnknown".localized()))
.localizedFormatted(baseFont: ConfirmationModal.explanationFont)
),
confirmTitle: "join".localized(),
onConfirm: { [dependencies = viewModel.dependencies] modal in
@ -1805,9 +1799,7 @@ extension ConversationVC:
guard let (room, server, publicKey) = LibSession.parseCommunity(url: url) else {
let errorModal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "communityJoinError"
.put(key: "community_name", value: finalName)
.localized(),
title: "communityJoinError".localized(),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
@ -1857,9 +1849,7 @@ extension ConversationVC:
// Show the user an error indicating they failed to properly join the group
let errorModal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "communityJoinError"
.put(key: "community_name", value: finalName)
.localized(),
title: "communityJoinError".localized(),
body: .text("\(error)"),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text

5
Session/Conversations/ConversationVC.swift
Unescape Escape View File

@ -235,15 +235,18 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
}()
lazy var legacyGroupsBanner: InfoBanner = {
// FIXME: String should be updated in Crowdin to include the {icon}
let result: InfoBanner = InfoBanner(
info: InfoBanner.Info(
font: .systemFont(ofSize: Values.miniFontSize),
message: "groupLegacyBanner"
.put(key: "date", value: Features.legacyGroupDepricationDate.formattedForBanner)
.localizedFormatted(baseFont: .systemFont(ofSize: Values.miniFontSize))
.appending(string: " ") // Designs have a space before the icon
.appending(
Lucide.Icon.squareArrowUpRight.attributedString(for: .systemFont(ofSize: Values.miniFontSize))
),
)
.appending(string: " "), // In case it's a RTL font
icon: .none,
tintColor: .messageBubble_outgoingText,
backgroundColor: .primary,

4
Session/Conversations/Input View/ExpandingAttachmentsButton.swift
Unescape Escape View File

@ -148,6 +148,10 @@ final class ExpandingAttachmentsButton: UIView, InputViewButtonDelegate {
if inputViewButton == mainButton { isExpanded = !isExpanded }
}
func handleInputViewButtonLongPressBegan(_ inputViewButton: InputViewButton?) {}
func handleInputViewButtonLongPressMoved(_ inputViewButton: InputViewButton, with touch: UITouch?) {}
func handleInputViewButtonLongPressEnded(_ inputViewButton: InputViewButton, with touch: UITouch?) {}
// MARK: Convenience
private func container(for button: InputViewButton) -> UIView {
let result = UIView()

2
Session/Conversations/Input View/InputView.swift
Unescape Escape View File

@ -435,7 +435,7 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M
if inputViewButton == sendButton { delegate?.handleSendButtonTapped() }
}
func handleInputViewButtonLongPressBegan(_ inputViewButton: InputViewButton?, using dependencies: Dependencies) {
func handleInputViewButtonLongPressBegan(_ inputViewButton: InputViewButton?) {
guard inputViewButton == voiceMessageButton else { return }
// Note: The 'showVoiceMessageUI' call MUST come before triggering 'startVoiceMessageRecording'

6
Session/Conversations/Input View/InputViewButton.swift
Unescape Escape View File

@ -196,9 +196,3 @@ protocol InputViewButtonDelegate: AnyObject {
func handleInputViewButtonLongPressMoved(_ inputViewButton: InputViewButton, with touch: UITouch?)
func handleInputViewButtonLongPressEnded(_ inputViewButton: InputViewButton, with touch: UITouch?)
}
extension InputViewButtonDelegate {
func handleInputViewButtonLongPressBegan(_ inputViewButton: InputViewButton?) { }
func handleInputViewButtonLongPressMoved(_ inputViewButton: InputViewButton, with touch: UITouch?) { }
func handleInputViewButtonLongPressEnded(_ inputViewButton: InputViewButton, with touch: UITouch?) { }
}

41
Session/Settings/NukeDataModal.swift
Unescape Escape View File

@ -230,34 +230,19 @@ final class NukeDataModal: Modal {
case .failure(let error):
self?.dismiss(animated: true, completion: nil) // Dismiss the loader
switch error {
case NetworkError.timeout, NetworkError.gatewayTimeout:
let modal: ConfirmationModal = ConfirmationModal(
targetView: self?.view,
info: ConfirmationModal.Info(
title: "clearDataAll".localized(),
body: .text("clearDataErrorDescriptionGeneric".localized()),
confirmTitle: "clearDevice".localized(),
confirmStyle: .danger,
cancelStyle: .alert_text
) { [weak self] _ in
self?.clearDeviceOnly()
}
)
self?.present(modal, animated: true)
default:
let modal: ConfirmationModal = ConfirmationModal(
targetView: self?.view,
info: ConfirmationModal.Info(
title: "clearDataError".localized(),
body: .text("\(error)"),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)
self?.present(modal, animated: true)
}
let modal: ConfirmationModal = ConfirmationModal(
targetView: self?.view,
info: ConfirmationModal.Info(
title: "clearDataAll".localized(),
body: .text("clearDataErrorDescriptionGeneric".localized()),
confirmTitle: "clearDevice".localized(),
confirmStyle: .danger,
cancelStyle: .alert_text
) { [weak self] _ in
self?.clearDeviceOnly()
}
)
self?.present(modal, animated: true)
}
},
receiveValue: { confirmations in

7
SessionSnodeKit/SnodeAPI/Request+SnodeAPI.swift
Unescape Escape View File

@ -58,7 +58,12 @@ public extension Request where Endpoint == SnodeAPI.Endpoint {
destination: .randomSnodeLatestNetworkTimeTarget(
swarmPublicKey: swarmPublicKey,
snodeRetrievalRetryCount: snodeRetrievalRetryCount,
bodyWithUpdatedTimestampMs: { timestampMs, dependencies in body.with(timestampMs: timestampMs) }
bodyWithUpdatedTimestampMs: { timestampMs, dependencies in
SnodeRequest<B>(
endpoint: endpoint,
body: body.with(timestampMs: timestampMs)
)
}
),
body: SnodeRequest<B>(
endpoint: endpoint,

4
SessionSnodeKit/SnodeAPI/SnodeAPI.swift
Unescape Escape View File

@ -563,10 +563,10 @@ public final class SnodeAPI {
namespace: namespace,
authMethod: authMethod,
timestampMs: dependencies[cache: .snodeAPI].currentOffsetTimestampMs()
)
),
snodeRetrievalRetryCount: 0
),
responseType: DeleteAllMessagesResponse.self,
retryCount: maxRetryCount,
requestTimeout: requestTimeout,
requestAndPathBuildTimeout: requestAndPathBuildTimeout,
using: dependencies

12
SessionUIKit/Components/ConfirmationModal.swift
Unescape Escape View File

@ -519,12 +519,6 @@ public class ConfirmationModal: Modal, UITextFieldDelegate, UITextViewDelegate {
)
}
// No nothing if there was no change
// let keyboardEndFrameConverted: CGRect = self.view.convert(keyboardEndFrame, from: nil)
// guard keyboardEndFrameConverted != lastKnownKeyboardFrame else { return }
//
// self.lastKnownKeyboardFrame = keyboardEndFrameConverted
// Please refer to https://github.com/mapbox/mapbox-navigation-ios/issues/1600
// and https://stackoverflow.com/a/25260930 to better understand what we are
// doing with the UIViewAnimationOptions
@ -555,7 +549,11 @@ public class ConfirmationModal: Modal, UITextFieldDelegate, UITextViewDelegate {
}
private func updateKeyboardAvoidance(keyboardEndFrame: CGRect) {
contentTopConstraint?.isActive = (keyboardEndFrame.minY < (view.bounds.height - 100))
let contentCenteredBottom: CGFloat = (view.center.y + (contentView.bounds.height / 2))
contentTopConstraint?.isActive = (
((keyboardEndFrame.minY - contentCenteredBottom) < 10) &&
keyboardEndFrame.minY < (view.bounds.height - 100)
)
contentCenterYConstraint?.isActive = (contentTopConstraint?.isActive != true)
}
}

2
SessionUIKit/Components/Modal.swift
Unescape Escape View File

@ -115,7 +115,7 @@ open class Modal: UIViewController, UIGestureRecognizerDelegate {
containerView.center(.horizontal, in: view)
contentCenterYConstraint = containerView.center(.vertical, in: view)
contentTopConstraint = containerView
.pin(.top, toMargin: .top, of: view)
.pin(.top, toMargin: .top, of: view, withInset: 10)
.setting(isActive: false)
// Gestures

Write Preview
Loading…
Cancel
Save