From 9f3d9cf7ab5c81dccf3b957d1460107809282371 Mon Sep 17 00:00:00 2001 From: Kee Jefferys Date: Wed, 7 Jun 2023 11:27:53 +1000 Subject: [PATCH 1/3] Update Session iOS screenshot --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d9fad1746..a95bbb2e2 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Session integrates directly with [Oxen Service Nodes](https://docs.oxen.io/about-the-oxen-blockchain/oxen-service-nodes), which are a set of distributed, decentralized and Sybil resistant nodes. Service Nodes act as servers which store messages, and a set of nodes which allow for onion routing functionality obfuscating users' IP addresses. For a full understanding of how Session works, read the [Session Whitepaper](https://getsession.org/whitepaper). - + ## Want to contribute? Found a bug or have a feature request? From e43ec1db43ec5182895e9e856fd76dc62b712831 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Wed, 4 Oct 2023 09:29:57 +1100 Subject: [PATCH 2/3] Removed another random deleted file reference from the pbxproj --- Session.xcodeproj/project.pbxproj | 1 - 1 file changed, 1 deletion(-) diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index 8c24e19f9..d7ce9a203 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -6106,7 +6106,6 @@ FD09798B27FD1CFE00936362 /* Capability.swift in Sources */, C3BBE0C72554F1570050F1E3 /* FixedWidthInteger+BigEndian.swift in Sources */, FD1D732A2A85AA2000E3F410 /* Setting+Utilities.swift in Sources */, - FD17D79C27F40B2E00122BE0 /* SMKLegacy.swift in Sources */, FD09798127FCFEE800936362 /* SessionThread.swift in Sources */, FD09C5EA282A1BB2000CE219 /* ThreadTypingIndicator.swift in Sources */, FDF0B75E280AAF35004C14C5 /* Preferences.swift in Sources */, From 8346a2e6103752ba20ee11e5c6d5778a47386b37 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Wed, 4 Oct 2023 09:31:08 +1100 Subject: [PATCH 3/3] Fixed an issue where string validation was failing on archive builds --- Scripts/LintLocalizableStrings.swift | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Scripts/LintLocalizableStrings.swift b/Scripts/LintLocalizableStrings.swift index 456c06fc5..56bfe186a 100755 --- a/Scripts/LintLocalizableStrings.swift +++ b/Scripts/LintLocalizableStrings.swift @@ -104,8 +104,19 @@ enum ScriptAction: String { guard let builtProductsPath: String = ProcessInfo.processInfo.environment["BUILT_PRODUCTS_DIR"], let productName: String = ProcessInfo.processInfo.environment["FULL_PRODUCT_NAME"], + let productPathInfo = try? URL(fileURLWithPath: "\(builtProductsPath)/\(productName)") + .resourceValues(forKeys: [.isSymbolicLinkKey, .isAliasFileKey]), + let finalProductUrl: URL = try? { () -> URL in + let possibleAliasUrl: URL = URL(fileURLWithPath: "\(builtProductsPath)/\(productName)") + + guard productPathInfo.isSymbolicLink == true || productPathInfo.isAliasFile == true else { + return possibleAliasUrl + } + + return try URL(resolvingAliasFileAt: possibleAliasUrl, options: URL.BookmarkResolutionOptions()) + }(), let enumerator: FileManager.DirectoryEnumerator = FileManager.default.enumerator( - at: URL(fileURLWithPath: "\(builtProductsPath)/\(productName)"), + at: finalProductUrl, includingPropertiesForKeys: [.isDirectoryKey], options: [.skipsHiddenFiles] ),