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

Merge pull request #1027 from oxen-io/dev

Browse Source 
Release 2.8.0
master 2.8.0
Morgan Pretty 6 months ago committed by GitHub
parent 83ec93754d a1c3d53569
commit b994d52825
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
231 changed files with 392613 additions and 52179 deletions
Show Stats Download Patch File Download Diff File

29
Scripts/EmojiGenerator.swift
Unescape Escape View File

@ -52,6 +52,33 @@ enum RemoteModel {
case symbols = "Symbols"
case flags = "Flags"
case components = "Component"
var localizedKey: String = {
switch self {
case .smileys:
return "Smileys"
case .people:
return "People"
case .smileysAndPeople:
return "Smileys"
case .animals:
return "Animals"
case .food:
return "Food"
case .activities:
return "Activities"
case .travel:
return "Travel"
case .objects:
return "Objects"
case .symbols:
return "Symbols"
case .flags:
return "Flags"
case .components:
return "Component"
}
}()
}
static func fetchEmojiData() throws -> Data {
@ -551,7 +578,7 @@ extension EmojiGenerator {
for category in outputCategories {
fileHandle.writeLine("case .\(category):")
fileHandle.indent {
let stringKey = "EMOJI_CATEGORY_\("\(category)".uppercased())_NAME"
let stringKey = "emojiCategory\(category.localizedKey)"
let stringComment = "The name for the emoji category '\(category.rawValue)'"
fileHandle.writeLine("return NSLocalizedString(\"\(stringKey)\", comment: \"\(stringComment)\")")

262
Scripts/LintLocalizableStrings.swift
Unescape Escape View File

@ -2,19 +2,39 @@
// Copyright © 2023 Rangeproof Pty Ltd. All rights reserved.
//
// This script is based on https://github.com/ginowu7/CleanSwiftLocalizableExample the main difference
// is canges to the localized usage regex
//
// stringlint:disable
//
/// This script is based on https://github.com/ginowu7/CleanSwiftLocalizableExample
/// The main differences are:
/// 1. Changes to the localized usage regex
/// 2. Addition to excluded unlocalized cases
/// 3. Functionality to update and copy localized permission requirement strings to infoPlist.xcstrings
import Foundation
typealias JSON = [String:AnyHashable]
extension ProjectState {
/// Adding `// stringlint:disable` to the top of a source file (before imports) or after a string will mean that file/line gets
/// ignored by this script (good for some things like the auto-generated emoji strings or debug strings)
static let lintSuppression: String = "stringlint:disable"
static let primaryLocalisationFile: String = "en"
static let validLocalisationSuffixes: Set<String> = ["Localizable.strings"]
static let primaryLocalisation: String = "en"
static let permissionStrings: Set<String> = [
"permissionsStorageSend",
"permissionsFaceId",
"cameraGrantAccessDescription",
"permissionsAppleMusic",
"permissionsStorageSave",
"permissionsMicrophoneAccessRequiredIos"
]
static let permissionStringsMap: [String: String] = [
"permissionsStorageSend": "NSPhotoLibraryUsageDescription",
"permissionsFaceId": "NSFaceIDUsageDescription",
"cameraGrantAccessDescription": "NSCameraUsageDescription",
"permissionsAppleMusic": "NSAppleMusicUsageDescription",
"permissionsStorageSave": "NSPhotoLibraryAddUsageDescription",
"permissionsMicrophoneAccessRequiredIos": "NSMicrophoneUsageDescription"
]
static let validSourceSuffixes: Set<String> = [".swift", ".m"]
static let excludedPaths: Set<String> = [
"build/", // Files under the build folder (CI)
@ -27,8 +47,8 @@ extension ProjectState {
"_SharedTestUtilities/", // Exclude shared test directory
"external/" // External dependencies
]
static let excludedPhrases: Set<String> = [ "", " ", ",", ", ", "null" ]
static let excludedUnlocalisedStringLineMatching: Set<MatchType> = [
static let excludedPhrases: Set<String> = [ "", " ", " ", ",", ", ", "null", "\"", "@[0-9a-fA-F]{66}", "^[0-9A-Fa-f]+$", "/" ]
static let excludedUnlocalizedStringLineMatching: Set<MatchType> = [
.contains(ProjectState.lintSuppression, caseSensitive: false),
.prefix("#import", caseSensitive: false),
.prefix("@available(", caseSensitive: false),
@ -53,9 +73,9 @@ extension ProjectState {
.contains("[UIImage imageNamed:", caseSensitive: false),
.contains("UIFont(name:", caseSensitive: false),
.contains(".dateFormat =", caseSensitive: false),
.contains(".accessibilityLabel =", caseSensitive: false),
.contains(".accessibilityValue =", caseSensitive: false),
.contains(".accessibilityIdentifier =", caseSensitive: false),
.contains("accessibilityLabel =", caseSensitive: false),
.contains("accessibilityValue =", caseSensitive: false),
.contains("accessibilityIdentifier =", caseSensitive: false),
.contains("accessibilityIdentifier:", caseSensitive: false),
.contains("accessibilityLabel:", caseSensitive: false),
.contains("Accessibility(identifier:", caseSensitive: false),
@ -80,6 +100,19 @@ extension ProjectState {
.previousLine(numEarlier: 2, .contains("Accessibility(", caseSensitive: false))
),
.contains("SQL(", caseSensitive: false),
.contains(" == ", caseSensitive: false),
.contains("forResource:", caseSensitive: false),
.contains("imageName:", caseSensitive: false),
.contains(".userInfo[", caseSensitive: false),
.contains("payload[", caseSensitive: false),
.contains(".infoDictionary?[", caseSensitive: false),
.contains("accessibilityId:", caseSensitive: false),
.contains("key:", caseSensitive: false),
.contains("separator:", caseSensitive: false),
.contains("separatedBy:", caseSensitive: false),
.nextLine(.contains(".put(key:", caseSensitive: false)),
.nextLine(.contains(".putNumber(", caseSensitive: false)),
.nextLine(.contains(".localized()", caseSensitive: false)),
.regex(".*static var databaseTableName: String"),
.regex("case .* = "),
.regex("Error.*\\("),
@ -105,7 +138,7 @@ let projectState: ProjectState = ProjectState(
),
loadSourceFiles: targetActions.contains(.lintStrings)
)
print("------------ Processing \(projectState.localizationFiles.count) Localization File(s) ------------")
print("------------ Processing \(projectState.localizationFile.path) ------------")
targetActions.forEach { $0.perform(projectState: projectState) }
// MARK: - ScriptAction
@ -113,6 +146,7 @@ targetActions.forEach { $0.perform(projectState: projectState) }
enum ScriptAction: String {
case validateFilesCopied = "validate"
case lintStrings = "lint"
case updatePermissionStrings = "update"
func perform(projectState: ProjectState) {
// Perform the action
@ -140,59 +174,62 @@ enum ScriptAction: String {
),
let fileUrls: [URL] = enumerator.allObjects as? [URL]
else { return Output.error("Could not retrieve list of files within built product") }
let localizationFiles: Set<String> = Set(fileUrls
.filter { $0.path.hasSuffix(".lproj") }
.map { $0.lastPathComponent.replacingOccurrences(of: ".lproj", with: "") })
let missingFiles: Set<String> = Set(projectState.localizationFiles
.map { $0.name })
let missingFiles: Set<String> = projectState.localizationFile.locales
.subtracting(localizationFiles)
guard missingFiles.isEmpty else {
return Output.error("Translations missing from \(productName): \(missingFiles.joined(separator: ", "))")
}
break
case .lintStrings:
guard !projectState.localizationFiles.isEmpty else {
guard !projectState.localizationFile.strings.isEmpty else {
return print("------------ Nothing to lint ------------")
}
// Add warnings for any duplicate keys
projectState.localizationFiles.forEach { file in
// Show errors for any duplicates
file.duplicates.forEach { phrase, original in Output.duplicate(phrase, original: original) }
// Show warnings for any phrases missing from the file
let allKeys: Set<String> = Set(file.keyPhrase.keys)
let missingKeysFromOtherFiles: [String: [String]] = projectState.localizationFiles.reduce(into: [:]) { result, otherFile in
guard otherFile.path != file.path else { return }
let missingKeys: Set<String> = Set(otherFile.keyPhrase.keys)
.subtracting(allKeys)
missingKeys.forEach { missingKey in
result[missingKey] = ((result[missingKey] ?? []) + [otherFile.name])
}
var allKeys: [String] = []
var duplicates: [String] = []
projectState.localizationFile.strings.forEach { key, value in
if allKeys.contains(key) {
duplicates.append(key)
} else {
allKeys.append(key)
}
missingKeysFromOtherFiles.forEach { missingKey, namesOfFilesItWasFound in
Output.warning(file, "Phrase '\(missingKey)' is missing (found in: \(namesOfFilesItWasFound.joined(separator: ", ")))")
// Add warning for probably faulty translation
if let localizations: JSON = (value as? JSON)?["localizations"] as? JSON {
if let original: String = ((localizations["en"] as? JSON)?["stringUnit"] as? JSON)?["value"] as? String {
localizations.forEach { locale, translation in
if let phrase: String = ((translation as? JSON)?["stringUnit"] as? JSON)?["value"] as? String {
let numberOfVarablesOrignal = Regex.matches("\\{.*\\}", content: original).count
let numberOfVarablesPhrase = Regex.matches("\\{.*\\}", content: phrase).count
if numberOfVarablesPhrase != numberOfVarablesOrignal {
Output.warning("\(key) in \(locale) may be faulty")
}
}
}
}
}
}
// Add warnings for any duplicate keys
duplicates.forEach { Output.duplicate(key: $0) }
// Process the source code
print("------------ Processing \(projectState.sourceFiles.count) Source File(s) ------------")
let allKeys: Set<String> = Set(projectState.primaryLocalizationFile.keyPhrase.keys)
projectState.sourceFiles.forEach { file in
// Add logs for unlocalised strings
// Add logs for unlocalized strings
file.unlocalizedPhrases.forEach { phrase in
Output.warning(phrase, "Found unlocalized string '\(phrase.key)'")
}
// Add errors for missing localised strings
let missingKeys: Set<String> = Set(file.keyPhrase.keys).subtracting(allKeys)
// Add errors for missing localized strings
let missingKeys: Set<String> = Set(file.keyPhrase.keys).subtracting(Set(allKeys))
missingKeys.forEach { key in
switch file.keyPhrase[key] {
case .some(let phrase): Output.error(phrase, "Localized phrase '\(key)' missing from strings files")
@ -201,6 +238,40 @@ enum ScriptAction: String {
}
}
break
case .updatePermissionStrings:
print("------------ Updating permission strings ------------")
var strings: JSON = projectState.infoPlistLocalizationFile.strings
var updatedInfoPlistJSON: JSON = projectState.infoPlistLocalizationFile.json
ProjectState.permissionStrings.forEach { key in
guard let nsKey: String = ProjectState.permissionStringsMap[key] else { return }
if
let stringsData: Data = try? JSONSerialization.data(withJSONObject: (projectState.localizationFile.strings[key] as! JSON), options: [ .fragmentsAllowed ]),
let stringsJSONString: String = String(data: stringsData, encoding: .utf8)
{
let updatedStringsJSONString = stringsJSONString.replacingOccurrences(of: "{app_name}", with: "Session")
if
let updatedStringsData: Data = updatedStringsJSONString.data(using: .utf8),
let updatedStrings: JSON = try? JSONSerialization.jsonObject(with: updatedStringsData, options: [ .fragmentsAllowed ]) as? JSON
{
strings[nsKey] = updatedStrings
}
}
}
updatedInfoPlistJSON["strings"] = strings
guard updatedInfoPlistJSON != projectState.infoPlistLocalizationFile.json else {
return
}
if let data: Data = try? JSONSerialization.data(withJSONObject: updatedInfoPlistJSON, options: [ .fragmentsAllowed ]) {
do {
try data.write(to: URL(fileURLWithPath: projectState.infoPlistLocalizationFile.path), options: [.atomic])
} catch {
fatalError("Could not write to InfoPlist.xcstrings, error: \(error)")
}
}
break
}
print("------------ Complete ------------")
@ -244,6 +315,10 @@ enum Output {
print("\(location.location): error: \(error)")
}
static func warning(_ warning: String) {
print("warning: \(warning)")
}
static func warning(_ location: Locatable, _ warning: String) {
print("\(location.location): warning: \(warning)")
}
@ -258,14 +333,18 @@ enum Output {
// currently include the reference to the original entry
// print("\(original.location): note: previously found here")
}
static func duplicate(key: String) {
print("Error: duplicate key '\(key)'")
}
}
// MARK: - ProjectState
struct ProjectState {
let primaryLocalizationFile: LocalizationStringsFile
let localizationFiles: [LocalizationStringsFile]
let sourceFiles: [SourceFile]
let localizationFile: XCStringsFile
let infoPlistLocalizationFile: XCStringsFile
init(path: String, loadSourceFiles: Bool) {
guard
@ -283,17 +362,16 @@ struct ProjectState {
((try? fileUrl.resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory == false) &&
!lowerCaseExcludedPaths.contains { fileUrl.path.lowercased().contains($0) }
}
self.localizationFile = validFileUrls
.filter { fileUrl in fileUrl.path.contains("Localizable.xcstrings") }
.map { XCStringsFile(path: $0.path) }
.last!
// Localization files
let targetFileSuffixes: Set<String> = Set(ProjectState.validLocalisationSuffixes.map { $0.lowercased() })
self.localizationFiles = validFileUrls
.filter { fileUrl in targetFileSuffixes.contains { fileUrl.path.lowercased().contains($0) } }
.map { LocalizationStringsFile(path: $0.path) }
guard let primaryLocalizationFile: LocalizationStringsFile = self.localizationFiles.first(where: { $0.name == ProjectState.primaryLocalisationFile }) else {
fatalError("Could not locate primary localization file: \(ProjectState.primaryLocalisationFile)")
}
self.primaryLocalizationFile = primaryLocalizationFile
self.infoPlistLocalizationFile = validFileUrls
.filter { fileUrl in fileUrl.path.contains("InfoPlist.xcstrings") }
.map { XCStringsFile(path: $0.path) }
.last!
guard loadSourceFiles else {
self.sourceFiles = []
@ -317,74 +395,39 @@ protocol KeyedLocatable: Locatable {
}
extension ProjectState {
// MARK: - LocalizationStringsFile
// MARK: - XCStringsFile
struct LocalizationStringsFile: Locatable {
struct Phrase: KeyedLocatable {
let key: String
let value: String
let filePath: String
let lineNumber: Int
var location: String { "\(filePath):\(lineNumber)" }
}
struct XCStringsFile: Locatable {
let name: String
let path: String
let keyPhrase: [String: Phrase]
let duplicates: [(Phrase, original: Phrase)]
var json: JSON
var strings: JSON
var locales: Set<String> = Set()
var location: String { path }
init(path: String) {
let result = LocalizationStringsFile.parse(path)
self.name = (path
.replacingOccurrences(of: "/Localizable.strings", with: "")
.replacingOccurrences(of: ".lproj", with: "")
.replacingOccurrences(of: ".xcstrings", with: "")
.components(separatedBy: "/")
.last ?? "Unknown")
self.path = path
self.keyPhrase = result.keyPhrase
self.duplicates = result.duplicates
self.json = XCStringsFile.parse(path)
self.strings = self.json["strings"] as! JSON
self.strings.values.forEach { value in
if let localizations: JSON = (value as? JSON)?["localizations"] as? JSON {
self.locales.formUnion(localizations.map{ $0.key })
}
}
}
static func parse(_ path: String) -> (keyPhrase: [String: Phrase], duplicates: [(Phrase, original: Phrase)]) {
static func parse(_ path: String) -> JSON {
guard
let data: Data = FileManager.default.contents(atPath: path),
let content: String = String(data: data, encoding: .utf8)
let json: JSON = try? JSONSerialization.jsonObject(with: data, options: [ .fragmentsAllowed ]) as? JSON
else { fatalError("Could not read from path: \(path)") }
let lines: [String] = content.components(separatedBy: .newlines)
var duplicates: [(Phrase, original: Phrase)] = []
var keyPhrase: [String: Phrase] = [:]
lines.enumerated().forEach { lineNumber, line in
guard
let key: String = Regex.matches("\"([^\"]*?)\"(?= =)", content: line).first,
let value: String = Regex.matches("(?<== )\"(.*?)\"(?=;)", content: line).first
else { return }
// Remove the quotation marks around the key
let trimmedKey: String = String(key
.prefix(upTo: key.index(before: key.endIndex))
.suffix(from: key.index(after: key.startIndex)))
// Files are 1-indexed but arrays are 0-indexed so add 1 to the lineNumber
let result: Phrase = Phrase(
key: trimmedKey,
value: value,
filePath: path,
lineNumber: (lineNumber + 1)
)
switch keyPhrase[trimmedKey] {
case .some(let original): duplicates.append((result, original))
case .none: keyPhrase[trimmedKey] = result
}
}
return (keyPhrase, duplicates)
return json
}
}
@ -446,7 +489,7 @@ extension ProjectState {
// been suppressed or it's explicitly excluded due to the rules at the top of the file
guard
trimmedLine.contains("\"") &&
!ProjectState.excludedUnlocalisedStringLineMatching
!ProjectState.excludedUnlocalizedStringLineMatching
.contains(where: { $0.matches(trimmedLine, lineNumber, lines) })
else { return }
@ -459,7 +502,7 @@ extension ProjectState {
line.components(separatedBy: commentMatches[0])[0]
)
// Use regex to find `NSLocalizedString("", "")`, `"".localised()` and any other `""`
// Use regex to find `NSLocalizedString("", "")`, `"".localized()` and any other `""`
// values in the source code
//
// Note: It's more complex because we need to exclude escaped quotation marks from
@ -504,7 +547,7 @@ extension ProjectState {
/// **Note:** While it'd be nice to have the regex automatically exclude the quotes doing so makes it _far_ less
/// efficient (approx. by a factor of 8 times) so we remove those ourselves)
if allMatches.isEmpty {
// Find strings which are just not localised
// Find strings which are just not localized
let potentialUnlocalizedStrings: [String] = Regex
.matches("\\\"[^\\\"\\\\]*(?:\\\\.[^\\\"\\\\]*)*(?:\\\")", content: targetLine)
// Remove the leading and trailing quotation marks
@ -551,6 +594,7 @@ indirect enum MatchType: Hashable {
case containsAnd(String, caseSensitive: Bool, MatchType)
case regex(String)
case previousLine(numEarlier: Int, MatchType)
case nextLine(MatchType)
case belowLineContaining(String)
func matches(_ value: String, _ index: Int, _ lines: [String]) -> Bool {
@ -585,7 +629,11 @@ indirect enum MatchType: Hashable {
let targetIndex: Int = (index - numEarlier)
return type.matches(lines[targetIndex], targetIndex, lines)
case .nextLine(let type):
guard index + 1 < lines.count else { return false }
return type.matches(lines[index + 1], index + 1, lines)
case .belowLineContaining(let other):
return lines[0..<index].contains(where: { $0.lowercased().contains(other.lowercased()) })
}

20
Scripts/ProcessIP2CountryData.swift
Unescape Escape View File

@ -126,7 +126,7 @@ class Processor {
guard keepRunning else { return }
/// Filter down the files to find the country name files
let localisedCountryNameFileUrls: [URL] = fileUrls.filter { fileUrl in
let localizedCountryNameFileUrls: [URL] = fileUrls.filter { fileUrl in
((try? fileUrl.resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory == false) &&
fileUrl.lastPathComponent.lowercased().hasPrefix(countryNameFilePrefix.lowercased()) &&
fileUrl.lastPathComponent.lowercased().hasSuffix(".csv")
@ -134,11 +134,11 @@ class Processor {
guard keepRunning else { return }
let languageCodes: String = localisedCountryNameFileUrls
let languageCodes: String = localizedCountryNameFileUrls
.map { url in String(url.lastPathComponent.dropFirst(countryNameFilePrefix.count).dropLast(".csv".count)) }
.sorted()
.joined(separator: ", ")
print("Found \(localisedCountryNameFileUrls.count) language files ✅ (\(languageCodes))")
print("Found \(localizedCountryNameFileUrls.count) language files ✅ (\(languageCodes))")
guard keepRunning else { return }
@ -184,16 +184,16 @@ class Processor {
/// Structure of the data should be `geoname_id,locale_code,continent_code,continent_name,country_iso_code,country_name,is_in_european_union`
let languagesPrefix: String = "Processing languages: "
localisedCountryNameFileUrls.enumerated().forEach { fileIndex, fileUrl in
localizedCountryNameFileUrls.enumerated().forEach { fileIndex, fileUrl in
guard keepRunning else { return }
guard
let localisedData: Data = try? Data(contentsOf: fileUrl),
let localisedDataString: String = String(data: localisedData, encoding: .utf8)
else { fatalError("Could not load localised country name file") }
let localizedData: Data = try? Data(contentsOf: fileUrl),
let localizedDataString: String = String(data: localizedData, encoding: .utf8)
else { fatalError("Could not load localized country name file") }
/// Header line plus at least one line of content
let lines: [String] = localisedDataString.components(separatedBy: "\n")
guard lines.count > 1 else { fatalError("Localised country file had no content") }
let lines: [String] = localizedDataString.components(separatedBy: "\n")
guard lines.count > 1 else { fatalError("localized country file had no content") }
lines[1...].enumerated().forEach { index, line in
let values: [String] = parseCsvLine(line.trimmingCharacters(in: .whitespacesAndNewlines))
@ -203,7 +203,7 @@ class Processor {
cache.countryLocationsGeonameId.append(values[0])
cache.countryLocationsCountryName.append(values[5].trimmingCharacters(in: CharacterSet(charactersIn: "\"")))
let progress = (Double((fileIndex * lines.count) + index) / Double(localisedCountryNameFileUrls.count * lines.count))
let progress = (Double((fileIndex * lines.count) + index) / Double(localizedCountryNameFileUrls.count * lines.count))
printProgressBar(prefix: languagesPrefix, progress: progress, total: (terminalWidth - 10))
}
}

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

@ -164,6 +164,8 @@
7BFA8AE32831D0D4001876F3 /* ContextMenuVC+EmojiReactsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFA8AE22831D0D4001876F3 /* ContextMenuVC+EmojiReactsView.swift */; };
7BFD1A8A2745C4F000FB91B9 /* Permissions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BFD1A892745C4F000FB91B9 /* Permissions.swift */; };
7BFD1A972747689000FB91B9 /* Session-Turn-Server in Resources */ = {isa = PBXBuildFile; fileRef = 7BFD1A962747689000FB91B9 /* Session-Turn-Server */; };
9409433E2C7EB81800D9D2E0 /* WebRTCSession+Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9409433D2C7EB81800D9D2E0 /* WebRTCSession+Constants.swift */; };
940943402C7ED62300D9D2E0 /* StartupError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9409433F2C7ED62300D9D2E0 /* StartupError.swift */; };
942256802C23F8BB00C0FDBF /* StartConversationScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9422567D2C23F8BB00C0FDBF /* StartConversationScreen.swift */; };
942256812C23F8BB00C0FDBF /* NewMessageScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9422567E2C23F8BB00C0FDBF /* NewMessageScreen.swift */; };
942256822C23F8BB00C0FDBF /* InviteAFriendScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9422567F2C23F8BB00C0FDBF /* InviteAFriendScreen.swift */; };
@ -183,8 +185,16 @@
9422569F2C23F8FE00C0FDBF /* ScanQRCodeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9422569E2C23F8FE00C0FDBF /* ScanQRCodeScreen.swift */; };
942256A12C23F90700C0FDBF /* CustomTopTabBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 942256A02C23F90700C0FDBF /* CustomTopTabBar.swift */; };
9422EE2B2B8C3A97004C740D /* String+Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9422EE2A2B8C3A97004C740D /* String+Utilities.swift */; };
94367C432C6C828500814252 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 94367C422C6C828500814252 /* Localizable.xcstrings */; };
94367C442C6C828500814252 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 94367C422C6C828500814252 /* Localizable.xcstrings */; };
94367C452C6C828500814252 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 94367C422C6C828500814252 /* Localizable.xcstrings */; };
943C6D822B75E061004ACE64 /* Message+DisappearingMessages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943C6D812B75E061004ACE64 /* Message+DisappearingMessages.swift */; };
943C6D842B86B5F1004ACE64 /* Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943C6D832B86B5F1004ACE64 /* Localization.swift */; };
9473386E2BDF5F3E00B9E169 /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 9473386D2BDF5F3E00B9E169 /* InfoPlist.xcstrings */; };
947AD6902C8968FF000B2730 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 947AD68F2C8968FF000B2730 /* Constants.swift */; };
94B3DC172AF8592200C88531 /* QuoteView_SwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94B3DC162AF8592200C88531 /* QuoteView_SwiftUI.swift */; };
94C5DCB02BE88170003AA8C5 /* BezierPathView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94C5DCAF2BE88170003AA8C5 /* BezierPathView.swift */; };
94E9BC0D2C7BFBDA006984EA /* Localization+Style.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94E9BC0C2C7BFBDA006984EA /* Localization+Style.swift */; };
A11CD70D17FA230600A2D1B1 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A11CD70C17FA230600A2D1B1 /* QuartzCore.framework */; };
A163E8AB16F3F6AA0094D68B /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A163E8AA16F3F6A90094D68B /* Security.framework */; };
A1C32D5017A06538000A904E /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1C32D4F17A06537000A904E /* AddressBookUI.framework */; };
@ -346,7 +356,6 @@
C38EF387255B6DD2007E1867 /* AttachmentItemCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF37E255B6DD0007E1867 /* AttachmentItemCollection.swift */; };
C38EF388255B6DD2007E1867 /* AttachmentApprovalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF37F255B6DD0007E1867 /* AttachmentApprovalViewController.swift */; };
C38EF389255B6DD2007E1867 /* AttachmentTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF380255B6DD0007E1867 /* AttachmentTextView.swift */; };
C38EF38A255B6DD2007E1867 /* AttachmentCaptionToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF381255B6DD1007E1867 /* AttachmentCaptionToolbar.swift */; };
C38EF38B255B6DD2007E1867 /* AttachmentPrepViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF382255B6DD1007E1867 /* AttachmentPrepViewController.swift */; };
C38EF38C255B6DD2007E1867 /* ApprovalRailCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF383255B6DD1007E1867 /* ApprovalRailCellView.swift */; };
C38EF3B8255B6DE7007E1867 /* ImageEditorTextViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF3A8255B6DE4007E1867 /* ImageEditorTextViewController.swift */; };
@ -369,7 +378,6 @@
C38EF3FA255B6DF7007E1867 /* DirectionalPanGestureRecognizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF3DC255B6DF1007E1867 /* DirectionalPanGestureRecognizer.swift */; };
C38EF3FF255B6DF7007E1867 /* TappableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF3E1255B6DF3007E1867 /* TappableView.swift */; };
C38EF400255B6DF7007E1867 /* GalleryRailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF3E2255B6DF3007E1867 /* GalleryRailView.swift */; };
C38EF402255B6DF7007E1867 /* CommonStrings.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF3E4255B6DF4007E1867 /* CommonStrings.swift */; };
C38EF405255B6DF7007E1867 /* OWSButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF3E7255B6DF5007E1867 /* OWSButton.swift */; };
C38EF407255B6DF7007E1867 /* Toast.swift in Sources */ = {isa = PBXBuildFile; fileRef = C38EF3E9255B6DF6007E1867 /* Toast.swift */; };
C38EF48A255B7E3F007E1867 /* SessionUIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C331FF1B2558F9D300070591 /* SessionUIKit.framework */; };
@ -417,6 +425,7 @@
D2AEACDC16C426DA00C364C0 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2AEACDB16C426DA00C364C0 /* CFNetwork.framework */; };
FC3BD9881A30A790005B96BB /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC3BD9871A30A790005B96BB /* Social.framework */; };
FCB11D8C1A129A76002F93FB /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCB11D8B1A129A76002F93FB /* CoreMedia.framework */; };
FD0150582CA27DF3005B08A1 /* ScrollableLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD0150572CA27DEE005B08A1 /* ScrollableLabel.swift */; };
FD0606BF2BC8C10200C3816E /* _005_AddJobUniqueHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD0606BE2BC8C10200C3816E /* _005_AddJobUniqueHash.swift */; };
FD0606C32BCE13ED00C3816E /* MessageRequestFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD0606C22BCE13ED00C3816E /* MessageRequestFooterView.swift */; };
FD078E4827E02561000769AF /* CommonMockedExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD078E4727E02561000769AF /* CommonMockedExtensions.swift */; };
@ -796,7 +805,6 @@
FD9004142818AD0B00ABAAF6 /* _002_SetupStandardJobs.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD9004132818AD0B00ABAAF6 /* _002_SetupStandardJobs.swift */; };
FD9004152818B46300ABAAF6 /* JobRunner.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDF0B7432804EF1B004C14C5 /* JobRunner.swift */; };
FD9004162818B46700ABAAF6 /* JobRunnerError.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDE77F68280F9EDA002CFC5D /* JobRunnerError.swift */; };
FD9401D12ABD04AC003A4834 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = FD9401A32ABD04AC003A4834 /* Localizable.strings */; };
FD96F3A529DBC3DC00401309 /* MessageSendJobSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD96F3A429DBC3DC00401309 /* MessageSendJobSpec.swift */; };
FD96F3A729DBD43D00401309 /* MockJobRunner.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD96F3A629DBD43D00401309 /* MockJobRunner.swift */; };
FD97B2402A3FEB050027DD57 /* ARC4RandomNumberGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD97B23F2A3FEB050027DD57 /* ARC4RandomNumberGenerator.swift */; };
@ -871,8 +879,6 @@
FDC498B72AC15F7D00EDD897 /* AppNotificationCategory.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDC498B62AC15F7D00EDD897 /* AppNotificationCategory.swift */; };
FDC498B92AC15FE300EDD897 /* AppNotificationAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDC498B82AC15FE300EDD897 /* AppNotificationAction.swift */; };
FDC498BB2AC1606C00EDD897 /* AppNotificationUserInfoKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDC498BA2AC1606C00EDD897 /* AppNotificationUserInfoKey.swift */; };
FDC498BE2AC1732E00EDD897 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = FD9401A32ABD04AC003A4834 /* Localizable.strings */; };
FDC498C22AC17BFC00EDD897 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = FD9401A32ABD04AC003A4834 /* Localizable.strings */; };
FDC6D6F32860607300B04575 /* SessionEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDF0B7542807C4BB004C14C5 /* SessionEnvironment.swift */; };
FDC6D7602862B3F600B04575 /* Dependencies.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDC6D75F2862B3F600B04575 /* Dependencies.swift */; };
FDCD2E032A41294E00964D6A /* LegacyGroupOnlyRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDCD2E022A41294E00964D6A /* LegacyGroupOnlyRequest.swift */; };
@ -1269,7 +1275,6 @@
4CC613352227A00400E21A3A /* ConversationSearch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationSearch.swift; sourceTree = "<group>"; };
70377AAA1918450100CAF501 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
76C87F18181EFCE600C4ACAB /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
7B02DF432A16F47B00ADCFD2 /* EmojiGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiGenerator.swift; sourceTree = "<group>"; };
7B0EFDED274F598600FFAAE7 /* TimestampUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimestampUtils.swift; sourceTree = "<group>"; };
7B0EFDEF275084AA00FFAAE7 /* CallMessageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallMessageCell.swift; sourceTree = "<group>"; };
7B0EFDF3275490EA00FFAAE7 /* ringing.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = ringing.mp3; sourceTree = "<group>"; };
@ -1354,6 +1359,8 @@
7BFD1A892745C4F000FB91B9 /* Permissions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Permissions.swift; sourceTree = "<group>"; };
7BFD1A8B2747150E00FB91B9 /* TurnServerInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TurnServerInfo.swift; sourceTree = "<group>"; };
7BFD1A962747689000FB91B9 /* Session-Turn-Server */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Session-Turn-Server"; sourceTree = "<group>"; };
9409433D2C7EB81800D9D2E0 /* WebRTCSession+Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WebRTCSession+Constants.swift"; sourceTree = "<group>"; };
9409433F2C7ED62300D9D2E0 /* StartupError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartupError.swift; sourceTree = "<group>"; };
9422567D2C23F8BB00C0FDBF /* StartConversationScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StartConversationScreen.swift; sourceTree = "<group>"; };
9422567E2C23F8BB00C0FDBF /* NewMessageScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewMessageScreen.swift; sourceTree = "<group>"; };
9422567F2C23F8BB00C0FDBF /* InviteAFriendScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteAFriendScreen.swift; sourceTree = "<group>"; };
@ -1373,8 +1380,14 @@
9422569E2C23F8FE00C0FDBF /* ScanQRCodeScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScanQRCodeScreen.swift; sourceTree = "<group>"; };
942256A02C23F90700C0FDBF /* CustomTopTabBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomTopTabBar.swift; sourceTree = "<group>"; };
9422EE2A2B8C3A97004C740D /* String+Utilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Utilities.swift"; sourceTree = "<group>"; };
94367C422C6C828500814252 /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
943C6D812B75E061004ACE64 /* Message+DisappearingMessages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Message+DisappearingMessages.swift"; sourceTree = "<group>"; };
943C6D832B86B5F1004ACE64 /* Localization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Localization.swift; sourceTree = "<group>"; };
9473386D2BDF5F3E00B9E169 /* InfoPlist.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = InfoPlist.xcstrings; sourceTree = "<group>"; };
947AD68F2C8968FF000B2730 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
94B3DC162AF8592200C88531 /* QuoteView_SwiftUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuoteView_SwiftUI.swift; sourceTree = "<group>"; };
94C5DCAF2BE88170003AA8C5 /* BezierPathView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BezierPathView.swift; sourceTree = "<group>"; };
94E9BC0C2C7BFBDA006984EA /* Localization+Style.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Localization+Style.swift"; sourceTree = "<group>"; };
A11CD70C17FA230600A2D1B1 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
A163E8AA16F3F6A90094D68B /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
A1C32D4D17A0652C000A904E /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; };
@ -1547,7 +1560,6 @@
C38EF37E255B6DD0007E1867 /* AttachmentItemCollection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AttachmentItemCollection.swift; path = "SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentItemCollection.swift"; sourceTree = SOURCE_ROOT; };
C38EF37F255B6DD0007E1867 /* AttachmentApprovalViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AttachmentApprovalViewController.swift; path = "SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentApprovalViewController.swift"; sourceTree = SOURCE_ROOT; };
C38EF380255B6DD0007E1867 /* AttachmentTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AttachmentTextView.swift; path = "SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextView.swift"; sourceTree = SOURCE_ROOT; };
C38EF381255B6DD1007E1867 /* AttachmentCaptionToolbar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AttachmentCaptionToolbar.swift; path = "SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift"; sourceTree = SOURCE_ROOT; };
C38EF382255B6DD1007E1867 /* AttachmentPrepViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AttachmentPrepViewController.swift; path = "SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentPrepViewController.swift"; sourceTree = SOURCE_ROOT; };
C38EF383255B6DD1007E1867 /* ApprovalRailCellView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ApprovalRailCellView.swift; path = "SignalUtilitiesKit/Shared Views/ApprovalRailCellView.swift"; sourceTree = SOURCE_ROOT; };
C38EF3A8255B6DE4007E1867 /* ImageEditorTextViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ImageEditorTextViewController.swift; path = "SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorTextViewController.swift"; sourceTree = SOURCE_ROOT; };
@ -1570,7 +1582,6 @@
C38EF3DC255B6DF1007E1867 /* DirectionalPanGestureRecognizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DirectionalPanGestureRecognizer.swift; path = SignalUtilitiesKit/Utilities/DirectionalPanGestureRecognizer.swift; sourceTree = SOURCE_ROOT; };
C38EF3E1255B6DF3007E1867 /* TappableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TappableView.swift; path = "SignalUtilitiesKit/Shared Views/TappableView.swift"; sourceTree = SOURCE_ROOT; };
C38EF3E2255B6DF3007E1867 /* GalleryRailView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GalleryRailView.swift; path = "SignalUtilitiesKit/Shared Views/GalleryRailView.swift"; sourceTree = SOURCE_ROOT; };
C38EF3E4255B6DF4007E1867 /* CommonStrings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CommonStrings.swift; path = SignalUtilitiesKit/Utilities/CommonStrings.swift; sourceTree = SOURCE_ROOT; };
C38EF3E7255B6DF5007E1867 /* OWSButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OWSButton.swift; path = "SignalUtilitiesKit/Shared Views/OWSButton.swift"; sourceTree = SOURCE_ROOT; };
C38EF3E9255B6DF6007E1867 /* Toast.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Toast.swift; path = "SignalUtilitiesKit/Shared Views/Toast.swift"; sourceTree = SOURCE_ROOT; };
C38EF3EE255B6DF6007E1867 /* GradientView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GradientView.swift; path = SessionUIKit/Components/GradientView.swift; sourceTree = SOURCE_ROOT; };
@ -1631,6 +1642,7 @@
E1A0AD8B16E13FDD0071E604 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
FC3BD9871A30A790005B96BB /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
FCB11D8B1A129A76002F93FB /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
FD0150572CA27DEE005B08A1 /* ScrollableLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollableLabel.swift; sourceTree = "<group>"; };
FD0606BE2BC8C10200C3816E /* _005_AddJobUniqueHash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = _005_AddJobUniqueHash.swift; sourceTree = "<group>"; };
FD0606C22BCE13ED00C3816E /* MessageRequestFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageRequestFooterView.swift; sourceTree = "<group>"; };
FD078E4727E02561000769AF /* CommonMockedExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonMockedExtensions.swift; sourceTree = "<group>"; };
@ -1914,50 +1926,7 @@
FD8ECF912938552800C0D1BB /* Threading.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Threading.swift; sourceTree = "<group>"; };
FD8ECF93293856AF00C0D1BB /* Randomness.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Randomness.swift; sourceTree = "<group>"; };
FD9004132818AD0B00ABAAF6 /* _002_SetupStandardJobs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = _002_SetupStandardJobs.swift; sourceTree = "<group>"; };
FD9401A42ABD04AC003A4834 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401A52ABD04AC003A4834 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401A62ABD04AC003A4834 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401A72ABD04AC003A4834 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401A82ABD04AC003A4834 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401A92ABD04AC003A4834 /* zh-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-TW"; path = "zh-TW.lproj/Localizable.strings"; sourceTree = "<group>"; };
FD9401AA2ABD04AC003A4834 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401AB2ABD04AC003A4834 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401AC2ABD04AC003A4834 /* ku */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ku; path = ku.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401AD2ABD04AC003A4834 /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401AE2ABD04AC003A4834 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401AF2ABD04AC003A4834 /* eo */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = eo; path = eo.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401B02ABD04AC003A4834 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401B12ABD04AC003A4834 /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401B22ABD04AC003A4834 /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401B32ABD04AC003A4834 /* es-ES */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-ES"; path = "es-ES.lproj/Localizable.strings"; sourceTree = "<group>"; };
FD9401B42ABD04AC003A4834 /* be */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = be; path = be.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401B52ABD04AC003A4834 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401B62ABD04AC003A4834 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401B72ABD04AC003A4834 /* fil */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fil; path = fil.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401B82ABD04AC003A4834 /* ne-NP */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ne-NP"; path = "ne-NP.lproj/Localizable.strings"; sourceTree = "<group>"; };
FD9401B92ABD04AC003A4834 /* no */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = no; path = no.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401BA2ABD04AC003A4834 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401BB2ABD04AC003A4834 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401BC2ABD04AC003A4834 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401BD2ABD04AC003A4834 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
FD9401BE2ABD04AC003A4834 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401BF2ABD04AC003A4834 /* lv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lv; path = lv.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401C02ABD04AC003A4834 /* lt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lt; path = lt.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401C12ABD04AC003A4834 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401C22ABD04AC003A4834 /* zh-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-CN"; path = "zh-CN.lproj/Localizable.strings"; sourceTree = "<group>"; };
FD9401C32ABD04AC003A4834 /* si-LK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "si-LK"; path = "si-LK.lproj/Localizable.strings"; sourceTree = "<group>"; };
FD9401C42ABD04AC003A4834 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401C52ABD04AC003A4834 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401C62ABD04AC003A4834 /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401C72ABD04AC003A4834 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401C82ABD04AC003A4834 /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401C92ABD04AC003A4834 /* sv-SE */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "sv-SE"; path = "sv-SE.lproj/Localizable.strings"; sourceTree = "<group>"; };
FD9401CA2ABD04AC003A4834 /* bn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bn; path = bn.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401CB2ABD04AC003A4834 /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/Localizable.strings"; sourceTree = "<group>"; };
FD9401CC2ABD04AC003A4834 /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401CE2ABD04AC003A4834 /* TRANSLATIONS.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = TRANSLATIONS.md; sourceTree = "<group>"; };
FD9401CF2ABD04AC003A4834 /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/Localizable.strings; sourceTree = "<group>"; };
FD9401D02ABD04AC003A4834 /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/Localizable.strings; sourceTree = "<group>"; };
FD96F3A429DBC3DC00401309 /* MessageSendJobSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageSendJobSpec.swift; sourceTree = "<group>"; };
FD96F3A629DBD43D00401309 /* MockJobRunner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockJobRunner.swift; sourceTree = "<group>"; };
FD97B23F2A3FEB050027DD57 /* ARC4RandomNumberGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ARC4RandomNumberGenerator.swift; sourceTree = "<group>"; };
@ -2712,6 +2681,7 @@
B8A582B0258C66C900AFD84C /* General */ = {
isa = PBXGroup;
children = (
947AD68F2C8968FF000B2730 /* Constants.swift */,
FD428B182B4B576F006D0888 /* AppContext.swift */,
7BD477A727EC39F5004E2822 /* Atomic.swift */,
FDC438CC27BC641200C60D73 /* Set+Utilities.swift */,
@ -2753,6 +2723,7 @@
7B0EFDED274F598600FFAAE7 /* TimestampUtils.swift */,
FD428B1A2B4B6098006D0888 /* Notifications+Lifecycle.swift */,
FD428B202B4B75EA006D0888 /* Singleton.swift */,
943C6D832B86B5F1004ACE64 /* Localization.swift */,
);
path = General;
sourceTree = "<group>";
@ -2778,6 +2749,7 @@
FD71164128E2C83500B47552 /* Types */,
FD71164028E2C83000B47552 /* Views */,
4CA46F4B219CCC630038ABDE /* CaptionView.swift */,
94C5DCAF2BE88170003AA8C5 /* BezierPathView.swift */,
34F308A01ECB469700BB7697 /* OWSBezierPathView.h */,
34F308A11ECB469700BB7697 /* OWSBezierPathView.m */,
7BAFA1182A39669400B76CB9 /* BezierPathView.swift */,
@ -3023,6 +2995,7 @@
FDBB25E62988BBBD00F1508E /* UIContextualAction+Theming.swift */,
7BA1E0E72A8087DB00123D0D /* SwiftUI+Utilities.swift */,
9422EE2A2B8C3A97004C740D /* String+Utilities.swift */,
94E9BC0C2C7BFBDA006984EA /* Localization+Style.swift */,
);
path = Utilities;
sourceTree = "<group>";
@ -3045,6 +3018,7 @@
FD52090628B49738006098F6 /* ConfirmationModal.swift */,
C38EF2A3255B6D93007E1867 /* PlaceholderIcon.swift */,
C38EF2A4255B6D93007E1867 /* ProfilePictureView.swift */,
FD0150572CA27DEE005B08A1 /* ScrollableLabel.swift */,
FD71165A28E6DDBC00B47552 /* StyledNavigationController.swift */,
FD0B77AF29B69A65009169BA /* TopBannerController.swift */,
);
@ -3273,7 +3247,6 @@
children = (
C38EF37D255B6DCF007E1867 /* AttachmentApprovalInputAccessoryView.swift */,
C38EF37F255B6DD0007E1867 /* AttachmentApprovalViewController.swift */,
C38EF381255B6DD1007E1867 /* AttachmentCaptionToolbar.swift */,
C38EF37E255B6DD0007E1867 /* AttachmentItemCollection.swift */,
C38EF382255B6DD1007E1867 /* AttachmentPrepViewController.swift */,
C38EF37C255B6DCF007E1867 /* AttachmentTextToolbar.swift */,
@ -3470,7 +3443,6 @@
C38EF307255B6DBE007E1867 /* UIGestureRecognizer+OWS.swift */,
C33FDBD3255A581800E217F9 /* OWSSignalAddress.swift */,
FD6A392B2C2AC51900762359 /* AppVersion.swift */,
C38EF3E4255B6DF4007E1867 /* CommonStrings.swift */,
C38EF304255B6DBE007E1867 /* ImageCache.swift */,
C38EF2F2255B6DBC007E1867 /* Searcher.swift */,
C3F0A52F255C80BC007BE2A3 /* NoopNotificationsManager.swift */,
@ -3501,6 +3473,7 @@
isa = PBXGroup;
children = (
C3AAFFF125AE99710089E6DD /* AppDelegate.swift */,
9409433F2C7ED62300D9D2E0 /* StartupError.swift */,
34D99CE3217509C1000AFB39 /* AppEnvironment.swift */,
7BFD1A952747689000FB91B9 /* TurnServers */,
B8FF8E6025C10D8B004D1F22 /* Countries */,
@ -4226,7 +4199,8 @@
isa = PBXGroup;
children = (
FD9401CE2ABD04AC003A4834 /* TRANSLATIONS.md */,
FD9401A32ABD04AC003A4834 /* Localizable.strings */,
94367C422C6C828500814252 /* Localizable.xcstrings */,
9473386D2BDF5F3E00B9E169 /* InfoPlist.xcstrings */,
);
path = Translations;
sourceTree = "<group>";
@ -4408,7 +4382,6 @@
isa = PBXGroup;
children = (
7BD687D22A5D283200D8E455 /* build_libSession_util.sh */,
7B02DF432A16F47B00ADCFD2 /* EmojiGenerator.swift */,
FDE7214F287E50D50093DF33 /* ProtoWrappers.py */,
FDCCC6E82ABA7402002BBEF5 /* EmojiGenerator.swift */,
FDE72150287E50D50093DF33 /* LintLocalizableStrings.swift */,
@ -4427,6 +4400,7 @@
B8B558FE26C4E05E00693325 /* WebRTCSession+MessageHandling.swift */,
B8BF43B926CC95FB007828D1 /* WebRTC+Utilities.swift */,
7BCD116B27016062006330F1 /* WebRTCSession+DataChannel.swift */,
9409433D2C7EB81800D9D2E0 /* WebRTCSession+Constants.swift */,
);
path = WebRTC;
sourceTree = "<group>";
@ -4660,6 +4634,7 @@
FD5E93D52C12D8120038C25A /* Add Commit Hash To Build Info Plist */,
FD5E93D72C12DA400038C25A /* Add App Group To Build Info Plist */,
FDC498C12AC1775400EDD897 /* Ensure Localizable.strings included */,
943BC5A02C6F26370066A56A /* Ensure InfoPlist.xcstrings updated */,
);
buildRules = (
);
@ -5147,7 +5122,7 @@
buildActionMask = 2147483647;
files = (
4535186E1FC635DD00210559 /* MainInterface.storyboard in Resources */,
FDC498C22AC17BFC00EDD897 /* Localizable.strings in Resources */,
94367C442C6C828500814252 /* Localizable.xcstrings in Resources */,
B8D07406265C683A00F77E07 /* ElegantIcons.ttf in Resources */,
FD86FDA42BC51C5400EC251B /* PrivacyInfo.xcprivacy in Resources */,
3478504C1FD7496D007B8332 /* Images.xcassets in Resources */,
@ -5159,7 +5134,7 @@
buildActionMask = 2147483647;
files = (
FD86FDA52BC51C5500EC251B /* PrivacyInfo.xcprivacy in Resources */,
FDC498BE2AC1732E00EDD897 /* Localizable.strings in Resources */,
94367C452C6C828500814252 /* Localizable.xcstrings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -5218,7 +5193,6 @@
B67EBF5D19194AC60084CCFD /* Settings.bundle in Resources */,
34CF0787203E6B78005C4D61 /* busy_tone_ansi.caf in Resources */,
45A2F005204473A3002E978A /* NewMessage.aifc in Resources */,
FD9401D12ABD04AC003A4834 /* Localizable.strings in Resources */,
45B74A882044AAB600CD42F8 /* aurora.aifc in Resources */,
45B74A742044AAB600CD42F8 /* aurora-quiet.aifc in Resources */,
7B0EFDF4275490EA00FFAAE7 /* ringing.mp3 in Resources */,
@ -5234,6 +5208,8 @@
B8D07405265C683300F77E07 /* ElegantIcons.ttf in Resources */,
4503F1BE20470A5B00CEE724 /* classic-quiet.aifc in Resources */,
45B74A7E2044AAB600CD42F8 /* complete.aifc in Resources */,
9473386E2BDF5F3E00B9E169 /* InfoPlist.xcstrings in Resources */,
94367C432C6C828500814252 /* Localizable.xcstrings in Resources */,
B8CCF6352396005F0091D419 /* SpaceMono-Regular.ttf in Resources */,
45B74A872044AAB600CD42F8 /* complete-quiet.aifc in Resources */,
45B74A772044AAB600CD42F8 /* hello.aifc in Resources */,
@ -5287,6 +5263,26 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
943BC5A02C6F26370066A56A /* Ensure InfoPlist.xcstrings updated */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Ensure InfoPlist.xcstrings updated";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Scripts/LintLocalizableStrings.swift\" update\n";
showEnvVarsInLog = 0;
};
FD5E93D32C12D3990038C25A /* Add App Group To Build Info Plist */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
@ -5565,6 +5561,7 @@
942256992C23F8DD00C0FDBF /* Toast.swift in Sources */,
C331FF972558FA6B00070591 /* Fonts.swift in Sources */,
FD71165828E436E800B47552 /* Modal.swift in Sources */,
FD0150582CA27DF3005B08A1 /* ScrollableLabel.swift in Sources */,
FD37E9D328A1FCDB003AE748 /* Theme+OceanDark.swift in Sources */,
942256972C23F8DD00C0FDBF /* SessionSearchBar.swift in Sources */,
FD71165928E436E800B47552 /* ConfirmationModal.swift in Sources */,
@ -5585,6 +5582,7 @@
FD37E9CF28A1EB1B003AE748 /* Theme.swift in Sources */,
C331FFB92558FA8D00070591 /* UIView+Constraints.swift in Sources */,
FD0B77B029B69A65009169BA /* TopBannerController.swift in Sources */,
94E9BC0D2C7BFBDA006984EA /* Localization+Style.swift in Sources */,
FD37E9F628A5F106003AE748 /* Configuration.swift in Sources */,
7BF8D1FB2A70AF57005F1D6E /* SwiftUI+Theme.swift in Sources */,
FDBB25E72988BBBE00F1508E /* UIContextualAction+Theming.swift in Sources */,
@ -5628,8 +5626,6 @@
FD6A39262C2AB0B500762359 /* OWSViewController.swift in Sources */,
C38EF30C255B6DBF007E1867 /* ScreenLock.swift in Sources */,
C38EF363255B6DCC007E1867 /* ModalActivityIndicatorViewController.swift in Sources */,
C38EF38A255B6DD2007E1867 /* AttachmentCaptionToolbar.swift in Sources */,
C38EF402255B6DF7007E1867 /* CommonStrings.swift in Sources */,
C38EF3C1255B6DE7007E1867 /* ImageEditorBrushViewController.swift in Sources */,
C3F0A530255C80BC007BE2A3 /* NoopNotificationsManager.swift in Sources */,
C33FDD8D255A582000E217F9 /* OWSSignalAddress.swift in Sources */,
@ -5747,6 +5743,7 @@
buildActionMask = 2147483647;
files = (
FDFD645927F26C6800808CA1 /* Array+Utilities.swift in Sources */,
943C6D842B86B5F1004ACE64 /* Localization.swift in Sources */,
FD0606BF2BC8C10200C3816E /* _005_AddJobUniqueHash.swift in Sources */,
7B1D74B027C365960030B423 /* Timer+MainThread.swift in Sources */,
FDE049032C76A09700B6F9BB /* UIAlertAction+Utilities.swift in Sources */,
@ -5774,6 +5771,7 @@
FD6A38F52C2A6BD200762359 /* Crypto.swift in Sources */,
FD9004122818ABDC00ABAAF6 /* Job.swift in Sources */,
FD6A38F12C2A66B100762359 /* KeychainStorageType.swift in Sources */,
947AD6902C8968FF000B2730 /* Constants.swift in Sources */,
FD6A39022C2A8BDE00762359 /* UIImage+Utilities.swift in Sources */,
FD09797927FAB7E800936362 /* ImageFormat.swift in Sources */,
FDC0F0042BFECE12002CBFB9 /* TimeUnit.swift in Sources */,
@ -6121,6 +6119,7 @@
450DF2091E0DD2C6003D14BE /* UserNotificationsAdaptee.swift in Sources */,
C3548F0824456AB6009433A8 /* UIView+Wrapping.swift in Sources */,
45CD81EF1DC030E7004C9430 /* SyncPushTokensJob.swift in Sources */,
94C5DCB02BE88170003AA8C5 /* BezierPathView.swift in Sources */,
B83524A525C3BA4B0089A44F /* InfoMessageCell.swift in Sources */,
7B9F71D82853100A006DFE7B /* EmojiWithSkinTones.swift in Sources */,
FD71164E28E3F8CC00B47552 /* SessionCell+Info.swift in Sources */,
@ -6287,6 +6286,7 @@
7B5233C42900E90F00F8F375 /* SessionLabelCarouselView.swift in Sources */,
7B93D07727CF1A8A00811CB6 /* MockDataGenerator.swift in Sources */,
7B1B52D828580C6D006069F2 /* EmojiPickerSheet.swift in Sources */,
940943402C7ED62300D9D2E0 /* StartupError.swift in Sources */,
FD368A6A29DE9E30000DBF1E /* UIContextualAction+Utilities.swift in Sources */,
FDEF57252C3CF04C00131302 /* WebRTCSession+DataChannel.swift in Sources */,
7BAFA1192A39669400B76CB9 /* BezierPathView.swift in Sources */,
@ -6304,6 +6304,7 @@
FD37E9CC28A1E578003AE748 /* AppearanceViewController.swift in Sources */,
B8EB20F02640F7F000773E52 /* OpenGroupInvitationView.swift in Sources */,
C328254025CA55880062D0A7 /* ContextMenuVC.swift in Sources */,
9409433E2C7EB81800D9D2E0 /* WebRTCSession+Constants.swift in Sources */,
7BD687D12A5D0D1200D8E455 /* MessageInfoScreen.swift in Sources */,
B8269D2925C7A4B400488AB4 /* InputView.swift in Sources */,
FD71162E28E168C700B47552 /* SettingsViewModel.swift in Sources */,
@ -6576,56 +6577,6 @@
name = MainInterface.storyboard;
sourceTree = "<group>";
};
FD9401A32ABD04AC003A4834 /* Localizable.strings */ = {
isa = PBXVariantGroup;
children = (
FD9401A42ABD04AC003A4834 /* de */,
FD9401A52ABD04AC003A4834 /* ar */,
FD9401A62ABD04AC003A4834 /* el */,
FD9401A72ABD04AC003A4834 /* ja */,
FD9401A82ABD04AC003A4834 /* fa */,
FD9401A92ABD04AC003A4834 /* zh-TW */,
FD9401AA2ABD04AC003A4834 /* en */,
FD9401AB2ABD04AC003A4834 /* uk */,
FD9401AC2ABD04AC003A4834 /* ku */,
FD9401AD2ABD04AC003A4834 /* sl */,
FD9401AE2ABD04AC003A4834 /* da */,
FD9401AF2ABD04AC003A4834 /* eo */,
FD9401B02ABD04AC003A4834 /* it */,
FD9401B12ABD04AC003A4834 /* bg */,
FD9401B22ABD04AC003A4834 /* sk */,
FD9401B32ABD04AC003A4834 /* es-ES */,
FD9401B42ABD04AC003A4834 /* be */,
FD9401B52ABD04AC003A4834 /* cs */,
FD9401B62ABD04AC003A4834 /* ko */,
FD9401B72ABD04AC003A4834 /* fil */,
FD9401B82ABD04AC003A4834 /* ne-NP */,
FD9401B92ABD04AC003A4834 /* no */,
FD9401BA2ABD04AC003A4834 /* hu */,
FD9401BB2ABD04AC003A4834 /* tr */,
FD9401BC2ABD04AC003A4834 /* pl */,
FD9401BD2ABD04AC003A4834 /* pt-BR */,
FD9401BE2ABD04AC003A4834 /* vi */,
FD9401BF2ABD04AC003A4834 /* lv */,
FD9401C02ABD04AC003A4834 /* lt */,
FD9401C12ABD04AC003A4834 /* ru */,
FD9401C22ABD04AC003A4834 /* zh-CN */,
FD9401C32ABD04AC003A4834 /* si-LK */,
FD9401C42ABD04AC003A4834 /* fr */,
FD9401C52ABD04AC003A4834 /* fi */,
FD9401C62ABD04AC003A4834 /* id */,
FD9401C72ABD04AC003A4834 /* nl */,
FD9401C82ABD04AC003A4834 /* th */,
FD9401C92ABD04AC003A4834 /* sv-SE */,
FD9401CA2ABD04AC003A4834 /* bn */,
FD9401CB2ABD04AC003A4834 /* pt-PT */,
FD9401CC2ABD04AC003A4834 /* ro */,
FD9401CF2ABD04AC003A4834 /* hr */,
FD9401D02ABD04AC003A4834 /* hi */,
);
name = Localizable.strings;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
@ -6666,7 +6617,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = SessionShareExtension/Meta/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -6678,6 +6629,7 @@
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
@ -6741,7 +6693,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = SessionShareExtension/Meta/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -6753,6 +6705,7 @@
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
@ -6797,7 +6750,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = SessionNotificationServiceExtension/Meta/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -6810,6 +6763,7 @@
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
@ -6874,7 +6828,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = SessionNotificationServiceExtension/Meta/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -6887,6 +6841,7 @@
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
@ -6928,7 +6883,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = SessionUIKit/Meta/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -7008,7 +6963,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = SessionUIKit/Meta/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -7075,7 +7030,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = SignalUtilitiesKit/Meta/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -7162,7 +7117,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = SignalUtilitiesKit/Meta/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -7226,7 +7181,7 @@
);
INFOPLIST_FILE = SessionSnodeKit/Meta/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -7317,7 +7272,7 @@
);
INFOPLIST_FILE = SessionSnodeKit/Meta/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -7388,7 +7343,7 @@
);
INFOPLIST_FILE = SessionUtilitiesKit/Meta/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -7480,7 +7435,7 @@
);
INFOPLIST_FILE = SessionUtilitiesKit/Meta/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -7552,7 +7507,7 @@
);
INFOPLIST_FILE = SessionMessagingKit/Meta/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -7644,7 +7599,7 @@
);
INFOPLIST_FILE = SessionMessagingKit/Meta/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -7706,7 +7661,7 @@
CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 488;
CURRENT_PROJECT_VERSION = 492;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -7743,7 +7698,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 2.7.4;
MARKETING_VERSION = 2.8.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"-fobjc-arc-exceptions",
@ -7784,7 +7739,7 @@
CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 488;
CURRENT_PROJECT_VERSION = 492;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
@ -7816,7 +7771,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 2.7.4;
MARKETING_VERSION = 2.8.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = (
"-DNS_BLOCK_ASSERTIONS=1",
@ -7873,7 +7828,7 @@
"\"$(SRCROOT)/Libraries\"/**",
);
INFOPLIST_FILE = "Session/Meta/Session-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -7892,6 +7847,7 @@
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "Session/Meta/Signal-Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "Session-Swift.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@ -7942,7 +7898,7 @@
"\"$(SRCROOT)/Libraries\"/**",
);
INFOPLIST_FILE = "Session/Meta/Session-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -7958,6 +7914,7 @@
PROVISIONING_PROFILE = "";
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = iphoneos;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "Session/Meta/Signal-Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "Session-Swift.h";
SWIFT_VERSION = 5.0;
@ -7992,7 +7949,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS $(inherited) -D SQLITE_HAS_CODEC -D GRDBCIPHER -D SQLITE_ENABLE_FTS5 -Xfrontend -warn-long-expression-type-checking=100";
@ -8054,7 +8011,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.oxen.SessionTests;
@ -8096,7 +8053,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
@ -8158,7 +8115,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
@ -8198,7 +8155,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS $(inherited) -D SQLITE_HAS_CODEC -D GRDBCIPHER -D SQLITE_ENABLE_FTS5 -Xfrontend -warn-long-expression-type-checking=100";
@ -8259,7 +8216,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.oxen.SessionUtilitiesKitTests;
@ -8299,7 +8256,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MODULEMAP_FILE = "$(SRCROOT)/SessionMessagingKit/Meta/SessionUtil.modulemap";
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20";
@ -8367,7 +8324,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MODULEMAP_FILE = "$(SRCROOT)/SessionMessagingKit/Meta/SessionUtil.modulemap";
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20";
@ -8410,7 +8367,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS $(inherited) -D SQLITE_HAS_CODEC -D GRDBCIPHER -D SQLITE_ENABLE_FTS5 -Xfrontend -warn-long-expression-type-checking=100";
@ -8471,7 +8428,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.oxen.SessionMessagingKitTests;

2
Session.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
Unescape Escape View File

@ -1,5 +1,5 @@
{
"originHash" : "77d5fda90891573a263c0fefeb989f3f1bb56e612a09be32106558b6d5fb4564",
"originHash" : "53c1182a7d64df9a13a5c0ec4420b2c8da9c4d81d97b2b79b6e8f2946978471b",
"pins" : [
{
"identity" : "cocoalumberjack",

2
Session/Calls/Call Management/SessionCall.swift
Unescape Escape View File

@ -182,7 +182,7 @@ public final class SessionCall: CurrentCallProtocol, WebRTCSessionDelegate {
func reportIncomingCallIfNeeded(completion: @escaping (Error?) -> Void) {
guard case .answer = mode else {
SessionCallManager.reportFakeCall(info: "Call not in answer mode")
SessionCallManager.reportFakeCall(info: "Call not in answer mode") // stringlint:disable
return
}

2
Session/Calls/Call Management/SessionCallManager.swift
Unescape Escape View File

@ -44,7 +44,7 @@ public final class SessionCallManager: NSObject, CallManagerProtocol {
}
static func buildProviderConfiguration(useSystemCallLog: Bool) -> CXProviderConfiguration {
let providerConfiguration = CXProviderConfiguration(localizedName: "Session")
let providerConfiguration = CXProviderConfiguration(localizedName: "Session") // stringlint:disable
providerConfiguration.supportsVideo = true
providerConfiguration.maximumCallGroups = 1
providerConfiguration.maximumCallsPerCallGroup = 1

19
Session/Calls/CallVC.swift
Unescape Escape View File

@ -317,7 +317,7 @@ final class CallVC: UIViewController, VideoPreviewDelegate {
result.textAlignment = .center
result.isHidden = call.hasConnected
if call.hasStartedConnecting { result.text = "Connecting..." }
if call.hasStartedConnecting { result.text = "callsConnecting".localized() }
return result
}()
@ -362,7 +362,7 @@ final class CallVC: UIViewController, VideoPreviewDelegate {
self.call.hasStartedConnectingDidChange = {
DispatchQueue.main.async {
self.callInfoLabel.text = "Connecting..."
self.callInfoLabel.text = "callsConnecting".localized()
self.answerButton.alpha = 0
UIView.animate(
@ -383,7 +383,6 @@ final class CallVC: UIViewController, VideoPreviewDelegate {
DispatchQueue.main.async {
CallRingTonePlayer.shared.stopPlayingRingTone()
self?.callInfoLabel.text = "Connected"
self?.minimizeButton.isHidden = false
self?.durationTimer = Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { _ in
self?.updateDuration()
@ -405,7 +404,7 @@ final class CallVC: UIViewController, VideoPreviewDelegate {
DispatchQueue.main.async {
self?.callInfoLabel.isHidden = false
self?.callDurationLabel.isHidden = true
self?.callInfoLabel.text = "Reconnecting..."
self?.callInfoLabel.text = "callsReconnecting".localized()
}
}
@ -433,11 +432,11 @@ final class CallVC: UIViewController, VideoPreviewDelegate {
AppEnvironment.shared.callManager.startCall(call) { [weak self] error in
DispatchQueue.main.async {
if let _ = error {
self?.callInfoLabel.text = "Can't start a call."
self?.callInfoLabel.text = "callsErrorStart".localized()
self?.endCall()
}
else {
self?.callInfoLabel.text = "Ringing..."
self?.callInfoLabel.text = "callsRinging".localized()
self?.answerButton.isHidden = true
}
}
@ -583,14 +582,14 @@ final class CallVC: UIViewController, VideoPreviewDelegate {
// MARK: Call signalling
func handleAnswerMessage(_ message: CallMessage) {
callInfoLabel.text = "Connecting..."
callInfoLabel.text = "callsConnecting".localized()
}
func handleEndCallMessage() {
SNLog("[Calls] Ending call.")
self.callInfoLabel.isHidden = false
self.callDurationLabel.isHidden = true
self.callInfoLabel.text = "Call Ended"
self.callInfoLabel.text = "callsEnded".localized()
UIView.animate(withDuration: 0.25) {
let remoteVideoView: RemoteVideoView = self.floatingViewVideoSource == .remote ? self.floatingRemoteVideoView : self.fullScreenRemoteVideoView
@ -610,7 +609,7 @@ final class CallVC: UIViewController, VideoPreviewDelegate {
AppEnvironment.shared.callManager.answerCall(call) { [weak self] error in
DispatchQueue.main.async {
if let _ = error {
self?.callInfoLabel.text = "Can't answer the call."
self?.callInfoLabel.text = "callsErrorAnswer".localized()
self?.endCall()
}
}
@ -632,7 +631,7 @@ final class CallVC: UIViewController, VideoPreviewDelegate {
}
@objc private func updateDuration() {
callDurationLabel.text = String(format: "%.2d:%.2d", duration/60, duration%60)
callDurationLabel.text = String(format: "%.2d:%.2d", duration/60, duration%60) // stringlint:disable
duration += 1
}

2
Session/Calls/VideoPreviewVC.swift
Unescape Escape View File

@ -74,7 +74,7 @@ class VideoPreviewVC: UIViewController, CameraManagerDelegate {
private lazy var titleLabel: UILabel = {
let result = UILabel()
result.font = .boldSystemFont(ofSize: Values.veryLargeFontSize)
result.text = "Preview"
result.text = "preview".localized()
result.themeTextColor = .textPrimary
result.textAlignment = .center

10
Session/Calls/Views & Modals/CallMissedTipsModal.swift
Unescape Escape View File

@ -24,7 +24,9 @@ final class CallMissedTipsModal: Modal {
private lazy var titleLabel: UILabel = {
let result: UILabel = UILabel()
result.font = .boldSystemFont(ofSize: Values.mediumFontSize)
result.text = "modal_call_missed_tips_title".localized()
result.text = "callsMissedCallFrom"
.put(key: "name", value: caller)
.localized()
result.themeTextColor = .textPrimary
result.textAlignment = .center
@ -34,11 +36,13 @@ final class CallMissedTipsModal: Modal {
private lazy var messageLabel: UILabel = {
let result: UILabel = UILabel()
result.font = .systemFont(ofSize: Values.smallFontSize)
result.text = String(format: "modal_call_missed_tips_explanation".localized(), caller)
result.themeTextColor = .textPrimary
result.textAlignment = .natural
result.lineBreakMode = .byWordWrapping
result.numberOfLines = 0
result.attributedText = "callsYouMissedCallPermissions"
.put(key: "name", value: caller)
.localizedFormatted(in: result)
return result
}()
@ -82,7 +86,7 @@ final class CallMissedTipsModal: Modal {
}
override func populateContentView() {
cancelButton.setTitle("BUTTON_OK".localized(), for: .normal)
cancelButton.setTitle("okay".localized(), for: .normal)
contentView.addSubview(mainStackView)
tipsIconContainerView.addSubview(tipsIconImageView)

2
Session/Calls/WebRTC/TurnServerInfo.swift
Unescape Escape View File

@ -1,5 +1,7 @@
// Copyright © 2021 Rangeproof Pty Ltd. All rights reserved.
// stringlint:disable
import Foundation
import SessionUtilitiesKit

2
Session/Calls/WebRTC/WebRTC+Utilities.swift
Unescape Escape View File

@ -1,3 +1,5 @@
// stringlint:disable
import WebRTC
extension RTCSignalingState : CustomStringConvertible {

15
Session/Calls/WebRTC/WebRTCSession+Constants.swift
Unescape Escape View File

@ -0,0 +1,15 @@
// Copyright © 2024 Rangeproof Pty Ltd. All rights reserved.
//
// stringlint:disable
extension WebRTCSession {
public enum Constants {
public static let audio_track_id: String = "ARDAMSa0"
public static let local_video_track_id: String = "ARDAMSv0"
public static let media_stream_track_id: String = "ARDAMS"
public static let video: String = "video"
public static let hang_up: String = "hangup"
}
}

6
Session/Calls/WebRTC/WebRTCSession+DataChannel.swift
Unescape Escape View File

@ -12,7 +12,7 @@ extension WebRTCSession: RTCDataChannelDelegate {
dataChannelConfiguration.isOrdered = true
dataChannelConfiguration.isNegotiated = true
dataChannelConfiguration.channelId = 548
guard let dataChannel = peerConnection?.dataChannel(forLabel: "CONTROL", configuration: dataChannelConfiguration) else {
guard let dataChannel = peerConnection?.dataChannel(forLabel: "CONTROL", configuration: dataChannelConfiguration) else { // stringlint:disable
SNLog("[Calls] Couldn't create data channel.")
return nil
}
@ -38,10 +38,10 @@ extension WebRTCSession: RTCDataChannelDelegate {
public func dataChannel(_ dataChannel: RTCDataChannel, didReceiveMessageWith buffer: RTCDataBuffer) {
if let json = try? JSONSerialization.jsonObject(with: buffer.data, options: [ .fragmentsAllowed ]) as? JSON {
SNLog("[Calls] Data channel did receive data: \(json)")
if let isRemoteVideoEnabled = json["video"] as? Bool {
if let isRemoteVideoEnabled = json["video"] as? Bool { // stringlint:disable
delegate?.isRemoteVideoDidChange(isEnabled: isRemoteVideoEnabled)
}
if let _ = json["hangup"] {
if let _ = json["hangup"] { // stringlint:disable
delegate?.didReceiveHangUpSignal()
}
}

18
Session/Calls/WebRTC/WebRTCSession.swift
Unescape Escape View File

@ -58,7 +58,7 @@ public final class WebRTCSession : NSObject, RTCPeerConnectionDelegate {
}()
internal lazy var audioTrack: RTCAudioTrack = {
return factory.audioTrack(with: audioSource, trackId: "ARDAMSa0")
return factory.audioTrack(with: audioSource, trackId: Self.Constants.audio_track_id)
}()
// Video
@ -69,7 +69,7 @@ public final class WebRTCSession : NSObject, RTCPeerConnectionDelegate {
}()
internal lazy var localVideoTrack: RTCVideoTrack = {
return factory.videoTrack(with: localVideoSource, trackId: "ARDAMSv0")
return factory.videoTrack(with: localVideoSource, trackId: Self.Constants.local_video_track_id)
}()
internal lazy var remoteVideoTrack: RTCVideoTrack? = {
@ -86,7 +86,7 @@ public final class WebRTCSession : NSObject, RTCPeerConnectionDelegate {
public var errorDescription: String? {
switch self {
case .noThread: return "Couldn't find thread for contact."
case .noThread: return "Couldn't find thread for contact." // stringlint:disable
}
}
}
@ -103,7 +103,7 @@ public final class WebRTCSession : NSObject, RTCPeerConnectionDelegate {
super.init()
let mediaStreamTrackIDS = ["ARDAMS"]
let mediaStreamTrackIDS = [Self.Constants.media_stream_track_id]
peerConnection?.add(audioTrack, streamIds: mediaStreamTrackIDS)
peerConnection?.add(localVideoTrack, streamIds: mediaStreamTrackIDS)
@ -394,8 +394,8 @@ public final class WebRTCSession : NSObject, RTCPeerConnectionDelegate {
private func correctSessionDescription(sdp: RTCSessionDescription?) -> RTCSessionDescription? {
guard let sdp = sdp else { return nil }
let cbrSdp = sdp.sdp.description.replace(regex: "(a=fmtp:111 ((?!cbr=).)*)\r?\n", with: "$1;cbr=1\r\n")
let finalSdp = cbrSdp.replace(regex: ".+urn:ietf:params:rtp-hdrext:ssrc-audio-level.*\r?\n", with: "")
let cbrSdp = sdp.sdp.description.replace(regex: "(a=fmtp:111 ((?!cbr=).)*)\r?\n", with: "$1;cbr=1\r\n") // stringlint:disable
let finalSdp = cbrSdp.replace(regex: ".+urn:ietf:params:rtp-hdrext:ssrc-audio-level.*\r?\n", with: "") // stringlint:disable
return RTCSessionDescription(type: sdp.type, sdp: finalSdp)
}
@ -480,15 +480,15 @@ extension WebRTCSession {
public func turnOffVideo() {
localVideoTrack.isEnabled = false
sendJSON(["video": false])
sendJSON([Self.Constants.video: false])
}
public func turnOnVideo() {
localVideoTrack.isEnabled = true
sendJSON(["video": true])
sendJSON([Self.Constants.video: true])
}
public func hangUp() {
sendJSON(["hangup": true])
sendJSON([Self.Constants.hang_up: true])
}
}

28
Session/Closed Groups/EditClosedGroupVC.swift
Unescape Escape View File

@ -46,7 +46,7 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
private lazy var groupNameTextField: TextField = {
let result: TextField = TextField(
placeholder: "vc_create_closed_group_text_field_hint".localized(),
placeholder: "groupNameEnter".localized(),
usesDefaultHeight: false
)
result.textAlignment = .center
@ -60,7 +60,7 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
let result: SessionButton = SessionButton(style: .bordered, size: .medium)
result.accessibilityLabel = "Add members"
result.isAccessibilityElement = true
result.setTitle("vc_conversation_settings_invite_button_title".localized(), for: .normal)
result.setTitle("membersInvite".localized(), for: .normal)
result.addTarget(self, action: #selector(addMembers), for: UIControl.Event.touchUpInside)
result.contentEdgeInsets = UIEdgeInsets(top: 0, leading: Values.mediumSpacing, bottom: 0, trailing: Values.mediumSpacing)
@ -98,7 +98,7 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
override func viewDidLoad() {
super.viewDidLoad()
setNavBarTitle("EDIT_GROUP_ACTION".localized())
setNavBarTitle("groupEdit".localized())
let threadId: String = self.threadId
@ -110,7 +110,7 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
.filter(id: threadId)
.asRequest(of: String.self)
.fetchOne(db)
.defaulting(to: "GROUP_TITLE_FALLBACK".localized())
.defaulting(to: "groupUnknown".localized())
self?.originalName = (self?.name ?? "")
let profileAlias: TypedTableAlias<Profile> = TypedTableAlias()
@ -173,7 +173,7 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
let membersLabel = UILabel()
membersLabel.font = .systemFont(ofSize: Values.mediumFontSize)
membersLabel.themeTextColor = .textPrimary
membersLabel.text = "GROUP_TITLE_MEMBERS".localized()
membersLabel.text = "groupMembers".localized()
addMembersButton.isEnabled = self.hasContactsToAdd
@ -259,7 +259,7 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
let profileId: String = self.membersAndZombies[indexPath.row].profileId
let delete: UIContextualAction = UIContextualAction(
title: "GROUP_ACTION_REMOVE".localized(),
title: "remove".localized(),
icon: UIImage(named: "icon_bin"),
themeTintColor: .white,
themeBackgroundColor: .conversationButton_swipeDestructive,
@ -347,10 +347,10 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
guard !updatedName.isEmpty else {
return showError(title: "vc_create_closed_group_group_name_missing_error".localized())
return showError(title: "groupNameEnterPlease".localized())
}
guard updatedName.utf8CString.count < LibSession.libSessionMaxGroupNameByteLength else {
return showError(title: "vc_create_closed_group_group_name_too_long_error".localized())
return showError(title: "groupNameEnterShorter".localized())
}
self.isEditingGroupName = false
@ -359,7 +359,7 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
}
@objc private func addMembers() {
let title: String = "vc_conversation_settings_invite_button_title".localized()
let title: String = "membersInvite".localized()
let userPublicKey: String = self.userPublicKey
let userSelectionVC: UserSelectionVC = UserSelectionVC(
@ -456,13 +456,13 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
if !updatedMemberIds.contains(userPublicKey) {
guard self.originalMembersAndZombieIds.removing(userPublicKey) == updatedMemberIds else {
return showError(
title: "GROUP_UPDATE_ERROR_TITLE".localized(),
message: "GROUP_UPDATE_ERROR_MESSAGE".localized()
title: "deleteAfterLegacyGroupsGroupUpdateErrorTitle".localized(),
message: "deleteAfterGroupPR3GroupErrorLeave".localized()
)
}
}
guard updatedMemberIds.count <= 100 else {
return showError(title: "vc_create_closed_group_too_many_group_members_error".localized())
return showError(title: "groupAddMemberMaximum".localized())
}
ModalActivityIndicatorViewController.present(fromViewController: navigationController) { _ in
@ -495,7 +495,7 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
case .finished: popToConversationVC(self)
case .failure(let error):
self?.showError(
title: "GROUP_UPDATE_ERROR_TITLE".localized(),
title: "deleteAfterLegacyGroupsGroupUpdateErrorTitle".localized(),
message: "\(error)"
)
}
@ -512,7 +512,7 @@ final class EditClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegat
info: ConfirmationModal.Info(
title: title,
body: .text(message),
cancelTitle: "BUTTON_OK".localized(),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)

33
Session/Closed Groups/NewClosedGroupVC.swift
Unescape Escape View File

@ -42,7 +42,7 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
private lazy var nameTextField: TextField = {
let result = TextField(
placeholder: "vc_create_closed_group_text_field_hint".localized(),
placeholder: "groupNameEnter".localized(),
usesDefaultHeight: false,
customHeight: NewClosedGroupVC.textFieldHeight
)
@ -110,10 +110,7 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
result.touchDelegate = self
result.dataSource = self
result.delegate = self
if #available(iOS 15.0, *) {
result.sectionHeaderTopPadding = 0
}
result.sectionHeaderTopPadding = 0
return result
}()
@ -135,7 +132,7 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
private lazy var createGroupButton: SessionButton = {
let result = SessionButton(style: .bordered, size: .large)
result.translatesAutoresizingMaskIntoConstraints = false
result.setTitle("CREATE_GROUP_BUTTON_TITLE".localized(), for: .normal)
result.setTitle("create".localized(), for: .normal)
result.addTarget(self, action: #selector(createClosedGroup), for: .touchUpInside)
result.accessibilityIdentifier = "Create group"
result.isAccessibilityElement = true
@ -152,7 +149,7 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
view.themeBackgroundColor = .newConversation_background
let customTitleFontSize = Values.largeFontSize
setNavBarTitle("vc_create_closed_group_title".localized(), customFontSize: customTitleFontSize)
setNavBarTitle("groupCreate".localized(), customFontSize: customTitleFontSize)
let closeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "X"), style: .plain, target: self, action: #selector(close))
closeButton.themeTintColor = .textPrimary
@ -168,7 +165,7 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
guard !contactProfiles.isEmpty else {
let explanationLabel: UILabel = UILabel()
explanationLabel.font = .systemFont(ofSize: Values.smallFontSize)
explanationLabel.text = "vc_create_closed_group_empty_state_message".localized()
explanationLabel.text = "contactNone".localized()
explanationLabel.themeTextColor = .textSecondary
explanationLabel.textAlignment = .center
explanationLabel.lineBreakMode = .byWordWrapping
@ -274,7 +271,7 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
func textFieldDidEndEditing(_ textField: UITextField) {
crossfadeLabel.text = (textField.text?.isEmpty == true ?
"vc_create_closed_group_title".localized() :
"groupCreate".localized() :
textField.text
)
}
@ -308,7 +305,7 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
info: ConfirmationModal.Info(
title: title,
body: .text(message),
cancelTitle: "BUTTON_OK".localized(),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
@ -319,19 +316,19 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
let name: String = nameTextField.text?.trimmingCharacters(in: .whitespacesAndNewlines),
name.count > 0
else {
return showError(title: "vc_create_closed_group_group_name_missing_error".localized())
return showError(title: "groupNameEnterPlease".localized())
}
guard name.utf8CString.count < LibSession.libSessionMaxGroupNameByteLength else {
return showError(title: "vc_create_closed_group_group_name_too_long_error".localized())
return showError(title: "groupNameEnterShorter".localized())
}
guard selectedContacts.count >= 1 else {
return showError(title: "GROUP_ERROR_NO_MEMBER_SELECTION".localized())
return showError(title: "groupCreateErrorNoMembers".localized())
}
guard selectedContacts.count < 100 else { // Minus one because we're going to include self later
return showError(title: "vc_create_closed_group_too_many_group_members_error".localized())
return showError(title: "groupAddMemberMaximum".localized())
}
let selectedContacts = self.selectedContacts
let message: String? = (selectedContacts.count > 20 ? "GROUP_CREATION_PLEASE_WAIT".localized() : nil)
let message: String? = (selectedContacts.count > 20 ? "deleteAfterLegacyGroupsGroupCreation".localized() : nil)
ModalActivityIndicatorViewController.present(fromViewController: navigationController!, message: message) { [weak self] _ in
MessageSender
.createClosedGroup(name: name, members: selectedContacts)
@ -347,9 +344,9 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
let modal: ConfirmationModal = ConfirmationModal(
targetView: self?.view,
info: ConfirmationModal.Info(
title: "GROUP_CREATION_ERROR_TITLE".localized(),
body: .text("GROUP_CREATION_ERROR_MESSAGE".localized()),
cancelTitle: "BUTTON_OK".localized(),
title: "groupError".localized(),
body: .text("groupErrorCreate".localized()),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)

41
Session/Conversations/Context Menu/ContextMenuVC+Action.swift
Unescape Escape View File

@ -16,12 +16,17 @@ extension ContextMenuVC {
let title: String
let expirationInfo: ExpirationInfo?
let themeColor: ThemeValue
let isEmojiAction: Bool
let isEmojiPlus: Bool
let isDismissAction: Bool
let actionType: ActionType
let accessibilityLabel: String?
let work: () -> Void
enum ActionType {
case emoji
case emojiPlus
case dismiss
case generic
}
// MARK: - Initialization
init(
@ -29,9 +34,7 @@ extension ContextMenuVC {
title: String = "",
expirationInfo: ExpirationInfo? = nil,
themeColor: ThemeValue = .textPrimary,
isEmojiAction: Bool = false,
isEmojiPlus: Bool = false,
isDismissAction: Bool = false,
actionType: ActionType = .generic,
accessibilityLabel: String? = nil,
work: @escaping () -> Void
) {
@ -39,9 +42,7 @@ extension ContextMenuVC {
self.title = title
self.expirationInfo = expirationInfo
self.themeColor = themeColor
self.isEmojiAction = isEmojiAction
self.isEmojiPlus = isEmojiPlus
self.isDismissAction = isDismissAction
self.actionType = actionType
self.accessibilityLabel = accessibilityLabel
self.work = work
}
@ -51,7 +52,7 @@ extension ContextMenuVC {
static func info(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?, using dependencies: Dependencies) -> Action {
return Action(
icon: UIImage(named: "ic_info"),
title: "context_menu_info".localized(),
title: "info".localized(),
accessibilityLabel: "Message info"
) { delegate?.info(cellViewModel, using: dependencies) }
}
@ -60,8 +61,8 @@ extension ContextMenuVC {
return Action(
icon: UIImage(systemName: "arrow.triangle.2.circlepath"),
title: (cellViewModel.state == .failedToSync ?
"context_menu_resync".localized() :
"context_menu_resend".localized()
"resync".localized() :
"resend".localized()
),
accessibilityLabel: (cellViewModel.state == .failedToSync ? "Resync message" : "Resend message")
) { delegate?.retry(cellViewModel, using: dependencies) }
@ -70,7 +71,7 @@ extension ContextMenuVC {
static func reply(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?, using dependencies: Dependencies) -> Action {
return Action(
icon: UIImage(named: "ic_reply"),
title: "context_menu_reply".localized(),
title: "reply".localized(),
accessibilityLabel: "Reply to message"
) { delegate?.reply(cellViewModel, using: dependencies) }
}
@ -95,7 +96,7 @@ extension ContextMenuVC {
static func delete(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?, using dependencies: Dependencies) -> Action {
return Action(
icon: UIImage(named: "ic_trash"),
title: "TXT_DELETE_TITLE".localized(),
title: "delete".localized(),
expirationInfo: ExpirationInfo(
expiresStartedAtMs: cellViewModel.expiresStartedAtMs,
expiresInSeconds: cellViewModel.expiresInSeconds
@ -108,7 +109,7 @@ extension ContextMenuVC {
static func save(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?, using dependencies: Dependencies) -> Action {
return Action(
icon: UIImage(named: "ic_download"),
title: "context_menu_save".localized(),
title: "save".localized(),
accessibilityLabel: "Save attachment"
) { delegate?.save(cellViewModel, using: dependencies) }
}
@ -116,7 +117,7 @@ extension ContextMenuVC {
static func ban(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?, using dependencies: Dependencies) -> Action {
return Action(
icon: UIImage(named: "ic_block"),
title: "context_menu_ban_user".localized(),
title: "banUser".localized(),
themeColor: .danger,
accessibilityLabel: "Ban user"
) { delegate?.ban(cellViewModel, using: dependencies) }
@ -125,7 +126,7 @@ extension ContextMenuVC {
static func banAndDeleteAllMessages(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?, using dependencies: Dependencies) -> Action {
return Action(
icon: UIImage(named: "ic_block"),
title: "context_menu_ban_and_delete_all".localized(),
title: "banDeleteAll".localized(),
themeColor: .danger,
accessibilityLabel: "Ban user and delete"
) { delegate?.banAndDeleteAllMessages(cellViewModel, using: dependencies) }
@ -134,20 +135,20 @@ extension ContextMenuVC {
static func react(_ cellViewModel: MessageViewModel, _ emoji: EmojiWithSkinTones, _ delegate: ContextMenuActionDelegate?, using dependencies: Dependencies) -> Action {
return Action(
title: emoji.rawValue,
isEmojiAction: true
actionType: .emoji
) { delegate?.react(cellViewModel, with: emoji, using: dependencies) }
}
static func emojiPlusButton(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?, using dependencies: Dependencies) -> Action {
return Action(
isEmojiPlus: true,
actionType: .emojiPlus,
accessibilityLabel: "Add emoji"
) { delegate?.showFullEmojiKeyboard(cellViewModel, using: dependencies) }
}
static func dismiss(_ delegate: ContextMenuActionDelegate?) -> Action {
return Action(
isDismissAction: true
actionType: .dismiss
) { delegate?.contextMenuDismissed() }
}
}

8
Session/Conversations/Context Menu/ContextMenuVC+ActionView.swift
Unescape Escape View File

@ -120,14 +120,18 @@ extension ContextMenuVC {
subtitleWidthConstraint.isActive = true
// To prevent a negative timer
let timeToExpireInSeconds: TimeInterval = max(0, (expiresStartedAtMs + expiresInSeconds * 1000 - Double(SnodeAPI.currentOffsetTimestampMs())) / 1000)
subtitleLabel.text = String(format: "DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN".localized(), timeToExpireInSeconds.formatted(format: .twoUnits))
subtitleLabel.text = "disappearingMessagesCountdownBigMobile"
.put(key: "time_large", value: timeToExpireInSeconds.formatted(format: .twoUnits))
.localized()
timer = Timer.scheduledTimerOnMainThread(withTimeInterval: 1, repeats: true, block: { [weak self] _ in
let timeToExpireInSeconds: TimeInterval = (expiresStartedAtMs + expiresInSeconds * 1000 - Double(SnodeAPI.currentOffsetTimestampMs())) / 1000
if timeToExpireInSeconds <= 0 {
self?.dismissWithTimerInvalidationIfNeeded()
} else {
self?.subtitleLabel.text = String(format: "DISAPPEARING_MESSAGES_AUTO_DELETES_COUNT_DOWN".localized(), timeToExpireInSeconds.formatted(format: .twoUnits))
self?.subtitleLabel.text = "disappearingMessagesCountdownBigMobile"
.put(key: "time_large", value: timeToExpireInSeconds.formatted(format: .twoUnits))
.localized()
}
})
}

8
Session/Conversations/Context Menu/ContextMenuVC.swift
Unescape Escape View File

@ -37,7 +37,7 @@ final class ContextMenuVC: UIViewController {
private lazy var emojiPlusButton: EmojiPlusButton = {
let result: EmojiPlusButton = EmojiPlusButton(
action: self.actions.first(where: { $0.isEmojiPlus }),
action: self.actions.first(where: { $0.actionType == .emojiPlus }),
dismiss: snDismiss
)
result.clipsToBounds = true
@ -140,7 +140,7 @@ final class ContextMenuVC: UIViewController {
let emojiBarStackView = UIStackView(
arrangedSubviews: actions
.filter { $0.isEmojiAction }
.filter { $0.actionType == .emoji }
.map { action -> EmojiReactsView in EmojiReactsView(for: action, dismiss: snDismiss) }
)
emojiBarStackView.axis = .horizontal
@ -165,7 +165,7 @@ final class ContextMenuVC: UIViewController {
let menuStackView = UIStackView(
arrangedSubviews: actions
.filter { !$0.isEmojiAction && !$0.isEmojiPlus && !$0.isDismissAction }
.filter { $0.actionType == .generic }
.map { action -> ActionView in
ActionView(for: action, dismiss: snDismiss)
}
@ -407,7 +407,7 @@ final class ContextMenuVC: UIViewController {
},
completion: { [weak self] _ in
self?.dismiss()
self?.actions.first(where: { $0.isDismissAction })?.work()
self?.actions.first(where: { $0.actionType == .dismiss })?.work()
}
)
}

30
Session/Conversations/ConversationSearch.swift
Unescape Escape View File

@ -278,7 +278,7 @@ public final class SearchResultsBar: UIView {
DispatchQueue.main.async { [weak self] in
if hasNoExistingResults {
self?.label.text = "CONVERSATION_SEARCH_SEARCHING".localized()
self?.label.text = "searchSearching".localized()
}
self?.startLoading()
@ -326,27 +326,17 @@ public final class SearchResultsBar: UIView {
stopLoading()
return
}
switch results.count {
case 0:
// Keyboard toolbar label when no messages match the search string
label.text = "CONVERSATION_SEARCH_NO_RESULTS".localized()
case 1:
// Keyboard toolbar label when exactly 1 message matches the search string
label.text = "CONVERSATION_SEARCH_ONE_RESULT".localized()
default:
// Keyboard toolbar label when more than 1 message matches the search string
//
// Embeds {{number/position of the 'currently viewed' result}} and
// the {{total number of results}}
let format = "CONVERSATION_SEARCH_RESULTS_FORMAT".localized()
guard let currentIndex: Int = currentIndex else { return }
label.text = String(format: format, currentIndex + 1, results.count)
label.text = {
guard results.count > 0 else {
return "searchMatchesNone".localized()
}
return "searchMatches"
.putNumber(results.count)
.put(key: "found_count", value: (currentIndex ?? 0) + 1)
.localized()
}()
if let currentIndex: Int = currentIndex {
downButton.isEnabled = currentIndex > 0

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

@ -93,9 +93,9 @@ extension ConversationVC:
guard Storage.shared[.areCallsEnabled] else {
let confirmationModal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "modal_call_permission_request_title".localized(),
body: .text("modal_call_permission_request_explanation".localized()),
confirmTitle: "vc_settings_title".localized(),
title: "callsPermissionsRequired".localized(),
body: .text("callsPermissionsRequiredDescription".localized()),
confirmTitle: "sessionSettings".localized(),
confirmAccessibility: Accessibility(identifier: "Settings"),
dismissOnConfirm: false // Custom dismissal logic
) { [weak self] _ in
@ -148,26 +148,22 @@ extension ConversationVC:
self.viewModel.threadData.threadIsBlocked == true
else { return false }
let message = String(
format: "modal_blocked_explanation".localized(),
self.viewModel.threadData.displayName
)
let confirmationModal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: String(
format: "modal_blocked_title".localized(),
format: "blockUnblock".localized(),
self.viewModel.threadData.displayName
),
body: .attributedText(
NSAttributedString(string: message)
.adding(
attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.smallFontSize) ],
range: (message as NSString).range(of: self.viewModel.threadData.displayName)
)
"blockUnblockName"
.put(key: "name", value: viewModel.threadData.displayName)
.localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize))
),
confirmTitle: "modal_blocked_button_title".localized(),
confirmTitle: "blockUnblock".localized(),
confirmAccessibility: Accessibility(identifier: "Confirm block"),
confirmStyle: .danger,
cancelAccessibility: Accessibility(identifier: "Cancel block"),
cancelStyle: .alert_text,
dismissOnConfirm: false // Custom dismissal logic
) { [weak self] _ in
self?.viewModel.unblockContact()
@ -255,9 +251,13 @@ extension ConversationVC:
guard Storage.shared[.isGiphyEnabled] else {
let modal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "GIPHY_PERMISSION_TITLE".localized(),
body: .text("GIPHY_PERMISSION_MESSAGE".localized()),
confirmTitle: "continue_2".localized()
title: "giphyWarning".localized(),
body: .text(
"giphyWarningDescription"
.put(key: "app_name", value: Constants.app_name)
.localized()
),
confirmTitle: "theContinue".localized()
) { [weak self] _ in
Storage.shared.writeAsync(
updates: { db in
@ -349,16 +349,7 @@ extension ConversationVC:
}
catch {
DispatchQueue.main.async { [weak self] in
let modal: ConfirmationModal = ConfirmationModal(
targetView: self?.view,
info: ConfirmationModal.Info(
title: "Session",
body: .text("An error occurred."),
cancelTitle: "BUTTON_OK".localized(),
cancelStyle: .alert_text
)
)
self?.present(modal, animated: true)
self?.viewModel.showToast(text: "attachmentsErrorLoad".localized())
}
return
}
@ -369,9 +360,9 @@ extension ConversationVC:
let modal: ConfirmationModal = ConfirmationModal(
targetView: self?.view,
info: ConfirmationModal.Info(
title: "ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_TITLE".localized(),
body: .text("ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_BODY".localized()),
cancelTitle: "BUTTON_OK".localized(),
title: "attachmentsErrorLoad".localized(),
body: .text("attachmentsErrorNotSupported".localized()),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)
@ -380,18 +371,10 @@ extension ConversationVC:
return
}
let fileName = urlResourceValues.name ?? NSLocalizedString("ATTACHMENT_DEFAULT_FILENAME", comment: "")
let fileName = urlResourceValues.name ?? "attachment".localized()
guard let dataSource = DataSourcePath(fileUrl: url, shouldDeleteOnDeinit: false) else {
DispatchQueue.main.async { [weak self] in
let modal: ConfirmationModal = ConfirmationModal(
targetView: self?.view,
info: ConfirmationModal.Info(
title: "ATTACHMENT_PICKER_DOCUMENTS_FAILED_ALERT_TITLE".localized(),
cancelTitle: "BUTTON_OK".localized(),
cancelStyle: .alert_text
)
)
self?.present(modal, animated: true)
self?.viewModel.showToast(text: "attachmentsErrorLoad".localized())
}
return
}
@ -485,9 +468,9 @@ extension ConversationVC:
// Warn the user if they're about to send their seed to someone
let modal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "modal_send_seed_title".localized(),
body: .text("modal_send_seed_explanation".localized()),
confirmTitle: "modal_send_seed_send_button_title".localized(),
title: "warning".localized(),
body: .text("recoveryPasswordWarningSendDescription".localized()),
confirmTitle: "send".localized(),
confirmStyle: .danger,
cancelStyle: .alert_text,
onConfirm: { [weak self] _ in
@ -660,9 +643,15 @@ extension ConversationVC:
func showLinkPreviewSuggestionModal() {
let linkPreviewModal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "modal_link_previews_title".localized(),
body: .text("modal_link_previews_explanation".localized()),
confirmTitle: "modal_link_previews_button_title".localized()
title: "linkPreviewsEnable".localized(),
body: .text(
"linkPreviewsFirstDescription"
.put(key: "app_name", value: Constants.app_name)
.localized()
),
confirmTitle: "enable".localized(),
confirmStyle: .danger,
cancelStyle: .alert_text
) { [weak self] _ in
Storage.shared.writeAsync { db in
db[.areLinkPreviewsEnabled] = true
@ -735,7 +724,7 @@ extension ConversationVC:
let newText: String = snInputView.text.replacingCharacters(
in: currentMentionStartIndex...,
with: "@\(mentionInfo.profile.displayName(for: self.viewModel.threadData.threadVariant)) "
with: "@\(mentionInfo.profile.displayName(for: self.viewModel.threadData.threadVariant)) " // stringlint:disable
)
snInputView.text = newText
@ -794,8 +783,8 @@ extension ConversationVC:
func replaceMentions(in text: String) -> String {
var result = text
for mention in mentions {
guard let range = result.range(of: "@\(mention.profile.displayName(for: mention.threadVariant))") else { continue }
result = result.replacingCharacters(in: range, with: "@\(mention.profile.id)")
guard let range = result.range(of: "@\(mention.profile.displayName(for: mention.threadVariant))") else { continue } // stringlint:disable
result = result.replacingCharacters(in: range, with: "@\(mention.profile.id)") // stringlint:disable
}
return result
@ -890,12 +879,6 @@ extension ConversationVC:
cellLocation: CGPoint,
using dependencies: Dependencies = Dependencies()
) {
guard cellViewModel.variant != .standardOutgoing || (cellViewModel.state != .failed && cellViewModel.state != .failedToSync) else {
// Show the failed message sheet
showFailedMessageSheet(for: cellViewModel, using: dependencies)
return
}
// For call info messages show the "call missed" modal
guard cellViewModel.variant != .infoCall else {
// If the failure was due to the mic permission being denied then we want to show the permission modal,
@ -921,35 +904,23 @@ extension ConversationVC:
guard cellViewModel.variant != .infoDisappearingMessagesUpdate else {
let messageDisappearingConfig = cellViewModel.messageDisappearingConfiguration()
let expirationTimerString: String = floor(messageDisappearingConfig.durationSeconds).formatted(format: .long)
let expirationTypeString: String = (messageDisappearingConfig.type == .disappearAfterRead ? "DISAPPEARING_MESSAGE_STATE_READ".localized() : "DISAPPEARING_MESSAGE_STATE_SENT".localized())
let modalBodyString: String = (
messageDisappearingConfig.isEnabled ?
String(
format: "FOLLOW_SETTING_EXPLAINATION_TURNING_ON".localized(),
expirationTimerString,
expirationTypeString
) :
"FOLLOW_SETTING_EXPLAINATION_TURNING_OFF".localized()
)
let modalConfirmTitle: String = messageDisappearingConfig.isEnabled ? "DISAPPERING_MESSAGES_SAVE_TITLE".localized() : "CONFIRM_BUTTON_TITLE".localized()
let expirationTypeString: String = (messageDisappearingConfig.type?.localizedName ?? "")
let modalBodyString: String = {
if messageDisappearingConfig.isEnabled {
return "disappearingMessagesFollowSettingOn"
.put(key: "time", value: expirationTimerString)
.put(key: "disappearing_messages_type", value: expirationTypeString)
.localized()
} else {
return "disappearingMessagesFollowSettingOff"
.localized()
}
}()
let modalConfirmTitle: String = messageDisappearingConfig.isEnabled ? "set".localized() : "confirm".localized()
let confirmationModal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "FOLLOW_SETTING_TITLE".localized(),
body: .attributedText(
NSAttributedString(string: modalBodyString)
.adding(
attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.smallFontSize) ],
range: (modalBodyString as NSString).range(of: expirationTypeString)
)
.adding(
attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.smallFontSize) ],
range: (modalBodyString as NSString).range(of: expirationTimerString)
)
.adding(
attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.smallFontSize) ],
range: (modalBodyString as NSString).range(of: "DISAPPEARING_MESSAGES_OFF".localized().lowercased())
)
),
title: "disappearingMessagesFollowSetting".localized(),
body: .attributedText(modalBodyString.formatted(baseFont: .systemFont(ofSize: Values.smallFontSize))),
accessibility: Accessibility(identifier: "Follow setting dialog"),
confirmTitle: modalConfirmTitle,
confirmAccessibility: Accessibility(identifier: "Set button"),
@ -976,24 +947,14 @@ extension ConversationVC:
// If it's an incoming media message and the thread isn't trusted then show the placeholder view
if cellViewModel.cellType != .textOnlyMessage && cellViewModel.variant == .standardIncoming && !cellViewModel.threadIsTrusted {
let message: String = String(
format: "modal_download_attachment_explanation".localized(),
cellViewModel.authorName
)
let message: NSAttributedString = "attachmentsAutoDownloadModalDescription"
.put(key: "conversation_name", value: cellViewModel.authorName)
.localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize))
let confirmationModal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: String(
format: "modal_download_attachment_title".localized(),
cellViewModel.authorName
),
body: .attributedText(
NSAttributedString(string: message)
.adding(
attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.smallFontSize) ],
range: (message as NSString).range(of: cellViewModel.authorName)
)
),
confirmTitle: "modal_download_button_title".localized(),
title: "attachmentsAutoDownloadModalTitle".localized(),
body: .attributedText(message),
confirmTitle: "download".localized(),
confirmAccessibility: Accessibility(identifier: "Download media"),
cancelAccessibility: Accessibility(identifier: "Don't download media"),
dismissOnConfirm: false // Custom dismissal logic
@ -1236,26 +1197,32 @@ extension ConversationVC:
func openUrl(_ urlString: String) {
guard let url: URL = URL(string: urlString) else { return }
// URLs can be unsafe, so always ask the user whether they want to open one
let actionSheet: UIAlertController = UIAlertController(
title: "modal_open_url_title".localized(),
message: String(format: "modal_open_url_explanation".localized(), url.absoluteString),
preferredStyle: .actionSheet
let modal: ConfirmationModal = ConfirmationModal(
targetView: self.view,
info: ConfirmationModal.Info(
title: "urlOpen".localized(),
body: .attributedText(
"urlOpenDescription"
.put(key: "url", value: url.absoluteString)
.localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize)),
canScroll: true
),
confirmTitle: "open".localized(),
confirmStyle: .danger,
cancelTitle: "urlCopy".localized(),
cancelStyle: .alert_text,
onConfirm: { [weak self] _ in
UIApplication.shared.open(url, options: [:], completionHandler: nil)
self?.showInputAccessoryView()
},
onCancel: { [weak self] _ in
UIPasteboard.general.string = url.absoluteString
self?.showInputAccessoryView()
}
)
)
actionSheet.addAction(UIAlertAction(title: "modal_open_url_button_title".localized(), style: .default) { [weak self] _ in
UIApplication.shared.open(url, options: [:], completionHandler: nil)
self?.showInputAccessoryView()
})
actionSheet.addAction(UIAlertAction(title: "modal_copy_url_button_title".localized(), style: .default) { [weak self] _ in
UIPasteboard.general.string = url.absoluteString
self?.showInputAccessoryView()
})
actionSheet.addAction(UIAlertAction(title: "cancel".localized(), style: .cancel) { [weak self] _ in
self?.showInputAccessoryView()
})
Modal.setupForIPadIfNeeded(actionSheet, targetView: self.view)
self.present(actionSheet, animated: true)
self.present(modal, animated: true)
}
func handleReplyButtonTapped(for cellViewModel: MessageViewModel, using dependencies: Dependencies) {
@ -1469,7 +1436,7 @@ extension ConversationVC:
(sentTimestamp - (recentReactionTimestamps.first ?? sentTimestamp)) > (60 * 1000)
else {
let toastController: ToastController = ToastController(
text: "EMOJI_REACTS_RATE_LIMIT_TOAST".localized(),
text: "emojiReactsCoolDown".localized(),
background: .backgroundSecondary
)
toastController.presentToastView(
@ -1713,61 +1680,15 @@ extension ConversationVC:
// MARK: --action handling
private func showFailedMessageSheet(for cellViewModel: MessageViewModel, using dependencies: Dependencies) {
let sheet = UIAlertController(
title: (cellViewModel.state == .failedToSync ?
"MESSAGE_DELIVERY_FAILED_SYNC_TITLE".localized() :
"MESSAGE_DELIVERY_FAILED_TITLE".localized()
),
message: cellViewModel.mostRecentFailureText,
preferredStyle: .actionSheet
)
sheet.addAction(UIAlertAction(title: "TXT_CANCEL_TITLE".localized(), style: .cancel, handler: nil))
if cellViewModel.state != .failedToSync {
sheet.addAction(UIAlertAction(title: "TXT_DELETE_TITLE".localized(), style: .destructive, handler: { _ in
Storage.shared.writeAsync { db in
try Interaction
.filter(id: cellViewModel.id)
.deleteAll(db)
}
}))
}
sheet.addAction(UIAlertAction(
title: (cellViewModel.state == .failedToSync ?
"context_menu_resync".localized() :
"context_menu_resend".localized()
),
style: .default,
handler: { [weak self] _ in self?.retry(cellViewModel, using: dependencies) }
))
// HACK: Extracting this info from the error string is pretty dodgy
let prefix: String = "HTTP request failed at destination (Service node "
if let mostRecentFailureText: String = cellViewModel.mostRecentFailureText, mostRecentFailureText.hasPrefix(prefix) {
let rest = mostRecentFailureText.substring(from: prefix.count)
if let index = rest.firstIndex(of: ")") {
let snodeAddress = String(rest[rest.startIndex..<index])
sheet.addAction(UIAlertAction(title: "Copy Service Node Info", style: .default) { _ in
UIPasteboard.general.string = snodeAddress
})
}
}
Modal.setupForIPadIfNeeded(sheet, targetView: self.view)
present(sheet, animated: true, completion: nil)
}
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 ?? "Open Group")
let message: String = "Are you sure you want to join the \(finalName) open group?";
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 \(finalName)?",
title: "join".localized() + " \(finalName)?",
body: .attributedText(
NSMutableAttributedString(string: message)
.adding(
@ -1775,7 +1696,7 @@ extension ConversationVC:
range: (message as NSString).range(of: finalName)
)
),
confirmTitle: "JOIN_COMMUNITY_BUTTON_TITLE".localized(),
confirmTitle: "join".localized(),
onConfirm: { modal in
guard let presentingViewController: UIViewController = modal.presentingViewController else {
return
@ -1784,8 +1705,10 @@ extension ConversationVC:
guard let (room, server, publicKey) = LibSession.parseCommunity(url: url) else {
let errorModal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "COMMUNITY_ERROR_GENERIC".localized(),
cancelTitle: "BUTTON_OK".localized(),
title: "communityJoinError"
.put(key: "community_name", value: finalName)
.localized(),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)
@ -1833,9 +1756,11 @@ extension ConversationVC:
// Show the user an error indicating they failed to properly join the group
let errorModal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "COMMUNITY_ERROR_GENERIC".localized(),
title: "communityJoinError"
.put(key: "community_name", value: finalName)
.localized(),
body: .text("\(error)"),
cancelTitle: "BUTTON_OK".localized(),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)
@ -1889,9 +1814,9 @@ extension ConversationVC:
// Show an error for the retry
let modal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "ALERT_ERROR_TITLE".localized(),
body: .text("FAILED_TO_STORE_OUTGOING_MESSAGE".localized()),
cancelTitle: "BUTTON_OK".localized(),
title: "theError".localized(),
body: .text("shareExtensionDatabaseError".localized()),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)
@ -2033,7 +1958,6 @@ extension ConversationVC:
case .standardOutgoing, .standardIncoming: break
}
let threadName: String = self.viewModel.threadData.displayName
let userPublicKey: String = getUserHexEncodedPublicKey()
// Remote deletion logic
@ -2235,7 +2159,7 @@ extension ConversationVC:
let actionSheet: UIAlertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
actionSheet.addAction(UIAlertAction(
title: "delete_message_for_me".localized(),
title: "deleteMessageDeviceOnly".localized(),
accessibilityIdentifier: "Delete for me",
style: .destructive
) { [weak self] _ in
@ -2262,19 +2186,16 @@ extension ConversationVC:
actionSheet.addAction(UIAlertAction(
title: {
switch cellViewModel.threadVariant {
case .legacyGroup, .group: return "delete_message_for_everyone".localized()
default:
return (cellViewModel.threadId == userPublicKey ?
"delete_message_for_me_and_my_devices".localized() :
String(format: "delete_message_for_me_and_recipient".localized(), threadName)
)
switch (cellViewModel.threadVariant, cellViewModel.threadId) {
case (.legacyGroup, _), (.group, _): return "clearMessagesForEveryone".localized()
case (_, userPublicKey): return "deleteMessageDevicesAll".localized()
default: return "deleteMessageEveryone".localized()
}
}(),
accessibilityIdentifier: "Delete for everyone",
style: .destructive
) { [weak self] _ in
let completeServerDeletion = { [weak self] in
let completeServerDeletion = {
Storage.shared.writeAsync { db in
try MessageSender
.send(
@ -2286,10 +2207,8 @@ extension ConversationVC:
using: dependencies
)
}
self?.showInputAccessoryView()
}
// We can only delete messages on the server for `contact` and `group` conversations
guard cellViewModel.threadVariant == .contact || cellViewModel.threadVariant == .group else {
return completeServerDeletion()
@ -2307,7 +2226,7 @@ extension ConversationVC:
) { completeServerDeletion() }
})
actionSheet.addAction(UIAlertAction.init(title: "TXT_CANCEL_TITLE".localized(), style: .cancel) { [weak self] _ in
actionSheet.addAction(UIAlertAction.init(title: "cancel".localized(), style: .cancel) { [weak self] _ in
self?.showInputAccessoryView()
})
@ -2374,9 +2293,10 @@ extension ConversationVC:
let modal: ConfirmationModal = ConfirmationModal(
targetView: self.view,
info: ConfirmationModal.Info(
title: "Session",
body: .text("This will ban the selected user from this room. It won't ban them from other rooms."),
confirmTitle: "BUTTON_OK".localized(),
title: "banUser".localized(),
body: .text("communityBanDescription".localized()),
confirmTitle: "theContinue".localized(),
confirmStyle: .danger,
cancelStyle: .alert_text,
onConfirm: { [weak self] _ in
Storage.shared
@ -2400,18 +2320,22 @@ extension ConversationVC:
.sinkUntilComplete(
receiveCompletion: { result in
switch result {
case .finished: break
case .finished:
DispatchQueue.main.async { [weak self] in
self?.viewModel.showToast(
text: "banUserBanned".localized(),
backgroundColor: .backgroundSecondary,
insect: (self?.inputAccessoryView?.frame.height ?? Values.mediumSpacing) + Values.smallSpacing
)
}
case .failure:
let modal: ConfirmationModal = ConfirmationModal(
targetView: self?.view,
info: ConfirmationModal.Info(
title: CommonStrings.errorAlertTitle,
body: .text("context_menu_ban_user_error_alert_message".localized()),
cancelTitle: "BUTTON_OK".localized(),
cancelStyle: .alert_text
DispatchQueue.main.async { [weak self] in
self?.viewModel.showToast(
text: "banErrorFailed".localized(),
backgroundColor: .backgroundSecondary,
insect: (self?.inputAccessoryView?.frame.height ?? Values.mediumSpacing) + Values.smallSpacing
)
)
self?.present(modal, animated: true)
}
}
}
)
@ -2431,9 +2355,10 @@ extension ConversationVC:
let modal: ConfirmationModal = ConfirmationModal(
targetView: self.view,
info: ConfirmationModal.Info(
title: "Session",
body: .text("This will ban the selected user from this room and delete all messages sent by them. It won't ban them from other rooms or delete the messages they sent there."),
confirmTitle: "BUTTON_OK".localized(),
title: "banDeleteAll".localized(),
body: .text("communityBanDeleteDescription".localized()),
confirmTitle: "theContinue".localized(),
confirmStyle: .danger,
cancelStyle: .alert_text,
onConfirm: { [weak self] _ in
Storage.shared
@ -2457,18 +2382,22 @@ extension ConversationVC:
.sinkUntilComplete(
receiveCompletion: { result in
switch result {
case .finished: break
case .finished:
DispatchQueue.main.async { [weak self] in
self?.viewModel.showToast(
text: "banUserBanned".localized(),
backgroundColor: .backgroundSecondary,
insect: (self?.inputAccessoryView?.frame.height ?? Values.mediumSpacing) + Values.smallSpacing
)
}
case .failure:
let modal: ConfirmationModal = ConfirmationModal(
targetView: self?.view,
info: ConfirmationModal.Info(
title: CommonStrings.errorAlertTitle,
body: .text("context_menu_ban_user_error_alert_message".localized()),
cancelTitle: "BUTTON_OK".localized(),
cancelStyle: .alert_text
DispatchQueue.main.async { [weak self] in
self?.viewModel.showToast(
text: "banErrorFailed".localized(),
backgroundColor: .backgroundSecondary,
insect: (self?.inputAccessoryView?.frame.height ?? Values.mediumSpacing) + Values.smallSpacing
)
)
self?.present(modal, animated: true)
}
}
}
)
@ -2500,7 +2429,7 @@ extension ConversationVC:
// Create URL
let directory: String = Singleton.appContext.temporaryDirectory
let fileName: String = "\(SnodeAPI.currentOffsetTimestampMs()).m4a"
let fileName: String = "\(SnodeAPI.currentOffsetTimestampMs()).m4a" // stringlint:disable
let url: URL = URL(fileURLWithPath: directory).appendingPathComponent(fileName)
// Set up audio session
@ -2548,9 +2477,9 @@ extension ConversationVC:
let modal: ConfirmationModal = ConfirmationModal(
targetView: self.view,
info: ConfirmationModal.Info(
title: "ALERT_ERROR_TITLE".localized(),
body: .text("VOICE_MESSAGE_FAILED_TO_START_MESSAGE".localized()),
cancelTitle: "BUTTON_OK".localized(),
title: "theError".localized(),
body: .text("audioUnableToRecord".localized()),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)
@ -2586,9 +2515,9 @@ extension ConversationVC:
let modal: ConfirmationModal = ConfirmationModal(
targetView: self.view,
info: ConfirmationModal.Info(
title: "VOICE_MESSAGE_TOO_SHORT_ALERT_TITLE".localized(),
body: .text("VOICE_MESSAGE_TOO_SHORT_ALERT_MESSAGE".localized()),
cancelTitle: "BUTTON_OK".localized(),
title: "messageVoice".localized(),
body: .text("messageVoiceErrorShort".localized()),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)
@ -2603,7 +2532,7 @@ extension ConversationVC:
guard let dataSource = dataSourceOrNil else { return SNLog("Couldn't load recorded data.") }
// Create attachment
let fileName = ("VOICE_MESSAGE_FILE_NAME".localized() as NSString).appendingPathExtension("m4a")
let fileName = ("messageVoice".localized() as NSString).appendingPathExtension("m4a")
dataSource.sourceFilename = fileName
let attachment = SignalAttachment.voiceMessageAttachment(dataSource: dataSource, dataUTI: kUTTypeMPEG4Audio as String)
@ -2664,16 +2593,18 @@ extension ConversationVC:
// MARK: - Convenience
func showErrorAlert(for attachment: SignalAttachment) {
let modal: ConfirmationModal = ConfirmationModal(
targetView: self.view,
info: ConfirmationModal.Info(
title: "ATTACHMENT_ERROR_ALERT_TITLE".localized(),
body: .text(attachment.localizedErrorDescription ?? SignalAttachment.missingDataErrorMessage),
cancelTitle: "BUTTON_OK".localized(),
cancelStyle: .alert_text
DispatchQueue.main.async { [weak self] in
let modal: ConfirmationModal = ConfirmationModal(
targetView: self?.view,
info: ConfirmationModal.Info(
title: "attachmentsErrorSending".localized(),
body: .text(attachment.localizedErrorDescription ?? SignalAttachment.missingDataErrorMessage),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)
)
self.present(modal, animated: true)
self?.present(modal, animated: true)
}
}
}
@ -2729,13 +2660,24 @@ extension ConversationVC {
// messageRequestResponse back to the sender (this allows the sender to know that
// they have been approved and can now use this contact in closed groups)
if !isNewThread {
let interaction = try? Interaction(
threadId: threadId,
threadVariant: threadVariant,
authorId: getUserHexEncodedPublicKey(db),
variant: .infoMessageRequestAccepted,
body: "messageRequestYouHaveAccepted"
.put(key: "name", value: self.viewModel.threadData.displayName)
.localized(),
timestampMs: timestampMs
).inserted(db)
try MessageSender.send(
db,
message: MessageRequestResponse(
isApproved: true,
sentTimestampMs: UInt64(timestampMs)
),
interactionId: nil,
interactionId: interaction?.id,
threadId: threadId,
threadVariant: threadVariant,
using: dependencies
@ -2779,7 +2721,8 @@ extension ConversationVC {
indexPath: IndexPath(row: 0, section: 0),
tableView: self.tableView,
threadViewModel: self.viewModel.threadData,
viewController: self
viewController: self,
navigatableStateHolder: nil
)
guard let action: UIContextualAction = actions?.first else { return }
@ -2802,7 +2745,8 @@ extension ConversationVC {
indexPath: IndexPath(row: 0, section: 0),
tableView: self.tableView,
threadViewModel: self.viewModel.threadData,
viewController: self
viewController: self,
navigatableStateHolder: nil
)
guard let action: UIContextualAction = actions?.first else { return }

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

@ -107,7 +107,7 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
return result
}()
lazy var recordVoiceMessageActivity = AudioActivity(audioDescription: "Voice message", behavior: .playAndRecord)
lazy var recordVoiceMessageActivity = AudioActivity(audioDescription: "Voice message", behavior: .playAndRecord) // stringlint:disable
lazy var searchController: ConversationSearchController = {
let result: ConversationSearchController = ConversationSearchController(
@ -144,7 +144,6 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
result.separatorStyle = .none
result.themeBackgroundColor = .clear
result.showsVerticalScrollIndicator = false
result.contentInsetAdjustmentBehavior = .never
result.keyboardDismissMode = .interactive
result.contentInset = UIEdgeInsets(
top: 0,
@ -209,7 +208,9 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
lazy var outdatedClientBanner: InfoBanner = {
let info: InfoBanner.Info = InfoBanner.Info(
message: String(format: "DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER".localized(), self.viewModel.threadData.displayName),
message: "disappearingMessagesLegacy"
.put(key: "name", value: self.viewModel.threadData.displayName)
.localized(),
backgroundColor: .primary,
messageFont: .systemFont(ofSize: Values.verySmallFontSize),
messageTintColor: .messageBubble_outgoingText,
@ -424,7 +425,7 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
name: UIApplication.userDidTakeScreenshotNotification,
object: nil
)
// Observe keyboard notifications
let keyboardNotifications: [Notification.Name] = [
UIResponder.keyboardWillShowNotification,
@ -442,6 +443,8 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
object: nil
)
}
self.viewModel.navigatableState.setupBindings(viewController: self, disposables: &self.viewModel.disposables)
// The first time the view loads we should mark the thread as read (in case it was manually
// marked as unread) - doing this here means if we add a "mark as unread" action within the
@ -665,21 +668,24 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
}
private func emptyStateText(for threadData: SessionThreadViewModel) -> String {
return String(
format: {
switch (threadData.threadIsNoteToSelf, threadData.canWrite) {
case (true, _): return "CONVERSATION_EMPTY_STATE_NOTE_TO_SELF".localized()
case (_, false):
return (threadData.profile?.blocksCommunityMessageRequests == true ?
"COMMUNITY_MESSAGE_REQUEST_DISABLED_EMPTY_STATE".localized() :
"CONVERSATION_EMPTY_STATE_READ_ONLY".localized()
)
default: return "CONVERSATION_EMPTY_STATE".localized()
switch (threadData.threadIsNoteToSelf, threadData.canWrite) {
case (true, _):
return "noteToSelfEmpty".localized()
case (_, false):
if threadData.profile?.blocksCommunityMessageRequests == true {
return "messageRequestsTurnedOff"
.put(key: "name", value: threadData.displayName)
.localized()
} else {
return "conversationsEmpty"
.put(key: "conversation_name", value: threadData.displayName)
.localized()
}
}(),
threadData.displayName
)
default:
return "groupNoMessages"
.put(key: "group_name", value: threadData.displayName)
.localized()
}
}
private func handleThreadUpdates(_ updatedThreadData: SessionThreadViewModel, initialLoad: Bool = false) {
@ -725,13 +731,7 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
// Update the empty state
let text: String = emptyStateText(for: updatedThreadData)
emptyStateLabel.attributedText = NSAttributedString(string: text)
.adding(
attributes: [.font: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize)],
range: text.range(of: updatedThreadData.displayName)
.map { NSRange($0, in: text) }
.defaulting(to: NSRange(location: 0, length: 0))
)
emptyStateLabel.attributedText = text.formatted(in: emptyStateLabel)
}
if
@ -1479,10 +1479,9 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
}
self.outdatedClientBanner.update(
message: String(
format: "DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER".localized(),
Profile.displayName(id: outdatedMemberId, threadVariant: self.viewModel.threadData.threadVariant)
),
message: "disappearingMessagesLegacy"
.put(key: "name", value: Profile.displayName(id: outdatedMemberId, threadVariant: self.viewModel.threadData.threadVariant))
.localized(),
dismiss: self.removeOutdatedClientBanner
)
@ -1555,9 +1554,9 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
let modal: ConfirmationModal = ConfirmationModal(
targetView: self?.view,
info: ConfirmationModal.Info(
title: CommonStrings.errorAlertTitle,
body: .text("INVALID_AUDIO_FILE_ALERT_ERROR_MESSAGE".localized()),
cancelTitle: "BUTTON_OK".localized(),
title: "theError".localized(),
body: .text("audioUnableToPlay".localized()),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)
@ -1725,7 +1724,7 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
func updateUnreadCountView(unreadCount: UInt?) {
let unreadCount: Int = Int(unreadCount ?? 0)
let fontSize: CGFloat = (unreadCount < 10000 ? Values.verySmallFontSize : 8)
unreadCountLabel.text = (unreadCount < 10000 ? "\(unreadCount)" : "9999+")
unreadCountLabel.text = (unreadCount < 10000 ? "\(unreadCount)" : "9999+") // stringlint:disable
unreadCountLabel.font = .boldSystemFont(ofSize: fontSize)
unreadCountView.isHidden = (unreadCount == 0)
}

12
Session/Conversations/ConversationViewModel.swift
Unescape Escape View File

@ -7,7 +7,7 @@ import DifferenceKit
import SessionMessagingKit
import SessionUtilitiesKit
public class ConversationViewModel: OWSAudioPlayerDelegate {
public class ConversationViewModel: OWSAudioPlayerDelegate, NavigatableStateHolder {
public typealias SectionModel = ArraySection<Section, MessageViewModel>
// MARK: - FocusBehaviour
@ -46,6 +46,9 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
public static let pageSize: Int = 50
public let navigatableState: NavigatableState = NavigatableState()
public var disposables: Set<AnyCancellable> = Set()
private var threadId: String
public let initialThreadVariant: SessionThread.Variant
public var sentMessageBeforeUpdate: Bool = false
@ -67,9 +70,9 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
threadVariant: threadData.threadVariant
)
return "\(name) is blocked. Unblock them?"
return "blockBlockedDescription".localized()
default: return "Thread is blocked. Unblock it?"
default: return "Thread is blocked. Unblock it?" // Should not happen // stringlint:disable
}
}()
@ -642,7 +645,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
$0.id,
$0.messageViewModel.with(
state: .failed,
mostRecentFailureText: "FAILED_TO_STORE_OUTGOING_MESSAGE".localized()
mostRecentFailureText: "shareExtensionDatabaseError".localized()
),
$0.interaction,
$0.attachmentData,
@ -877,6 +880,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
guard self._threadData.wrappedValue.threadVariant == .contact else { return }
let threadId: String = self.threadId
let displayName: String = self._threadData.wrappedValue.displayName
Storage.shared.writeAsync { db in
try Contact

37
Session/Conversations/Emoji Picker/EmojiPickerCollectionView.swift
Unescape Escape View File

@ -56,13 +56,9 @@ class EmojiPickerCollectionView: UICollectionView {
delegate = self
dataSource = self
register(EmojiCell.self, forCellWithReuseIdentifier: EmojiCell.reuseIdentifier)
register(
EmojiSectionHeader.self,
forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader,
withReuseIdentifier: EmojiSectionHeader.reuseIdentifier
)
register(view: EmojiCell.self)
register(view: EmojiSectionHeader.self, ofKind: UICollectionView.elementKindSectionHeader)
themeBackgroundColor = .clear
@ -136,7 +132,7 @@ class EmojiPickerCollectionView: UICollectionView {
func nameForSection(_ section: Int) -> String? {
guard section > 0 || !hasRecentEmoji else {
return "EMOJI_CATEGORY_RECENTS_NAME".localized()
return "emojiCategoryRecentlyUsed".localized()
}
guard let category = Emoji.Category.allCases[safe: section - categoryIndexOffset] else {
@ -245,35 +241,20 @@ extension EmojiPickerCollectionView: UICollectionViewDataSource {
}
func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
let cell = dequeueReusableCell(withReuseIdentifier: EmojiCell.reuseIdentifier, for: indexPath)
guard let emojiCell = cell as? EmojiCell else {
Log.error("[EmojiPickerCollectionView] unexpected cell type")
return cell
}
let cell = dequeue(type: EmojiCell.self, for: indexPath)
guard let emoji = emojiForIndexPath(indexPath) else {
Log.error("[EmojiPickerCollectionView] unexpected indexPath")
return cell
}
emojiCell.configure(emoji: emoji)
cell.configure(emoji: emoji)
return cell
}
func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
let supplementaryView = dequeueReusableSupplementaryView(
ofKind: kind,
withReuseIdentifier: EmojiSectionHeader.reuseIdentifier,
for: indexPath
)
guard let sectionHeader = supplementaryView as? EmojiSectionHeader else {
Log.error("[EmojiPickerCollectionView] unexpected supplementary view type")
return supplementaryView
}
let sectionHeader = dequeue(type: EmojiSectionHeader.self, ofKind: kind, for: indexPath)
sectionHeader.label.text = nameForSection(indexPath.section)
@ -296,8 +277,6 @@ extension EmojiPickerCollectionView: UICollectionViewDelegateFlowLayout {
}
private class EmojiCell: UICollectionViewCell {
static let reuseIdentifier = "EmojiCell" // stringlint:disable
let emojiLabel = UILabel()
override init(frame: CGRect) {
@ -326,8 +305,6 @@ private class EmojiCell: UICollectionViewCell {
}
private class EmojiSectionHeader: UICollectionReusableView {
static let reuseIdentifier = "EmojiSectionHeader" // stringlint:disable
let label = UILabel()
override init(frame: CGRect) {

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

@ -34,7 +34,7 @@ final class ExpandingAttachmentsButton: UIView, InputViewButtonDelegate {
lazy var documentButton: InputViewButton = {
let result = InputViewButton(icon: #imageLiteral(resourceName: "actionsheet_document_black"), delegate: self, hasOpaqueBackground: true)
result.accessibilityIdentifier = "Documents folder"
result.accessibilityLabel = "accessibility_document_button".localized()
result.accessibilityLabel = "Files"
result.isAccessibilityElement = true
return result
@ -43,7 +43,7 @@ final class ExpandingAttachmentsButton: UIView, InputViewButtonDelegate {
lazy var libraryButton: InputViewButton = {
let result = InputViewButton(icon: #imageLiteral(resourceName: "actionsheet_camera_roll_black"), delegate: self, hasOpaqueBackground: true)
result.accessibilityIdentifier = "Images folder"
result.accessibilityLabel = "accessibility_library_button".localized()
result.accessibilityLabel = "Photo library"
result.isAccessibilityElement = true
return result
@ -52,7 +52,7 @@ final class ExpandingAttachmentsButton: UIView, InputViewButtonDelegate {
lazy var cameraButton: InputViewButton = {
let result = InputViewButton(icon: #imageLiteral(resourceName: "actionsheet_camera_black"), delegate: self, hasOpaqueBackground: true)
result.accessibilityIdentifier = "Select camera button"
result.accessibilityLabel = "accessibility_camera_button".localized()
result.accessibilityLabel = "Camera"
result.isAccessibilityElement = true
return result
@ -60,7 +60,7 @@ final class ExpandingAttachmentsButton: UIView, InputViewButtonDelegate {
lazy var cameraButtonContainer = container(for: cameraButton)
lazy var mainButton: InputViewButton = {
let result = InputViewButton(icon: #imageLiteral(resourceName: "ic_plus_24"), delegate: self)
result.accessibilityLabel = "accessibility_expanding_attachments_button".localized()
result.accessibilityLabel = "Add attachment"
return result
}()
@ -111,7 +111,7 @@ final class ExpandingAttachmentsButton: UIView, InputViewButtonDelegate {
// MARK: Animation
private func expandOrCollapse() {
if isExpanded {
mainButton.accessibilityLabel = NSLocalizedString("accessibility_main_button_collapse", comment: "")
mainButton.accessibilityLabel = "Collapse attachment options"
let expandedButtonSize = InputViewButton.expandedSize
let spacing: CGFloat = 4
cameraButtonContainerBottomConstraint.constant = -1 * (expandedButtonSize + spacing)
@ -125,7 +125,7 @@ final class ExpandingAttachmentsButton: UIView, InputViewButtonDelegate {
self.layoutIfNeeded()
}
} else {
mainButton.accessibilityLabel = NSLocalizedString("accessibility_expanding_attachments_button", comment: "")
mainButton.accessibilityLabel = "Add attachment"
[ gifButtonContainerBottomConstraint, documentButtonContainerBottomConstraint, libraryButtonContainerBottomConstraint, cameraButtonContainerBottomConstraint ].forEach {
$0.constant = 0
}

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

@ -15,7 +15,7 @@ public final class InputTextView: UITextView, UITextViewDelegate {
private lazy var placeholderLabel: UILabel = {
let result = UILabel()
result.font = .systemFont(ofSize: Values.mediumFontSize)
result.text = "vc_conversation_input_prompt".localized()
result.text = "message".localized()
result.themeTextColor = .textSecondary
return result
@ -37,7 +37,7 @@ public final class InputTextView: UITextView, UITextViewDelegate {
setUpViewHierarchy()
self.delegate = self
self.isAccessibilityElement = true
self.accessibilityLabel = "vc_conversation_input_prompt".localized()
self.accessibilityLabel = "Message"
}
public override init(frame: CGRect, textContainer: NSTextContainer?) {

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

@ -122,7 +122,7 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M
let adjustment = (InputViewButton.expandedSize - InputViewButton.size) / 2
let maxWidth = UIScreen.main.bounds.width - 2 * InputViewButton.expandedSize - 2 * Values.smallSpacing - 2 * (Values.mediumSpacing - adjustment)
let result = InputTextView(delegate: self, maxWidth: maxWidth)
result.accessibilityLabel = "Message input box"
result.accessibilityLabel = "contentDescriptionMessageComposition".localized()
result.accessibilityIdentifier = "Message input box"
result.isAccessibilityElement = true

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

@ -80,7 +80,7 @@ final class VoiceMessageRecordingView: UIView {
private lazy var slideToCancelLabel: UILabel = {
let result: UILabel = UILabel()
result.font = .systemFont(ofSize: Values.smallFontSize)
result.text = "vc_conversation_voice_message_cancel_message".localized()
result.text = "messageVoiceSlideToCancel".localized()
result.themeTextColor = .textPrimary
result.alpha = Values.mediumOpacity
@ -122,7 +122,7 @@ final class VoiceMessageRecordingView: UIView {
let result: UILabel = UILabel()
result.font = .systemFont(ofSize: Values.smallFontSize)
result.themeTextColor = .textPrimary
result.text = "0:00"
result.text = "0:00" // stringlint:disable
return result
}()

4
Session/Conversations/Message Cells/Content Views/DeletedMessageView.swift
Unescape Escape View File

@ -44,7 +44,9 @@ final class DeletedMessageView: UIView {
// Body label
let titleLabel = UILabel()
titleLabel.font = .systemFont(ofSize: Values.smallFontSize)
titleLabel.text = "message_deleted".localized()
titleLabel.text = "deleteMessageDeleted"
.putNumber(1)
.localized()
titleLabel.themeTextColor = textColor
titleLabel.lineBreakMode = .byTruncatingTail

8
Session/Conversations/Message Cells/Content Views/MediaAlbumView.swift
Unescape Escape View File

@ -122,11 +122,9 @@ public class MediaAlbumView: UIStackView {
tintView.pin(to: self)
let moreCount = max(1, items.count - MediaAlbumView.kMaxItems)
let moreText = String(
// Format for the 'more items' indicator for media galleries. Embeds {{the number of additional items}}.
format: "MEDIA_GALLERY_MORE_ITEMS_FORMAT".localized(),
"\(moreCount)"
)
let moreText = "andMore"
.put(key: "count", value: moreCount)
.localized()
let moreLabel: UILabel = UILabel()
moreLabel.font = .systemFont(ofSize: 24)
moreLabel.text = moreText

12
Session/Conversations/Message Cells/Content Views/MediaPlaceholderView.swift
Unescape Escape View File

@ -34,13 +34,13 @@ final class MediaPlaceholderView: UIView {
cellViewModel.variant == .standardIncoming,
let attachment: Attachment = cellViewModel.attachments?.first
else {
return ("actionsheet_document_black", "file") // Should never occur
return ("actionsheet_document_black", "file".localized().lowercased()) // Should never occur
}
if attachment.isAudio { return ("attachment_audio", "audio") }
if attachment.isImage || attachment.isVideo { return ("actionsheet_camera_roll_black", "media") }
if attachment.isAudio { return ("attachment_audio", "audio".localized().lowercased()) }
if attachment.isImage || attachment.isVideo { return ("actionsheet_camera_roll_black", "media".localized().lowercased()) }
return ("actionsheet_document_black", "file")
return ("actionsheet_document_black", "file".localized().lowercased())
}()
// Image view
@ -62,7 +62,9 @@ final class MediaPlaceholderView: UIView {
// Body label
let titleLabel = UILabel()
titleLabel.font = .systemFont(ofSize: Values.mediumFontSize)
titleLabel.text = "Tap to download \(attachmentDescription)"
titleLabel.text = "attachmentsTapToDownload"
.put(key: "file_type", value: attachmentDescription)
.localized()
titleLabel.themeTextColor = textColor
titleLabel.lineBreakMode = .byTruncatingTail

6
Session/Conversations/Message Cells/Content Views/OpenGroupInvitationView.swift
Unescape Escape View File

@ -40,7 +40,7 @@ final class OpenGroupInvitationView: UIView {
// Subtitle
let subtitleLabel = UILabel()
subtitleLabel.font = .systemFont(ofSize: Values.smallFontSize)
subtitleLabel.text = "view_open_group_invitation_description".localized()
subtitleLabel.text = "communityInvitation".localized()
subtitleLabel.themeTextColor = textColor
subtitleLabel.lineBreakMode = .byTruncatingTail
@ -48,7 +48,7 @@ final class OpenGroupInvitationView: UIView {
let urlLabel = UILabel()
urlLabel.font = .systemFont(ofSize: Values.verySmallFontSize)
urlLabel.text = {
if let range = rawUrl.range(of: "?public_key=") {
if let range = rawUrl.range(of: "?public_key=") { // stringlint:disable
return String(rawUrl[..<range.lowerBound])
}
@ -64,7 +64,7 @@ final class OpenGroupInvitationView: UIView {
// Icon
let iconSize = OpenGroupInvitationView.iconSize
let iconName = (isOutgoing ? "Globe" : "Plus")
let iconName = (isOutgoing ? "Globe" : "Plus") // stringlint:disable
let iconImageViewSize = OpenGroupInvitationView.iconImageViewSize
let iconImageView = UIImageView(
image: UIImage(named: iconName)?

6
Session/Conversations/Message Cells/Content Views/QuoteView.swift
Unescape Escape View File

@ -101,7 +101,7 @@ final class QuoteView: UIView {
if let attachment: Attachment = attachment {
let isAudio: Bool = MimeTypeUtil.isAudio(attachment.contentType)
let fallbackImageName: String = (isAudio ? "attachment_audio" : "actionsheet_document_black")
let fallbackImageName: String = (isAudio ? "attachment_audio" : "actionsheet_document_black") // stringlint:disable
let imageView: UIImageView = UIImageView(
image: UIImage(named: fallbackImageName)?
.resized(to: CGSize(width: iconSize, height: iconSize))?
@ -213,7 +213,7 @@ final class QuoteView: UIView {
NSAttributedString(string: $0.shortDescription, attributes: [ .foregroundColor: textColor ])
}
)
.defaulting(to: NSAttributedString(string: "QUOTED_MESSAGE_NOT_FOUND".localized(), attributes: [ .foregroundColor: textColor ]))
.defaulting(to: NSAttributedString(string: "messageErrorOriginal".localized(), attributes: [ .foregroundColor: textColor ]))
}
// Label stack view
@ -229,7 +229,7 @@ final class QuoteView: UIView {
let authorLabel = UILabel()
authorLabel.font = .boldSystemFont(ofSize: Values.smallFontSize)
authorLabel.text = {
guard !isCurrentUser else { return "MEDIA_GALLERY_SENDER_NAME_YOU".localized() }
guard !isCurrentUser else { return "you".localized() }
guard body != nil else {
// When we can't find the quoted message we want to hide the author label
return Profile.displayNameNoFallback(

2
Session/Conversations/Message Cells/Content Views/ReactionContainerView.swift
Unescape Escape View File

@ -68,7 +68,7 @@ final class ReactionContainerView: UIView {
textLabel.setContentCompressionResistancePriority(.required, for: .vertical)
textLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
textLabel.font = .systemFont(ofSize: Values.verySmallFontSize)
textLabel.text = "EMOJI_REACTS_SHOW_LESS".localized()
textLabel.text = "showLess".localized()
textLabel.themeTextColor = .textPrimary
let result: UIView = UIView()

2
Session/Conversations/Message Cells/Content Views/ReactionView.swift
Unescape Escape View File

@ -88,7 +88,7 @@ final class ReactionButton: UIView {
emojiLabel.text = viewModel.emoji.rawValue
numberLabel.text = (viewModel.number < 1000 ?
"\(viewModel.number)" :
String(format: "%.1f", Float(viewModel.number) / 1000) + "k"
String(format: "%.1f", Float(viewModel.number) / 1000) + "k" // stringlint:disable
)
numberLabel.isHidden = (!showNumber && viewModel.number <= 1)

6
Session/Conversations/Message Cells/Content Views/SwiftUI/LinkPreviewView_SwiftUI.swift
Unescape Escape View File

@ -39,11 +39,7 @@ public struct LinkPreviewView_SwiftUI: View {
alignment: .leading
) {
if state is LinkPreview.SentState {
if #available(iOS 14.0, *) {
ThemeManager.currentTheme.colorSwiftUI(for: .messageBubble_overlay).ignoresSafeArea()
} else {
ThemeManager.currentTheme.colorSwiftUI(for: .messageBubble_overlay)
}
ThemeManager.currentTheme.colorSwiftUI(for: .messageBubble_overlay).ignoresSafeArea()
}
HStack(

5
Session/Conversations/Message Cells/Content Views/SwiftUI/OpenGroupInvitationView_SwiftUI.swift
Unescape Escape View File

@ -3,6 +3,7 @@
import SwiftUI
import SessionUIKit
import SessionMessagingKit
import SessionUtilitiesKit
struct OpenGroupInvitationView_SwiftUI: View {
private let name: String
@ -68,7 +69,7 @@ struct OpenGroupInvitationView_SwiftUI: View {
.font(.system(size: Values.largeFontSize))
.foregroundColor(themeColor: textColor)
Text("view_open_group_invitation_description".localized())
Text("communityInvitation".localized())
.font(.system(size: Values.smallFontSize))
.foregroundColor(themeColor: textColor)
.padding(.bottom, 2)
@ -86,7 +87,7 @@ struct OpenGroupInvitationView_SwiftUI: View {
struct OpenGroupInvitationView_SwiftUI_Previews: PreviewProvider {
static var previews: some View {
OpenGroupInvitationView_SwiftUI(
name: "Session",
name: Constants.app_name,
url: "http://open.getsession.org/session?public_key=a03c383cf63c3c4efe67acc52112a6dd734b3a946b9545f488aaa93da7991238",
textColor: .messageBubble_outgoingText,
isOutgoing: true

10
Session/Conversations/Message Cells/Content Views/SwiftUI/QuoteView_SwiftUI.swift
Unescape Escape View File

@ -54,7 +54,7 @@ struct QuoteView_SwiftUI: View {
return nil
}
private var author: String? {
guard !isCurrentUser else { return "MEDIA_GALLERY_SENDER_NAME_YOU".localized() }
guard !isCurrentUser else { return "you".localized() }
guard quotedText != nil else {
// When we can't find the quoted message we want to hide the author label
return Profile.displayNameNoFallback(
@ -180,7 +180,7 @@ struct QuoteView_SwiftUI: View {
)
.lineLimit(2)
} else {
Text("QUOTED_MESSAGE_NOT_FOUND".localized())
Text("messageErrorOriginal".localized())
.font(.system(size: Values.smallFontSize))
.foregroundColor(themeColor: targetThemeColor)
}
@ -214,11 +214,7 @@ struct QuoteView_SwiftUI: View {
struct QuoteView_SwiftUI_Previews: PreviewProvider {
static var previews: some View {
ZStack {
if #available(iOS 14.0, *) {
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea()
} else {
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary)
}
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea()
QuoteView_SwiftUI(
info: QuoteView_SwiftUI.Info(

4
Session/Conversations/Message Cells/Content Views/TypingIndicatorView.swift
Unescape Escape View File

@ -199,8 +199,8 @@ import SessionUtilitiesKit
let groupAnimation = CAAnimationGroup()
groupAnimation.animations = [
makeAnimation("fillColor", colorValues),
makeAnimation("path", pathValues)
makeAnimation("fillColor", colorValues), // stringlint:disable
makeAnimation("path", pathValues) // stringlint:disable
]
groupAnimation.duration = animationDuration
groupAnimation.repeatCount = MAXFLOAT

4
Session/Conversations/Message Cells/Content Views/VoiceMessageView.swift
Unescape Escape View File

@ -77,7 +77,7 @@ public final class VoiceMessageView: UIView {
private lazy var countdownLabel: UILabel = {
let result: UILabel = UILabel()
result.font = .systemFont(ofSize: Values.smallFontSize)
result.text = "0:00"
result.text = "0:00" // stringlint:disable
result.themeTextColor = .textPrimary
return result
@ -86,7 +86,7 @@ public final class VoiceMessageView: UIView {
private lazy var speedUpLabel: UILabel = {
let result: UILabel = UILabel()
result.font = .systemFont(ofSize: Values.smallFontSize)
result.text = "1.5x"
result.text = "1.5x" // stringlint:disable
result.themeTextColor = .textPrimary
result.textAlignment = .center
result.alpha = 0

38
Session/Conversations/Message Cells/InfoMessageCell.swift
Unescape Escape View File

@ -120,39 +120,11 @@ final class InfoMessageCell: MessageCell {
iconImageView.themeTintColor = .textSecondary
}
if cellViewModel.variant == .infoDisappearingMessagesUpdate, let body: String = cellViewModel.body {
self.label.attributedText = NSAttributedString(string: body)
.adding(
attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize) ],
range: (body as NSString).range(of: cellViewModel.authorName)
)
.adding(
attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize) ],
range: (body as NSString).range(of: "vc_path_device_row_title".localized())
)
.adding(
attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize) ],
range: (body as NSString).range(of: floor(cellViewModel.expiresInSeconds ?? 0).formatted(format: .long))
)
.adding(
attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize) ],
range: (body as NSString).range(of: "DISAPPEARING_MESSAGE_STATE_READ".localized())
)
.adding(
attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize) ],
range: (body as NSString).range(of: "DISAPPEARING_MESSAGE_STATE_SENT".localized())
)
.adding(
attributes: [ .font: UIFont.boldSystemFont(ofSize: Values.verySmallFontSize) ],
range: (body as NSString).range(of: "DISAPPEARING_MESSAGES_OFF".localized().lowercased())
)
if cellViewModel.canDoFollowingSetting() {
self.actionLabel.isHidden = false
self.actionLabel.text = "FOLLOW_SETTING_TITLE".localized()
}
} else {
self.label.text = cellViewModel.body
self.label.attributedText = cellViewModel.body?.formatted(in: self.label)
if cellViewModel.canDoFollowingSetting() {
self.actionLabel.isHidden = false
self.actionLabel.text = "disappearingMessagesFollowSetting".localized()
}
self.label.themeTextColor = (cellViewModel.variant == .infoClosedGroupCurrentUserErrorLeaving) ? .danger : .textSecondary

2
Session/Conversations/Message Cells/UnreadMarkerCell.swift
Unescape Escape View File

@ -22,7 +22,7 @@ final class UnreadMarkerCell: MessageCell {
private lazy var titleLabel: UILabel = {
let result = UILabel()
result.font = .boldSystemFont(ofSize: Values.verySmallFontSize)
result.text = "UNREAD_MESSAGES".localized()
result.text = "messageUnread".localized()
result.themeTextColor = .unreadMarker
result.textAlignment = .center

4
Session/Conversations/Message Cells/VisibleMessageCell.swift
Unescape Escape View File

@ -395,7 +395,8 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
// Message status image view
let (image, statusText, tintColor) = cellViewModel.state.statusIconInfo(
variant: cellViewModel.variant,
hasAtLeastOneReadReceipt: cellViewModel.hasAtLeastOneReadReceipt
hasAtLeastOneReadReceipt: cellViewModel.hasAtLeastOneReadReceipt,
hasAttachments: (cellViewModel.attachments?.isEmpty == false)
)
messageStatusLabel.text = statusText
messageStatusLabel.themeTextColor = tintColor
@ -625,6 +626,7 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
albumView.set(.width, to: size.width)
albumView.set(.height, to: size.height)
albumView.loadMedia()
albumView.accessibilityLabel = "contentDescriptionMediaMessage".localized()
snContentView.addArrangedSubview(albumView)
unloadContent = { albumView.unloadMedia() }

39
Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift
Unescape Escape View File

@ -63,11 +63,11 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
var title: String? {
switch self {
case .type: return "DISAPPERING_MESSAGES_TYPE_TITLE".localized()
case .type: return "disappearingMessagesDeleteType".localized()
// We need to keep these although the titles of them are the same
// because we need them to trigger timer section to refresh when
// the user selects different disappearing messages type
case .timerLegacy, .timerDisappearAfterSend, .timerDisappearAfterRead: return "DISAPPERING_MESSAGES_TIMER_TITLE".localized()
case .timerLegacy, .timerDisappearAfterSend, .timerDisappearAfterRead: return "disappearingMessagesTimer".localized()
case .noteToSelf: return nil
case .group: return nil
}
@ -77,7 +77,8 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
var footer: String? {
switch self {
case .group: return "DISAPPERING_MESSAGES_GROUP_WARNING_ADMIN_ONLY".localized()
case .group:
return "\("disappearingMessagesDescription".localized())\n\("disappearingMessagesOnlyAdmins".localized())"
default: return nil
}
}
@ -85,24 +86,24 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
// MARK: - Content
let title: String = "DISAPPEARING_MESSAGES".localized()
let title: String = "disappearingMessages".localized()
lazy var subtitle: String? = {
switch (threadVariant, isNoteToSelf) {
case (.contact, false): return "DISAPPERING_MESSAGES_SUBTITLE_CONTACTS".localized()
case (.group, _): return "DISAPPERING_MESSAGES_SUBTITLE_GROUPS".localized()
case (.contact, false): return "disappearingMessagesDescription1".localized()
case (.group, _), (.legacyGroup, _): return "disappearingMessagesDisappearAfterSendDescription".localized()
case (.community, _): return nil
case (.legacyGroup, _), (_, true): return "DISAPPERING_MESSAGES_SUBTITLE_GROUPS".localized()
case (_, true): return "disappearingMessagesDescription".localized()
}
}()
lazy var footerButtonInfo: AnyPublisher<SessionButton.Info?, Never> = shouldShowConfirmButton
.removeDuplicates()
.map { [weak self] shouldShowConfirmButton in
.map { [weak self] shouldShowConfirmButton -> SessionButton.Info? in
guard shouldShowConfirmButton else { return nil }
return SessionButton.Info(
style: .bordered,
title: "DISAPPERING_MESSAGES_SAVE_TITLE".localized(),
title: "set".localized(),
isEnabled: true,
accessibility: Accessibility(
identifier: "Set button",
@ -127,8 +128,8 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
model: .type,
elements: [
SessionCell.Info(
id: "DISAPPEARING_MESSAGES_OFF".localized(),
title: "DISAPPEARING_MESSAGES_OFF".localized(),
id: "off".localized(),
title: "off".localized(),
rightAccessory: .radio(
isSelected: { (self?.currentSelection.value.isEnabled == false) },
accessibility: Accessibility(
@ -150,9 +151,9 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
}
),
SessionCell.Info(
id: "DISAPPERING_MESSAGES_TYPE_AFTER_READ_TITLE".localized(),
title: "DISAPPERING_MESSAGES_TYPE_AFTER_READ_TITLE".localized(),
subtitle: "DISAPPERING_MESSAGES_TYPE_AFTER_READ_DESCRIPTION".localized(),
id: "disappearingMessagesDisappearAfterRead".localized(),
title: "disappearingMessagesDisappearAfterRead".localized(),
subtitle: "disappearingMessagesDisappearAfterReadDescription".localized(),
rightAccessory: .radio(
isSelected: {
(self?.currentSelection.value.isEnabled == true) &&
@ -183,9 +184,9 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
}
),
SessionCell.Info(
id: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_TITLE".localized(),
title: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_TITLE".localized(),
subtitle: "DISAPPERING_MESSAGES_TYPE_AFTER_SEND_DESCRIPTION".localized(),
id: "disappearingMessagesDisappearAfterSend".localized(),
title: "disappearingMessagesDisappearAfterSend".localized(),
subtitle: "disappearingMessagesDisappearAfterSendDescription".localized(),
rightAccessory: .radio(
isSelected: {
(self?.currentSelection.value.isEnabled == true) &&
@ -261,8 +262,8 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga
model: (isNoteToSelf ? .noteToSelf : .group),
elements: [
SessionCell.Info(
id: "DISAPPEARING_MESSAGES_OFF".localized(),
title: "DISAPPEARING_MESSAGES_OFF".localized(),
id: "off".localized(),
title: "off".localized(),
rightAccessory: .radio(
isSelected: { (self?.currentSelection.value.isEnabled == false) },
accessibility: Accessibility(

153
Session/Conversations/Settings/ThreadSettingsViewModel.swift
Unescape Escape View File

@ -186,8 +186,8 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
var title: String {
switch threadVariant {
case .contact: return "vc_settings_title".localized()
case .legacyGroup, .group, .community: return "vc_group_settings_title".localized()
case .contact: return "sessionSettings".localized()
case .legacyGroup, .group, .community: return "deleteAfterGroupPR1GroupSettings".localized()
}
}
@ -279,7 +279,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
threadViewModel.displayName,
font: .titleLarge,
alignment: .center,
editingPlaceholder: "CONTACT_NICKNAME_PLACEHOLDER".localized(),
editingPlaceholder: "nicknameEnter".localized(),
interaction: (threadViewModel.threadVariant == .contact ? .editable : .none)
),
styling: SessionCell.StyleInfo(
@ -343,7 +343,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
.withRenderingMode(.alwaysTemplate)
),
title: (threadViewModel.threadVariant == .community ?
"COPY_GROUP_URL".localized() :
"communityUrlCopy".localized() :
"accountIDCopy".localized()
),
accessibility: Accessibility(
@ -381,7 +381,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
UIImage(named: "actionsheet_camera_roll_black")?
.withRenderingMode(.alwaysTemplate)
),
title: MediaStrings.allMedia,
title: "conversationsSettingsAllMedia".localized(),
accessibility: Accessibility(
identifier: "\(ThreadSettingsViewModel.self).all_media",
label: "All media"
@ -403,7 +403,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
UIImage(named: "conversation_settings_search")?
.withRenderingMode(.alwaysTemplate)
),
title: "CONVERSATION_SETTINGS_SEARCH".localized(),
title: "searchConversation".localized(),
accessibility: Accessibility(
identifier: "\(ThreadSettingsViewModel.self).search",
label: "Search"
@ -420,14 +420,14 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
UIImage(named: "ic_plus_24")?
.withRenderingMode(.alwaysTemplate)
),
title: "vc_conversation_settings_invite_button_title".localized(),
title: "membersInvite".localized(),
accessibility: Accessibility(
identifier: "\(ThreadSettingsViewModel.self).add_to_open_group"
),
onTap: { [weak self] in
self?.transitionToScreen(
UserSelectionVC(
with: "vc_conversation_settings_invite_button_title".localized(),
with: "membersInvite".localized(),
excluding: Set()
) { [weak self] selectedUsers in
self?.addUsersToOpenGoup(
@ -447,19 +447,16 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
UIImage(systemName: "timer")?
.withRenderingMode(.alwaysTemplate)
),
title: "DISAPPEARING_MESSAGES".localized(),
title: "disappearingMessages".localized(),
subtitle: {
guard current.disappearingMessagesConfig.isEnabled else {
return "DISAPPEARING_MESSAGES_SUBTITLE_OFF".localized()
return "off".localized()
}
return String(
format: (current.disappearingMessagesConfig.type == .disappearAfterRead ?
"DISAPPEARING_MESSAGES_SUBTITLE_DISAPPEAR_AFTER_READ".localized() :
"DISAPPEARING_MESSAGES_SUBTITLE_DISAPPEAR_AFTER_SEND".localized()
),
current.disappearingMessagesConfig.durationString
)
return (current.disappearingMessagesConfig.type ?? .unknown)
.localizedState(
durationString: current.disappearingMessagesConfig.durationString
)
}(),
accessibility: Accessibility(
identifier: "Disappearing messages",
@ -488,7 +485,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
UIImage(named: "table_ic_group_edit")?
.withRenderingMode(.alwaysTemplate)
),
title: "EDIT_GROUP_ACTION".localized(),
title: "groupEdit".localized(),
accessibility: Accessibility(
identifier: "Edit group",
label: "Edit group"
@ -511,32 +508,19 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
UIImage(named: "table_ic_group_leave")?
.withRenderingMode(.alwaysTemplate)
),
title: "LEAVE_GROUP_ACTION".localized(),
title: "groupLeave".localized(),
accessibility: Accessibility(
identifier: "Leave group",
label: "Leave group"
),
confirmationInfo: ConfirmationModal.Info(
title: "leave_group_confirmation_alert_title".localized(),
body: .attributedText({
if currentUserIsClosedGroupAdmin {
return NSAttributedString(string: "admin_group_leave_warning".localized())
}
let mutableAttributedString = NSMutableAttributedString(
string: String(
format: "leave_community_confirmation_alert_message".localized(),
threadViewModel.displayName
)
)
mutableAttributedString.addAttribute(
.font,
value: UIFont.boldSystemFont(ofSize: Values.smallFontSize),
range: (mutableAttributedString.string as NSString).range(of: threadViewModel.displayName)
)
return mutableAttributedString
}()),
confirmTitle: "LEAVE_BUTTON_TITLE".localized(),
title: "groupLeave".localized(),
body: .attributedText(
(currentUserIsClosedGroupAdmin ? "groupDeleteDescription" : "groupLeaveDescription")
.put(key: "group_name", value: threadViewModel.displayName)
.localizedFormatted(baseFont: .boldSystemFont(ofSize: Values.smallFontSize))
),
confirmTitle: "leave".localized(),
confirmStyle: .danger,
cancelStyle: .alert_text
),
@ -561,7 +545,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
UIImage(named: "table_ic_notification_sound")?
.withRenderingMode(.alwaysTemplate)
),
title: "SETTINGS_ITEM_NOTIFICATION_SOUND".localized(),
title: "deleteAfterGroupPR1MessageSound".localized(),
rightAccessory: .dropDown(
.dynamicString { current.notificationSound.displayName }
),
@ -582,14 +566,16 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
UIImage(named: "NotifyMentions")?
.withRenderingMode(.alwaysTemplate)
),
title: "vc_conversation_settings_notify_for_mentions_only_title".localized(),
subtitle: "vc_conversation_settings_notify_for_mentions_only_explanation".localized(),
title: "deleteAfterGroupPR1MentionsOnly".localized(),
subtitle: "deleteAfterGroupPR1MentionsOnlyDescription".localized(),
rightAccessory: .toggle(
.boolValue(
threadViewModel.threadOnlyNotifyForMentions == true,
oldValue: ((previous?.threadViewModel ?? threadViewModel).threadOnlyNotifyForMentions == true)
),
accessibility: Accessibility(identifier: "Notify for Mentions Only - Switch")
accessibility: Accessibility(
identifier: "Notify for Mentions Only - Switch"
)
),
isEnabled: (
(
@ -625,13 +611,15 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
UIImage(named: "Mute")?
.withRenderingMode(.alwaysTemplate)
),
title: "CONVERSATION_SETTINGS_MUTE_LABEL".localized(),
title: "notificationsMute".localized(),
rightAccessory: .toggle(
.boolValue(
threadViewModel.threadMutedUntilTimestamp != nil,
oldValue: ((previous?.threadViewModel ?? threadViewModel).threadMutedUntilTimestamp != nil)
),
accessibility: Accessibility(identifier: "Mute - Switch")
accessibility: Accessibility(
identifier: "Mute - Switch"
)
),
isEnabled: (
(
@ -675,13 +663,15 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
UIImage(named: "table_ic_block")?
.withRenderingMode(.alwaysTemplate)
),
title: "CONVERSATION_SETTINGS_BLOCK_THIS_USER".localized(),
title: "deleteAfterGroupPR1BlockThisUser".localized(),
rightAccessory: .toggle(
.boolValue(
threadViewModel.threadIsBlocked == true,
oldValue: ((previous?.threadViewModel ?? threadViewModel).threadIsBlocked == true)
),
accessibility: Accessibility(identifier: "Block This User - Switch")
accessibility: Accessibility(
identifier: "Block This User - Switch"
)
),
accessibility: Accessibility(
identifier: "\(ThreadSettingsViewModel.self).block",
@ -691,22 +681,31 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
title: {
guard threadViewModel.threadIsBlocked == true else {
return String(
format: "BLOCK_LIST_BLOCK_USER_TITLE_FORMAT".localized(),
format: "block".localized(),
threadViewModel.displayName
)
}
return String(
format: "BLOCK_LIST_UNBLOCK_TITLE_FORMAT".localized(),
format: "blockUnblock".localized(),
threadViewModel.displayName
)
}(),
body: (threadViewModel.threadIsBlocked == true ? .none :
.text("BLOCK_USER_BEHAVIOR_EXPLANATION".localized())
body: (threadViewModel.threadIsBlocked == true ?
.attributedText(
"blockUnblockName"
.put(key: "name", value: threadViewModel.displayName)
.localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize))
) :
.attributedText(
"blockDescription"
.put(key: "name", value: threadViewModel.displayName)
.localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize))
)
),
confirmTitle: (threadViewModel.threadIsBlocked == true ?
"BLOCK_LIST_UNBLOCK_BUTTON".localized() :
"BLOCK_LIST_BLOCK_BUTTON".localized()
"blockUnblock".localized() :
"block".localized()
),
confirmAccessibility: Accessibility(identifier: "Confirm block"),
confirmStyle: .danger,
@ -827,45 +826,13 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
) {
guard oldBlockedState != isBlocked else { return }
dependencies.storage.writeAsync(
updates: { db in
try Contact
.filter(id: threadId)
.updateAllAndConfig(
db,
Contact.Columns.isBlocked.set(to: isBlocked)
)
},
completion: { [weak self] db, _ in
DispatchQueue.main.async {
let modal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: (oldBlockedState == false ?
"BLOCK_LIST_VIEW_BLOCKED_ALERT_TITLE".localized() :
String(
format: "BLOCK_LIST_VIEW_UNBLOCKED_ALERT_TITLE_FORMAT".localized(),
displayName
)
),
body: (oldBlockedState == true ? .none : .text(
String(
format: "BLOCK_LIST_VIEW_BLOCKED_ALERT_MESSAGE_FORMAT".localized(),
displayName
)
)),
accessibility: Accessibility(
identifier: "Test_name",
label: (oldBlockedState == false ? "User blocked" : "Confirm unblock")
),
cancelTitle: "BUTTON_OK".localized(),
cancelAccessibility: Accessibility(identifier: "OK_BUTTON"),
cancelStyle: .alert_text
)
)
self?.transitionToScreen(modal, transitionType: .present)
}
}
)
dependencies.storage.writeAsync { db in
try Contact
.filter(id: threadId)
.updateAllAndConfig(
db,
Contact.Columns.isBlocked.set(to: isBlocked)
)
}
}
}

29
Session/Conversations/Views & Modals/ConversationTitleView.swift
Unescape Escape View File

@ -157,7 +157,7 @@ final class ConversationTitleView: UIView {
.foregroundColor: textPrimary
]
)
.appending(string: "Muted")
.appending(string: "notificationsMuted".localized())
labelInfos.append(
SessionLabelCarouselView.LabelInfo(
@ -179,7 +179,7 @@ final class ConversationTitleView: UIView {
let notificationSettingsLabelString = NSAttributedString(attachment: imageAttachment)
.appending(string: " ")
.appending(string: "view_conversation_title_notify_for_mentions_only".localized())
.appending(string: "notificationsMentionsOnly".localized())
labelInfos.append(
SessionLabelCarouselView.LabelInfo(
@ -197,9 +197,9 @@ final class ConversationTitleView: UIView {
case .legacyGroup, .group:
labelInfos.append(
SessionLabelCarouselView.LabelInfo(
attributedText: NSAttributedString(
string: "\(userCount) member\(userCount == 1 ? "" : "s")"
),
attributedText: "members"
.putNumber(userCount)
.localizedFormatted(baseFont: .systemFont(ofSize: Values.miniFontSize)),
accessibility: nil, // TODO: Add accessibility
type: .userCount
)
@ -208,9 +208,9 @@ final class ConversationTitleView: UIView {
case .community:
labelInfos.append(
SessionLabelCarouselView.LabelInfo(
attributedText: NSAttributedString(
string: "\(userCount) active member\(userCount == 1 ? "" : "s")"
),
attributedText: "membersActive"
.putNumber(userCount)
.localizedFormatted(baseFont: .systemFont(ofSize: Values.miniFontSize)),
accessibility: nil, // TODO: Add accessibility
type: .userCount
)
@ -232,13 +232,12 @@ final class ConversationTitleView: UIView {
SessionLabelCarouselView.LabelInfo(
attributedText: NSAttributedString(attachment: imageAttachment)
.appending(string: " ")
.appending(string: String(
format: (config.type == .disappearAfterRead ?
"DISAPPERING_MESSAGES_SUMMARY_READ".localized() :
"DISAPPERING_MESSAGES_SUMMARY_SEND".localized()
),
floor(config.durationSeconds).formatted(format: .short)
)),
.appending(
string: (config.type ?? .unknown)
.localizedState(
durationString: floor(config.durationSeconds).formatted(format: .short)
)
),
accessibility: Accessibility(
identifier: "Disappearing messages type and time",
label: "Disappearing messages type and time"

9
Session/Conversations/Views & Modals/MessageRequestFooterView.swift
Unescape Escape View File

@ -2,6 +2,7 @@
import UIKit
import SessionUIKit
import SessionUtilitiesKit
class MessageRequestFooterView: UIView {
private var onBlock: (() -> ())?
@ -61,7 +62,7 @@ class MessageRequestFooterView: UIView {
result.translatesAutoresizingMaskIntoConstraints = false
result.clipsToBounds = true
result.titleLabel?.font = UIFont.boldSystemFont(ofSize: 16)
result.setTitle("TXT_BLOCK_USER_TITLE".localized(), for: .normal)
result.setTitle("deleteAfterGroupPR1BlockUser".localized(), for: .normal)
result.setThemeTitleColor(.danger, for: .normal)
result.addTarget(self, action: #selector(block), for: .touchUpInside)
@ -73,7 +74,7 @@ class MessageRequestFooterView: UIView {
result.accessibilityLabel = "Accept message request"
result.isAccessibilityElement = true
result.translatesAutoresizingMaskIntoConstraints = false
result.setTitle("TXT_DELETE_ACCEPT".localized(), for: .normal)
result.setTitle("accept".localized(), for: .normal)
result.addTarget(self, action: #selector(accept), for: .touchUpInside)
return result
@ -84,7 +85,7 @@ class MessageRequestFooterView: UIView {
result.accessibilityLabel = "Delete message request"
result.isAccessibilityElement = true
result.translatesAutoresizingMaskIntoConstraints = false
result.setTitle("TXT_DELETE_TITLE".localized(), for: .normal)
result.setTitle("decline".localized(), for: .normal)
result.addTarget(self, action: #selector(decline), for: .touchUpInside)
return result
@ -161,7 +162,7 @@ class MessageRequestFooterView: UIView {
threadRequiresApproval
)
self.descriptionLabel.text = (threadRequiresApproval ?
"MESSAGE_REQUEST_PENDING_APPROVAL_INFO".localized() :
"messageRequestPendingDescription".localized() :
"messageRequestsAcceptDescription".localized()
)
self.actionStackView.isHidden = threadRequiresApproval

12
Session/Conversations/Views & Modals/ReactionListSheet.swift
Unescape Escape View File

@ -83,7 +83,7 @@ final class ReactionListSheet: BaseVC {
private lazy var clearAllButton: SessionButton = {
let result: SessionButton = SessionButton(style: .destructiveBorderless, size: .small)
result.translatesAutoresizingMaskIntoConstraints = false
result.setTitle("MESSAGE_REQUESTS_CLEAR_ALL".localized(), for: .normal)
result.setTitle("clearAll".localized(), for: .normal)
result.addTarget(self, action: #selector(clearAllTapped), for: .touchUpInside)
result.isHidden = true
@ -551,7 +551,7 @@ extension ReactionListSheet {
emojiLabel.text = emoji
numberLabel.text = (count < 1000 ?
"\(count)" :
String(format: "%.1fk", Float(count) / 1000)
String(format: "%.1fk", Float(count) / 1000) // stringlint:disable
)
snContentView.themeBorderColor = (isCurrentSelection ? .primary : .clear)
}
@ -591,10 +591,10 @@ extension ReactionListSheet {
}
func update(moreReactorCount: Int, emoji: String) {
label.text = (moreReactorCount == 1 ?
String(format: "EMOJI_REACTS_MORE_REACTORS_ONE".localized(), "\(emoji)") :
String(format: "EMOJI_REACTS_MORE_REACTORS_MUTIPLE".localized(), "\(moreReactorCount)" ,"\(emoji)")
)
label.text = "emojiReactsCountOthers"
.putNumber(moreReactorCount)
.put(key: "emoji", value: emoji)
.localized()
}
}
}

16
Session/Emoji/Emoji+Category.swift
Unescape Escape View File

@ -18,21 +18,21 @@ extension Emoji {
var localizedName: String {
switch self {
case .smileysAndPeople:
return NSLocalizedString("EMOJI_CATEGORY_SMILEYSANDPEOPLE_NAME", comment: "The name for the emoji category 'Smileys & People'")
return NSLocalizedString("emojiCategorySmileys", comment: "The name for the emoji category 'Smileys & People'")
case .animals:
return NSLocalizedString("EMOJI_CATEGORY_ANIMALS_NAME", comment: "The name for the emoji category 'Animals & Nature'")
return NSLocalizedString("emojiCategoryAnimals", comment: "The name for the emoji category 'Animals & Nature'")
case .food:
return NSLocalizedString("EMOJI_CATEGORY_FOOD_NAME", comment: "The name for the emoji category 'Food & Drink'")
return NSLocalizedString("emojiCategoryFood", comment: "The name for the emoji category 'Food & Drink'")
case .activities:
return NSLocalizedString("EMOJI_CATEGORY_ACTIVITIES_NAME", comment: "The name for the emoji category 'Activities'")
return NSLocalizedString("emojiCategoryActivities", comment: "The name for the emoji category 'Activities'")
case .travel:
return NSLocalizedString("EMOJI_CATEGORY_TRAVEL_NAME", comment: "The name for the emoji category 'Travel & Places'")
return NSLocalizedString("emojiCategoryTravel", comment: "The name for the emoji category 'Travel & Places'")
case .objects:
return NSLocalizedString("EMOJI_CATEGORY_OBJECTS_NAME", comment: "The name for the emoji category 'Objects'")
return NSLocalizedString("emojiCategoryObjects", comment: "The name for the emoji category 'Objects'")
case .symbols:
return NSLocalizedString("EMOJI_CATEGORY_SYMBOLS_NAME", comment: "The name for the emoji category 'Symbols'")
return NSLocalizedString("emojiCategorySymbols", comment: "The name for the emoji category 'Symbols'")
case .flags:
return NSLocalizedString("EMOJI_CATEGORY_FLAGS_NAME", comment: "The name for the emoji category 'Flags'")
return NSLocalizedString("emojiCategoryFlags", comment: "The name for the emoji category 'Flags'")
}
}

2
Session/Home/GlobalSearch/EmptySearchResultCell.swift
Unescape Escape View File

@ -8,7 +8,7 @@ import NVActivityIndicatorView
class EmptySearchResultCell: UITableViewCell {
private lazy var messageLabel: UILabel = {
let result = UILabel()
result.text = "CONVERSATION_SEARCH_NO_RESULTS".localized()
result.text = "searchMatchesNone".localized()
result.themeTextColor = .textPrimary
result.textAlignment = .center
result.numberOfLines = 3

6
Session/Home/GlobalSearch/GlobalSearchViewController.swift
Unescape Escape View File

@ -213,7 +213,7 @@ class GlobalSearchViewController: BaseVC, LibSessionRespondingViewController, UI
// See more https://developer.apple.com/documentation/uikit/uisearchbar/1624283-showscancelbutton?language=objc
if UIDevice.current.isIPad {
let ipadCancelButton = UIButton()
ipadCancelButton.setTitle("Cancel", for: .normal)
ipadCancelButton.setTitle("cancel".localized(), for: .normal)
ipadCancelButton.setThemeTitleColor(.textPrimary, for: .normal)
ipadCancelButton.addTarget(self, action: #selector(cancel), for: .touchUpInside)
searchBarContainer.addSubview(ipadCancelButton)
@ -462,13 +462,13 @@ extension GlobalSearchViewController {
case .messages:
guard !section.elements.isEmpty else { return UIView() }
titleLabel.font = .boldSystemFont(ofSize: Values.largeFontSize)
titleLabel.text = "SEARCH_SECTION_MESSAGES".localized()
titleLabel.text = "messages".localized()
break
case .groupedContacts(let title):
guard !section.elements.isEmpty else { return UIView() }
if title.isEmpty {
titleLabel.font = .boldSystemFont(ofSize: Values.largeFontSize)
titleLabel.text = "NEW_CONVERSATION_CONTACTS_SECTION_TITLE".localized()
titleLabel.text = "contactContacts".localized()
} else {
titleLabel.font = .systemFont(ofSize: Values.smallFontSize)
titleLabel.text = title

45
Session/Home/HomeVC.swift
Unescape Escape View File

@ -51,12 +51,12 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS
private lazy var seedReminderView: SeedReminderView = {
let result = SeedReminderView()
result.accessibilityLabel = "Recovery phrase reminder"
result.title = NSAttributedString(string: "onboarding_recovery_password_title".localized())
result.subtitle = "onboarding_recovery_password_subtitle".localized()
result.title = NSAttributedString(string: "recoveryPasswordBannerTitle".localized())
result.subtitle = "recoveryPasswordBannerDescription".localized()
result.setProgress(1, animated: false)
result.delegate = self
result.isHidden = !self.viewModel.state.showViewedSeedBanner
return result
}()
@ -64,7 +64,7 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS
let result: UILabel = UILabel()
result.translatesAutoresizingMaskIntoConstraints = false
result.font = .systemFont(ofSize: Values.smallFontSize)
result.text = "LOADING_CONVERSATIONS".localized()
result.text = "loading".localized()
result.themeTextColor = .textSecondary
result.textAlignment = .center
result.numberOfLines = 0
@ -92,11 +92,8 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS
result.register(view: FullConversationCell.self)
result.dataSource = self
result.delegate = self
if #available(iOS 15.0, *) {
result.sectionHeaderTopPadding = 0
}
result.sectionHeaderTopPadding = 0
return result
}()
@ -251,7 +248,10 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS
let welcomeLabel = UILabel()
welcomeLabel.font = .systemFont(ofSize: Values.smallFontSize)
welcomeLabel.text = "onboardingBubbleWelcomeToSession".localized()
welcomeLabel.text = "onboardingBubbleWelcomeToSession"
.put(key: "app_name", value: Constants.app_name)
.put(key: "emoji", value: "")
.localized()
welcomeLabel.themeTextColor = .sessionButton_text
welcomeLabel.textAlignment = .center
@ -750,7 +750,8 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS
indexPath: indexPath,
tableView: tableView,
threadViewModel: threadViewModel,
viewController: self
viewController: self,
navigatableStateHolder: viewModel
)
)
@ -771,7 +772,8 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS
indexPath: indexPath,
tableView: tableView,
threadViewModel: threadViewModel,
viewController: self
viewController: self,
navigatableStateHolder: viewModel
)
)
@ -800,7 +802,7 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS
}()
let destructiveAction: UIContextualAction.SwipeAction = {
switch (threadViewModel.threadVariant, threadViewModel.threadIsNoteToSelf, threadViewModel.currentUserIsClosedGroupMember) {
case (.contact, true, _): return .hide
case (.contact, true, _): return .clear
case (.legacyGroup, _, true), (.group, _, true), (.community, _, _): return .leave
default: return .delete
}
@ -817,7 +819,8 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS
indexPath: indexPath,
tableView: tableView,
threadViewModel: threadViewModel,
viewController: self
viewController: self,
navigatableStateHolder: viewModel
)
)
@ -835,9 +838,9 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS
} else {
let targetViewController: UIViewController = ConfirmationModal(
info: ConfirmationModal.Info(
title: "ALERT_ERROR_TITLE".localized(),
body: .text("LOAD_RECOVERY_PASSWORD_ERROR".localized()),
cancelTitle: "BUTTON_OK".localized(),
title: "theError".localized(),
body: .text("recoveryPasswordErrorLoad".localized()),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)
@ -897,7 +900,7 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS
rootView: StartConversationScreen(),
customizedNavigationBackground: .backgroundSecondary
)
viewController.setNavBarTitle("start_conversation_screen_title".localized())
viewController.setNavBarTitle("conversationsStart".localized())
viewController.setUpDismissingButton(on: .right)
let navigationController = StyledNavigationController(rootViewController: viewController)
@ -910,7 +913,11 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS
func createNewDMFromDeepLink(sessionId: String) {
let viewController: SessionHostingViewController = SessionHostingViewController(rootView: NewMessageScreen(accountId: sessionId))
viewController.setNavBarTitle("vc_create_private_chat_title".localized())
viewController.setNavBarTitle(
"messageNew"
.putNumber(1)
.localized()
)
let navigationController = StyledNavigationController(rootViewController: viewController)
if UIDevice.current.isIPad {
navigationController.modalPresentationStyle = .fullScreen

4
Session/Home/HomeViewModel.swift
Unescape Escape View File

@ -7,7 +7,9 @@ import SignalUtilitiesKit
import SessionMessagingKit
import SessionUtilitiesKit
public class HomeViewModel {
public class HomeViewModel: NavigatableStateHolder {
public let navigatableState: NavigatableState = NavigatableState()
public typealias SectionModel = ArraySection<Section, SessionThreadViewModel>
// MARK: - Section

16
Session/Home/Message Requests/MessageRequestsViewModel.swift
Unescape Escape View File

@ -132,9 +132,9 @@ class MessageRequestsViewModel: SessionTableViewModel, NavigatableStateHolder, O
// MARK: - Content
public let title: String = "MESSAGE_REQUESTS_TITLE".localized()
public let initialLoadMessage: String? = "LOADING_CONVERSATIONS".localized()
public let emptyStateTextPublisher: AnyPublisher<String?, Never> = Just("MESSAGE_REQUESTS_EMPTY_TEXT".localized())
public let title: String = "sessionMessageRequests".localized()
public let initialLoadMessage: String? = "loading".localized()
public let emptyStateTextPublisher: AnyPublisher<String?, Never> = Just("messageRequestsNonePending".localized())
.eraseToAnyPublisher()
public let cellType: SessionTableViewCellType = .fullConversation
public private(set) var pagedDataObserver: PagedDatabaseObserver<SessionThread, SessionThreadViewModel>?
@ -197,7 +197,7 @@ class MessageRequestsViewModel: SessionTableViewModel, NavigatableStateHolder, O
return SessionButton.Info(
style: .destructive,
title: "MESSAGE_REQUESTS_CLEAR_ALL".localized(),
title: "clearAll".localized(),
isEnabled: !threadInfo.isEmpty,
accessibility: Accessibility(
identifier: "Clear all"
@ -205,11 +205,12 @@ class MessageRequestsViewModel: SessionTableViewModel, NavigatableStateHolder, O
onTap: { [weak self] in
let modal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "MESSAGE_REQUESTS_CLEAR_ALL_CONFIRMATION_TITLE".localized(),
title: "clearAll".localized(),
body: .text("messageRequestsClearAllExplanation".localized()),
accessibility: Accessibility(
identifier: "Clear all"
),
confirmTitle: "MESSAGE_REQUESTS_CLEAR_ALL_CONFIRMATION_ACTON".localized(),
confirmTitle: "clear".localized(),
confirmAccessibility: Accessibility(
identifier: "Clear"
),
@ -275,7 +276,8 @@ class MessageRequestsViewModel: SessionTableViewModel, NavigatableStateHolder, O
indexPath: indexPath,
tableView: tableView,
threadViewModel: threadViewModel,
viewController: viewController
viewController: viewController,
navigatableStateHolder: nil
)
)

4
Session/Home/Message Requests/Views/MessageRequestsCell.swift
Unescape Escape View File

@ -5,8 +5,6 @@ import SessionUIKit
import SignalUtilitiesKit
class MessageRequestsCell: UITableViewCell {
static let reuseIdentifier = "MessageRequestsCell"
// MARK: - Initialization
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@ -49,7 +47,7 @@ class MessageRequestsCell: UITableViewCell {
result.setContentHuggingPriority(.defaultHigh, for: .horizontal)
result.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
result.font = .boldSystemFont(ofSize: Values.mediumFontSize)
result.text = "MESSAGE_REQUESTS_TITLE".localized()
result.text = "sessionMessageRequests".localized()
result.themeTextColor = .textPrimary
result.lineBreakMode = .byTruncatingTail

14
Session/Home/New Conversation/InviteAFriendScreen.swift
Unescape Escape View File

@ -44,11 +44,15 @@ struct InviteAFriendScreen: View {
.stroke(themeColor: .borderSeparator)
)
Text("invite_a_friend_explanation".localized())
.font(.system(size: Values.verySmallFontSize))
.multilineTextAlignment(.center)
.foregroundColor(themeColor: .textSecondary)
.padding(.horizontal, Values.smallSpacing)
Text(
"shareAccountIdDescription"
.put(key: "app_name", value: Constants.app_name)
.localized()
)
.font(.system(size: Values.verySmallFontSize))
.multilineTextAlignment(.center)
.foregroundColor(themeColor: .textSecondary)
.padding(.horizontal, Values.smallSpacing)
HStack(
alignment: .center,

19
Session/Home/New Conversation/NewMessageScreen.swift
Unescape Escape View File

@ -27,7 +27,7 @@ struct NewMessageScreen: View {
tabIndex: $tabIndex,
tabTitles: [
"accountIdEnter".localized(),
"vc_create_private_chat_scan_qr_code_tab_title".localized()
"qrScan".localized()
]
).frame(maxWidth: .infinity)
@ -97,7 +97,7 @@ struct NewMessageScreen: View {
let message: String = {
switch error {
case SnodeAPIError.onsNotFound:
return "new_message_screen_error_msg_unrecognized_ons".localized()
return "onsErrorNotRecognized".localized()
default:
return "onsErrorUnableToSearch".localized()
}
@ -148,17 +148,10 @@ struct EnterAccountIdScreen: View {
)
) {
ZStack {
if #available(iOS 14.0, *) {
Text("\("new_message_screen_enter_account_id_explanation".localized())\(Image(systemName: "questionmark.circle"))")
.font(.system(size: Values.verySmallFontSize))
.foregroundColor(themeColor: .textSecondary)
.multilineTextAlignment(.center)
} else {
Text("new_message_screen_enter_account_id_explanation".localized())
.font(.system(size: Values.verySmallFontSize))
.foregroundColor(themeColor: .textSecondary)
.multilineTextAlignment(.center)
}
Text("\("messageNewDescriptionMobile".localized())\(Image(systemName: "questionmark.circle"))")
.font(.system(size: Values.verySmallFontSize))
.foregroundColor(themeColor: .textSecondary)
.multilineTextAlignment(.center)
}
.accessibility(
Accessibility(

17
Session/Home/New Conversation/StartConversationScreen.swift
Unescape Escape View File

@ -19,12 +19,15 @@ struct StartConversationScreen: View {
alignment: .center,
spacing: 0
) {
let title: String = "messageNew"
.putNumber(1)
.localized()
NewConversationCell(
image: "Message",
title: "vc_create_private_chat_title".localized()
title: title
) {
let viewController: SessionHostingViewController = SessionHostingViewController(rootView: NewMessageScreen())
viewController.setNavBarTitle("vc_create_private_chat_title".localized())
viewController.setNavBarTitle(title)
viewController.setUpDismissingButton(on: .right)
self.host.controller?.navigationController?.pushViewController(viewController, animated: true)
}
@ -41,7 +44,7 @@ struct StartConversationScreen: View {
NewConversationCell(
image: "Group",
title: "vc_create_closed_group_title".localized()
title: "groupCreate".localized()
) {
let viewController = NewClosedGroupVC()
self.host.controller?.navigationController?.pushViewController(viewController, animated: true)
@ -59,7 +62,7 @@ struct StartConversationScreen: View {
NewConversationCell(
image: "Globe",
title: "vc_join_public_chat_title".localized()
title: "communityJoin".localized()
) {
let viewController = JoinOpenGroupVC()
self.host.controller?.navigationController?.pushViewController(viewController, animated: true)
@ -77,10 +80,10 @@ struct StartConversationScreen: View {
NewConversationCell(
image: "icon_invite",
title: "vc_settings_invite_a_friend_button_title".localized()
title: "sessionInviteAFriend".localized()
) {
let viewController: SessionHostingViewController = SessionHostingViewController(rootView: InviteAFriendScreen())
viewController.setNavBarTitle("vc_settings_invite_a_friend_button_title".localized())
viewController.setNavBarTitle("sessionInviteAFriend".localized())
viewController.setUpDismissingButton(on: .right)
self.host.controller?.navigationController?.pushViewController(viewController, animated: true)
}
@ -104,7 +107,7 @@ struct StartConversationScreen: View {
QRCodeView(
string: getUserHexEncodedPublicKey(),
hasBackground: false,
logo: "SessionWhite40",
logo: "SessionWhite40", // stringlint:disable
themeStyle: ThemeManager.currentTheme.interfaceStyle
)
.aspectRatio(1, contentMode: .fit)

8
Session/Media Viewing & Editing/AllMediaViewController.swift
Unescape Escape View File

@ -17,12 +17,12 @@ public class AllMediaViewController: UIViewController, UIPageViewControllerDataS
private lazy var tabBar: TabBar = {
let result: TabBar = TabBar(
tabs: [
TabBar.Tab(title: MediaStrings.media) { [weak self] in
TabBar.Tab(title: "media".localized()) { [weak self] in
guard let self = self else { return }
self.pageVC.setViewControllers([ self.pages[0] ], direction: .forward, animated: false, completion: nil)
self.updateSelectButton(updatedData: self.mediaTitleViewController.viewModel.galleryData, inBatchSelectMode: self.mediaTitleViewController.isInBatchSelectMode)
},
TabBar.Tab(title: MediaStrings.document) { [weak self] in
TabBar.Tab(title: "files".localized()) { [weak self] in
guard let self = self else { return }
self.pageVC.setViewControllers([ self.pages[1] ], direction: .forward, animated: false, completion: nil)
self.endSelectMode()
@ -69,7 +69,7 @@ public class AllMediaViewController: UIViewController, UIPageViewControllerDataS
ViewControllerUtilities.setUpDefaultSessionStyle(
for: self,
title: MediaStrings.allMedia,
title: "conversationsSettingsAllMedia".localized(),
hasCustomBackButton: false
)
@ -189,7 +189,7 @@ extension AllMediaViewController: MediaTileViewControllerDelegate {
}
else {
self.navigationItem.rightBarButtonItem = UIBarButtonItem(
title: "BUTTON_SELECT".localized(),
title: "select".localized(),
style: .plain,
target: self,
action: #selector(didTapSelect)

6
Session/Media Viewing & Editing/CropScaleImageViewController.swift
Unescape Escape View File

@ -154,7 +154,7 @@ import SessionUtilitiesKit
let titleLabel: UILabel = UILabel()
titleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize)
titleLabel.text = "CROP_SCALE_IMAGE_VIEW_TITLE".localized()
titleLabel.text = "attachmentsMoveAndScale".localized()
titleLabel.themeTextColor = .textPrimary
titleLabel.textAlignment = .center
contentView.addSubview(titleLabel)
@ -449,10 +449,10 @@ import SessionUtilitiesKit
result.distribution = .fillEqually
result.alignment = .fill
let cancelButton = createButton(title: CommonStrings.cancelButton, action: #selector(cancelPressed))
let cancelButton = createButton(title: "cancel".localized(), action: #selector(cancelPressed))
result.addArrangedSubview(cancelButton)
let doneButton = createButton(title: CommonStrings.doneButton, action: #selector(donePressed))
let doneButton = createButton(title: "done".localized(), action: #selector(donePressed))
doneButton.accessibilityLabel = "Done"
result.addArrangedSubview(doneButton)

15
Session/Media Viewing & Editing/DocumentTitleViewController.swift
Unescape Escape View File

@ -63,11 +63,8 @@ public class DocumentTileViewController: UIViewController, UITableViewDelegate,
result.dataSource = self
// Feels a bit weird to have content smashed all the way to the bottom edge.
result.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: 20, right: 0)
if #available(iOS 15.0, *) {
result.sectionHeaderTopPadding = 0
}
result.sectionHeaderTopPadding = 0
return result
}()
@ -84,7 +81,7 @@ public class DocumentTileViewController: UIViewController, UITableViewDelegate,
ViewControllerUtilities.setUpDefaultSessionStyle(
for: self,
title: MediaStrings.document,
title:"files".localized(),
hasCustomBackButton: false
)
@ -302,9 +299,9 @@ public class DocumentTileViewController: UIViewController, UITableViewDelegate,
headerView.configure(
title: {
switch section.model {
case .emptyGallery: return "DOCUMENT_TILES_EMPTY_DOCUMENT".localized()
case .loadOlder: return "DOCUMENT_TILES_LOADING_OLDER_LABEL".localized()
case .loadNewer: return "DOCUMENT_TILES_LOADING_MORE_RECENT_LABEL".localized()
case .emptyGallery: return "attachmentsFilesEmpty".localized()
case .loadOlder: return "attachmentsLoadingOlderFiles".localized()
case .loadNewer: return "attachmentsLoadingNewerFiles".localized()
case .galleryMonth: return "" // Impossible case
}
}()

23
Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
Unescape Escape View File

@ -97,7 +97,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
// Loki: Customize title
let titleLabel: UILabel = UILabel()
titleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize)
titleLabel.text = "accessibility_gif_button".localized().uppercased()
titleLabel.text = Constants.gif
titleLabel.themeTextColor = .textPrimary
navigationItem.titleView = titleLabel
@ -182,17 +182,17 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
logoImageView.set(.height, to: .height, of: bottomBanner, withOffset: -3)
logoImageView.center(.horizontal, in: bottomBanner)
let noResultsView = createErrorLabel(text: "GIF_VIEW_SEARCH_NO_RESULTS".localized())
let noResultsView = createErrorLabel(text: "searchMatchesNone".localized())
self.noResultsView = noResultsView
self.view.addSubview(noResultsView)
noResultsView.set(.width, to: .width, of: self.view, withOffset: -20)
noResultsView.center(.horizontal, in: self.collectionView)
noResultsView.center(in: self.collectionView)
let searchErrorView = createErrorLabel(text: "GIF_VIEW_SEARCH_ERROR".localized())
let searchErrorView = createErrorLabel(text: "searchMatchesNone".localized())
self.searchErrorView = searchErrorView
self.view.addSubview(searchErrorView)
searchErrorView.set(.width, to: .width, of: self.view, withOffset: -20)
searchErrorView.center(.horizontal, in: self.collectionView)
searchErrorView.center(in: self.collectionView)
searchErrorView.isUserInteractionEnabled = true
searchErrorView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(retryTapped)))
@ -361,10 +361,10 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
let modal: ConfirmationModal = ConfirmationModal(
targetView: self?.view,
info: ConfirmationModal.Info(
title: "GIF_PICKER_FAILURE_ALERT_TITLE".localized(),
title: "errorUnknown".localized(),
body: .text("\(error)"),
confirmTitle: CommonStrings.retryButton,
cancelTitle: CommonStrings.dismissButton,
confirmTitle: "retry".localized(),
cancelTitle: "dismiss".localized(),
cancelStyle: .alert_text,
onConfirm: { _ in
self?.getFileForCell(cell)
@ -380,7 +380,6 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
return
}
let filePath = asset.filePath
let dataSource = DataSourcePath(filePath: asset.filePath, shouldDeleteOnDeinit: false)
let attachment = SignalAttachment.attachment(dataSource: dataSource, dataUTI: rendition.utiType, imageQuality: .medium)
@ -448,9 +447,9 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
let modal: ConfirmationModal = ConfirmationModal(
targetView: self.view,
info: ConfirmationModal.Info(
title: CommonStrings.errorAlertTitle,
body: .text("GIF_PICKER_VIEW_MISSING_QUERY".localized()),
cancelTitle: "BUTTON_OK".localized(),
title: "theError".localized(),
body: .text("searchEnter".localized()),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)

13
Session/Media Viewing & Editing/GIFs/GiphyAPI.swift
Unescape Escape View File

@ -11,17 +11,12 @@ enum GiphyFormat {
case gif, mp4, jpg
}
enum GiphyError: Error {
enum GiphyError: Error, CustomStringConvertible {
case assertionError(description: String)
case fetchFailure
}
extension GiphyError: LocalizedError {
public var errorDescription: String? {
switch self {
case .assertionError: return "GIF_PICKER_ERROR_GENERIC".localized()
case .fetchFailure: return "GIF_PICKER_ERROR_FETCH_FAILURE".localized()
}
var description: String {
return "errorUnknown".localized()
}
}

2
Session/Media Viewing & Editing/GIFs/GiphyDownloader.swift
Unescape Escape View File

@ -10,5 +10,5 @@ public class GiphyDownloader: ProxiedContentDownloader {
// MARK: - Properties
public static let giphyDownloader = GiphyDownloader(downloadFolderName: "GIFs")
public static let giphyDownloader = GiphyDownloader(downloadFolderName: "GIFs") // stringlint:disable
}

19
Session/Media Viewing & Editing/ImagePickerController.swift
Unescape Escape View File

@ -72,7 +72,7 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
// quickly toggle between the Capture and the Picker VC's, we use the same custom "X"
// icon here rather than the system "stop" icon so that the spacing matches exactly.
// Otherwise there's a noticable shift in the icon placement.
let cancelImage = UIImage(imageLiteralResourceName: "X")
let cancelImage = #imageLiteral(resourceName: "X")
let cancelButton = UIBarButtonItem(image: cancelImage, style: .plain, target: self, action: #selector(didPressCancel))
cancelButton.themeTintColor = .textPrimary
@ -91,18 +91,14 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
self.selectionPanGesture = selectionPanGesture
collectionView.addGestureRecognizer(selectionPanGesture)
if #available(iOS 14, *) {
if PHPhotoLibrary.authorizationStatus(for: .readWrite) == .limited {
let addSeletedPhotoButton = UIBarButtonItem.init(barButtonSystemItem: .add, target: self, action: #selector(addSelectedPhoto))
self.navigationItem.rightBarButtonItem = addSeletedPhotoButton
}
if PHPhotoLibrary.authorizationStatus(for: .readWrite) == .limited {
let addSeletedPhotoButton = UIBarButtonItem.init(barButtonSystemItem: .add, target: self, action: #selector(addSelectedPhoto))
self.navigationItem.rightBarButtonItem = addSeletedPhotoButton
}
}
@objc func addSelectedPhoto(_ sender: Any) {
if #available(iOS 14, *) {
PHPhotoLibrary.shared().presentLimitedLibraryPicker(from: self)
}
PHPhotoLibrary.shared().presentLimitedLibraryPicker(from: self)
}
var selectionPanGesture: UIPanGestureRecognizer?
@ -377,10 +373,7 @@ class ImagePickerGridController: UICollectionViewController, PhotoLibraryDelegat
return
}
let toastFormat = NSLocalizedString("IMAGE_PICKER_CAN_SELECT_NO_MORE_TOAST_FORMAT",
comment: "Momentarily shown to the user when attempting to select more images than is allowed. Embeds {{max number of items}} that can be shared.")
let toastText = String(format: toastFormat, NSNumber(value: SignalAttachment.maxAttachmentsAllowed))
let toastText = "attachmentsErrorNumber".localized()
let toastController = ToastController(text: toastText, background: .backgroundPrimary)

2
Session/Media Viewing & Editing/MediaGalleryViewModel.swift
Unescape Escape View File

@ -174,7 +174,7 @@ public class MediaGalleryViewModel {
let galleryDate: Date = (self.date ?? Date())
switch (isSameMonth, isCurrentYear) {
case (true, true): return "MEDIA_GALLERY_THIS_MONTH_HEADER".localized()
case (true, true): return "attachmentsThisMonth".localized()
case (false, true): return GalleryDate.thisYearFormatter.string(from: galleryDate)
default: return GalleryDate.olderFormatter.string(from: galleryDate)
}

64
Session/Media Viewing & Editing/MediaInfoVC+MediaPreviewView.swift
Unescape Escape View File

@ -1,64 +0,0 @@
// Copyright © 2023 Rangeproof Pty Ltd. All rights reserved.
import UIKit
import SessionUIKit
import SessionUtilitiesKit
import SessionMessagingKit
extension MediaInfoVC {
final class MediaPreviewView: UIView {
private static let cornerRadius: CGFloat = 8
private let attachment: Attachment
private let isOutgoing: Bool
// MARK: - UI
private lazy var mediaView: MediaView = {
let result: MediaView = MediaView.init(
attachment: attachment,
isOutgoing: isOutgoing,
shouldSupressControls: false,
cornerRadius: 0
)
return result
}()
// MARK: - Lifecycle
init(attachment: Attachment, isOutgoing: Bool) {
self.attachment = attachment
self.isOutgoing = isOutgoing
super.init(frame: CGRect.zero)
self.accessibilityLabel = "Media info"
setUpViewHierarchy()
}
override init(frame: CGRect) {
preconditionFailure("Use init(attachment:) instead.")
}
required init?(coder: NSCoder) {
preconditionFailure("Use init(attachment:) instead.")
}
private func setUpViewHierarchy() {
set(.width, to: MediaInfoVC.mediaSize)
set(.height, to: MediaInfoVC.mediaSize)
addSubview(mediaView)
mediaView.pin(to: self)
mediaView.loadMedia()
}
// MARK: - Copy
/// This function is used to make sure the carousel view contains this class can loop infinitely
func copyView() -> MediaPreviewView {
return MediaPreviewView(attachment: self.attachment, isOutgoing: self.isOutgoing)
}
}
}

14
Session/Media Viewing & Editing/MediaPageViewController.swift
Unescape Escape View File

@ -132,7 +132,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
self.navigationItem.titleView = portraitHeaderView
if showAllMediaButton {
self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: MediaStrings.allMedia, style: .plain, target: self, action: #selector(didPressAllMediaButton))
self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "conversationsSettingsAllMedia".localized(), style: .plain, target: self, action: #selector(didPressAllMediaButton))
}
// Even though bars are opaque, we want content to be layed out behind them.
@ -571,7 +571,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
let itemToDelete: MediaGalleryViewModel.Item = self.currentItem
let actionSheet: UIAlertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
let deleteAction = UIAlertAction(
title: "delete_message_for_me".localized(),
title: "clearMessagesForMe".localized(),
style: .destructive
) { _ in
Storage.shared.writeAsync { db in
@ -598,7 +598,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
.deleteAll(db)
}
}
actionSheet.addAction(UIAlertAction(title: "TXT_CANCEL_TITLE".localized(), style: .cancel))
actionSheet.addAction(UIAlertAction(title: "cancel".localized(), style: .cancel))
actionSheet.addAction(deleteAction)
Modal.setupForIPadIfNeeded(actionSheet, targetView: self.view)
@ -877,7 +877,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
.defaulting(to: Profile.truncated(id: targetItem.interactionAuthorId, truncating: .middle))
case .standardOutgoing:
return "MEDIA_GALLERY_SENDER_NAME_YOU".localized() //"Short sender label for media sent by you"
return "you".localized() //"Short sender label for media sent by you"
default:
Log.error("[MediaPageViewController] Unsupported message variant: \(targetItem.interactionVariant)")
@ -892,8 +892,10 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou
let formattedDate = dateFormatter.string(from: date)
portraitHeaderDateLabel.text = formattedDate
let landscapeHeaderFormat = NSLocalizedString("MEDIA_GALLERY_LANDSCAPE_TITLE_FORMAT", comment: "embeds {{sender name}} and {{sent datetime}}, e.g. 'Sarah on 10/30/18, 3:29'")
let landscapeHeaderText = String(format: landscapeHeaderFormat, name, formattedDate)
let landscapeHeaderText = "attachmentsMedia"
.put(key: "name", value: name)
.put(key: "date_time", value: formattedDate)
.localized()
self.title = landscapeHeaderText
self.navigationItem.title = landscapeHeaderText
}

29
Session/Media Viewing & Editing/MediaTileViewController.swift
Unescape Escape View File

@ -132,7 +132,7 @@ public class MediaTileViewController: UIViewController, UICollectionViewDataSour
ViewControllerUtilities.setUpDefaultSessionStyle(
for: self,
title: MediaStrings.allMedia,
title: "conversationsSettingsAllMedia".localized(),
hasCustomBackButton: false
)
@ -426,9 +426,9 @@ public class MediaTileViewController: UIViewController, UICollectionViewDataSour
sectionHeader.configure(
title: {
switch section.model {
case .emptyGallery: return "GALLERY_TILES_EMPTY_GALLERY".localized()
case .loadOlder: return "GALLERY_TILES_LOADING_OLDER_LABEL".localized()
case .loadNewer: return "GALLERY_TILES_LOADING_MORE_RECENT_LABEL".localized()
case .emptyGallery: return "attachmentsMediaEmpty".localized()
case .loadOlder: return "attachmentsLoadingOlder".localized()
case .loadNewer: return "attachmentsLoadingNewer".localized()
case .galleryMonth: return "" // Impossible case
}
}()
@ -680,16 +680,9 @@ public class MediaTileViewController: UIViewController, UICollectionViewDataSour
let items: [MediaGalleryViewModel.Item] = indexPaths.map {
self.viewModel.galleryData[$0.section].elements[$0.item]
}
let confirmationTitle: String = {
if indexPaths.count == 1 {
return "MEDIA_GALLERY_DELETE_SINGLE_MESSAGE".localized()
}
return String(
format: "MEDIA_GALLERY_DELETE_MULTIPLE_MESSAGES_FORMAT".localized(),
indexPaths.count
)
}()
let confirmationTitle: String = "deleteMessage"
.putNumber(indexPaths.count)
.localized()
let deleteAction = UIAlertAction(title: confirmationTitle, style: .destructive) { [weak self] _ in
Storage.shared.writeAsync { db in
@ -725,7 +718,7 @@ public class MediaTileViewController: UIViewController, UICollectionViewDataSour
let actionSheet = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
actionSheet.addAction(deleteAction)
actionSheet.addAction(UIAlertAction(title: "TXT_CANCEL_TITLE".localized(), style: .cancel))
actionSheet.addAction(UIAlertAction(title: "cancel".localized(), style: .cancel))
Modal.setupForIPadIfNeeded(actionSheet, targetView: self.view)
self.present(actionSheet, animated: true)
@ -759,9 +752,6 @@ private class MediaTileViewLayout: UICollectionViewFlowLayout {
}
private class MediaGallerySectionHeader: UICollectionReusableView {
static let reuseIdentifier = "MediaGallerySectionHeader"
// HACK: scrollbar incorrectly appears *behind* section headers
// in collection view on iOS11 =(
private class AlwaysOnTopLayer: CALayer {
@ -817,9 +807,6 @@ private class MediaGallerySectionHeader: UICollectionReusableView {
}
private class MediaGalleryStaticHeader: UICollectionViewCell {
static let reuseIdentifier = "MediaGalleryStaticHeader"
let label = UILabel()
override init(frame: CGRect) {

25
Session/Media Viewing & Editing/MessageInfoScreen.swift
Unescape Escape View File

@ -52,7 +52,8 @@ struct MessageInfoScreen: View {
if isMessageFailed {
let (image, statusText, tintColor) = messageViewModel.state.statusIconInfo(
variant: messageViewModel.variant,
hasAtLeastOneReadReceipt: messageViewModel.hasAtLeastOneReadReceipt
hasAtLeastOneReadReceipt: messageViewModel.hasAtLeastOneReadReceipt,
hasAttachments: (messageViewModel.attachments?.isEmpty == false)
)
HStack(spacing: 6) {
@ -135,7 +136,7 @@ struct MessageInfoScreen: View {
alignment: .leading,
spacing: Values.mediumSpacing
) {
InfoBlock(title: "ATTACHMENT_INFO_FILE_ID".localized() + ":") {
InfoBlock(title: "attachmentsFileId".localized()) {
Text(attachment.serverId ?? "")
.font(.system(size: Values.mediumFontSize))
.foregroundColor(themeColor: .textPrimary)
@ -144,7 +145,7 @@ struct MessageInfoScreen: View {
HStack(
alignment: .center
) {
InfoBlock(title: "ATTACHMENT_INFO_FILE_TYPE".localized() + ":") {
InfoBlock(title: "attachmentsFileType".localized()) {
Text(attachment.contentType)
.font(.system(size: Values.mediumFontSize))
.foregroundColor(themeColor: .textPrimary)
@ -152,7 +153,7 @@ struct MessageInfoScreen: View {
Spacer()
InfoBlock(title: "ATTACHMENT_INFO_FILE_SIZE".localized() + ":") {
InfoBlock(title: "attachmentsFileSize".localized()) {
Text(Format.fileSize(attachment.byteCount))
.font(.system(size: Values.mediumFontSize))
.foregroundColor(themeColor: .textPrimary)
@ -167,7 +168,7 @@ struct MessageInfoScreen: View {
guard let width = attachment.width, let height = attachment.height else { return "attachmentsNa".localized() }
return "\(width)×\(height)"
}()
InfoBlock(title: "ATTACHMENT_INFO_RESOLUTION".localized() + ":") {
InfoBlock(title: "attachmentsResolution".localized()) {
Text(resolution)
.font(.system(size: Values.mediumFontSize))
.foregroundColor(themeColor: .textPrimary)
@ -179,7 +180,7 @@ struct MessageInfoScreen: View {
guard let duration = attachment.duration else { return "attachmentsNa".localized() }
return floor(duration).formatted(format: .videoDuration)
}()
InfoBlock(title: "ATTACHMENT_INFO_DURATION".localized() + ":") {
InfoBlock(title: "attachmentsDuration".localized()) {
Text(duration)
.font(.system(size: Values.mediumFontSize))
.foregroundColor(themeColor: .textPrimary)
@ -209,28 +210,28 @@ struct MessageInfoScreen: View {
alignment: .leading,
spacing: Values.mediumSpacing
) {
InfoBlock(title: "MESSAGE_INFO_SENT".localized() + ":") {
InfoBlock(title: "sent".localized()) {
Text(messageViewModel.dateForUI.fromattedForMessageInfo)
.font(.system(size: Values.mediumFontSize))
.foregroundColor(themeColor: .textPrimary)
}
InfoBlock(title: "MESSAGE_INFO_RECEIVED".localized() + ":") {
InfoBlock(title: "received".localized()) {
Text(messageViewModel.receivedDateForUI.fromattedForMessageInfo)
.font(.system(size: Values.mediumFontSize))
.foregroundColor(themeColor: .textPrimary)
}
if isMessageFailed {
let failureText: String = messageViewModel.mostRecentFailureText ?? "SEND_FAILED_NOTIFICATION_BODY".localized()
InfoBlock(title: "ALERT_ERROR_TITLE".localized() + ":") {
let failureText: String = messageViewModel.mostRecentFailureText ?? "messageStatusFailedToSend".localized()
InfoBlock(title: "theError".localized() + ":") {
Text(failureText)
.font(.system(size: Values.mediumFontSize))
.foregroundColor(themeColor: .danger)
}
}
InfoBlock(title: "MESSAGE_INFO_FROM".localized() + ":") {
InfoBlock(title: "from".localized()) {
HStack(
spacing: 10
) {
@ -549,7 +550,7 @@ final class MessageInfoViewController: SessionHostingViewController<MessageInfoS
super.viewDidLoad()
let customTitleFontSize = Values.largeFontSize
setNavBarTitle("message_info_title".localized(), customFontSize: customTitleFontSize)
setNavBarTitle("messageInfo".localized(), customFontSize: customTitleFontSize)
}
}

543
Session/Media Viewing & Editing/MessageInfoView.swift
Unescape Escape View File

@ -1,543 +0,0 @@
// Copyright © 2023 Rangeproof Pty Ltd. All rights reserved.
import SwiftUI
import SessionUIKit
import SessionSnodeKit
import SessionUtilitiesKit
import SessionMessagingKit
struct MessageInfoView: View {
@Environment(\.viewController) private var viewControllerHolder: UIViewController?
@State var index = 1
@State var showingAttachmentFullScreen = false
var actions: [ContextMenuVC.Action]
var messageViewModel: MessageViewModel
var isMessageFailed: Bool {
return [.failed, .failedToSync].contains(messageViewModel.state)
}
var dismiss: (() -> Void)?
var body: some View {
NavigationView {
ZStack (alignment: .topLeading) {
if #available(iOS 14.0, *) {
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary).ignoresSafeArea()
} else {
ThemeManager.currentTheme.colorSwiftUI(for: .backgroundPrimary)
}
ScrollView(.vertical, showsIndicators: false) {
VStack(
alignment: .leading,
spacing: 10
) {
// Message bubble snapshot
if let body: String = messageViewModel.body, !body.isEmpty {
let (bubbleBackgroundColor, bubbleTextColor): (ThemeValue, ThemeValue) = (
messageViewModel.variant == .standardIncoming ||
messageViewModel.variant == .standardIncomingDeleted
) ?
(.messageBubble_incomingBackground, .messageBubble_incomingText) :
(.messageBubble_outgoingBackground, .messageBubble_outgoingText)
ZStack {
RoundedRectangle(cornerRadius: 18)
.fill(themeColor: bubbleBackgroundColor)
Text(body)
.foregroundColor(themeColor: bubbleTextColor)
.padding(
EdgeInsets(
top: 8,
leading: 16,
bottom: 8,
trailing: 16
)
)
}
.frame(
maxWidth: .infinity,
maxHeight: .infinity,
alignment: .topLeading
)
.fixedSize(horizontal: true, vertical: true)
.padding(
EdgeInsets(
top: 8,
leading: 30,
bottom: 4,
trailing: 30
)
)
}
if isMessageFailed {
let (image, statusText, tintColor) = messageViewModel.state.statusIconInfo(
variant: messageViewModel.variant,
hasAtLeastOneReadReceipt: messageViewModel.hasAtLeastOneReadReceipt
)
HStack(spacing: 6) {
if let image: UIImage = image?.withRenderingMode(.alwaysTemplate) {
Image(uiImage: image)
.resizable()
.scaledToFit()
.foregroundColor(themeColor: tintColor)
.frame(width: 13, height: 12)
}
if let statusText: String = statusText {
Text(statusText)
.font(.system(size: 11))
.foregroundColor(themeColor: tintColor)
}
}
.padding(
EdgeInsets(
top: -8,
leading: 30,
bottom: 4,
trailing: 30
)
)
}
if let attachments = messageViewModel.attachments {
let attachment: Attachment = attachments[(index - 1 + attachments.count) % attachments.count]
ZStack(alignment: .bottomTrailing) {
if attachments.count > 1 {
// Attachment carousel view
SessionCarouselView_SwiftUI(
index: $index,
isOutgoing: (messageViewModel.variant == .standardOutgoing),
contentInfos: attachments
)
.frame(
maxWidth: .infinity,
maxHeight: .infinity,
alignment: .topLeading
)
} else {
MediaView_SwiftUI(
attachment: attachments[0],
isOutgoing: (messageViewModel.variant == .standardOutgoing),
shouldSupressControls: true,
cornerRadius: 0
)
.frame(
maxWidth: .infinity,
maxHeight: .infinity,
alignment: .topLeading
)
.aspectRatio(1, contentMode: .fit)
.clipShape(RoundedRectangle(cornerRadius: 15))
.padding(
EdgeInsets(
top: 0,
leading: 30,
bottom: 0,
trailing: 30
)
)
}
Button {
self.viewControllerHolder?.present(style: .fullScreen) {
MediaGalleryViewModel.createDetailViewSwiftUI(
for: messageViewModel.threadId,
threadVariant: messageViewModel.threadVariant,
interactionId: messageViewModel.id,
selectedAttachmentId: attachment.id,
options: [ .sliderEnabled ]
)
}
} label: {
ZStack {
Circle()
.foregroundColor(.init(white: 0, opacity: 0.4))
Image(systemName: "arrow.up.left.and.arrow.down.right")
.font(.system(size: 13))
.foregroundColor(.white)
}
.frame(width: 26, height: 26)
}
.padding(
EdgeInsets(
top: 0,
leading: 0,
bottom: 8,
trailing: 38
)
)
}
.padding(
EdgeInsets(
top: 4,
leading: 0,
bottom: 4,
trailing: 0
)
)
// Attachment Info
ZStack {
RoundedRectangle(cornerRadius: 17)
.fill(themeColor: .backgroundSecondary)
VStack(
alignment: .leading,
spacing: 16
) {
InfoBlock(title: "ATTACHMENT_INFO_FILE_ID".localized() + ":") {
Text(attachment.serverId ?? "")
.font(.system(size: 16))
.foregroundColor(themeColor: .textPrimary)
}
HStack(
alignment: .center
) {
InfoBlock(title: "ATTACHMENT_INFO_FILE_TYPE".localized() + ":") {
Text(attachment.contentType)
.font(.system(size: 16))
.foregroundColor(themeColor: .textPrimary)
}
Spacer()
InfoBlock(title: "ATTACHMENT_INFO_FILE_SIZE".localized() + ":") {
Text(Format.fileSize(attachment.byteCount))
.font(.system(size: 16))
.foregroundColor(themeColor: .textPrimary)
}
Spacer()
}
HStack(
alignment: .center
) {
let resolution: String = {
guard let width = attachment.width, let height = attachment.height else { return "N/A" }
return "\(width)×\(height)"
}()
InfoBlock(title: "ATTACHMENT_INFO_RESOLUTION".localized() + ":") {
Text(resolution)
.font(.system(size: 16))
.foregroundColor(themeColor: .textPrimary)
}
Spacer()
let duration: String = {
guard let duration = attachment.duration else { return "N/A" }
return floor(duration).formatted(format: .videoDuration)
}()
InfoBlock(title: "ATTACHMENT_INFO_DURATION".localized() + ":") {
Text(duration)
.font(.system(size: 16))
.foregroundColor(themeColor: .textPrimary)
}
Spacer()
}
}
.frame(
maxWidth: .infinity,
maxHeight: .infinity,
alignment: .topLeading
)
.padding(
EdgeInsets(
top: 24,
leading: 24,
bottom: 24,
trailing: 24
)
)
}
.frame(maxHeight: .infinity)
.fixedSize(horizontal: false, vertical: true)
.padding(
EdgeInsets(
top: 4,
leading: 30,
bottom: 4,
trailing: 30
)
)
}
// Message Info
ZStack {
RoundedRectangle(cornerRadius: 17)
.fill(themeColor: .backgroundSecondary)
VStack(
alignment: .leading,
spacing: 16
) {
InfoBlock(title: "MESSAGE_INFO_SENT".localized() + ":") {
Text(messageViewModel.dateForUI.fromattedForMessageInfo)
.font(.system(size: 16))
.foregroundColor(themeColor: .textPrimary)
}
InfoBlock(title: "MESSAGE_INFO_RECEIVED".localized() + ":") {
Text(messageViewModel.receivedDateForUI.fromattedForMessageInfo)
.font(.system(size: 16))
.foregroundColor(themeColor: .textPrimary)
}
if isMessageFailed {
let failureText: String = messageViewModel.mostRecentFailureText ?? "Message failed to send"
InfoBlock(title: "ALERT_ERROR_TITLE".localized() + ":") {
Text(failureText)
.font(.system(size: 16))
.foregroundColor(themeColor: .danger)
}
}
InfoBlock(title: "MESSAGE_INFO_FROM".localized() + ":") {
HStack(
spacing: 10
) {
let (info, additionalInfo) = ProfilePictureView.getProfilePictureInfo(
size: .message,
publicKey: messageViewModel.authorId,
threadVariant: .contact, // Always show the display picture in 'contact' mode
customImageData: nil,
profile: messageViewModel.profile,
profileIcon: (messageViewModel.isSenderOpenGroupModerator ? .crown : .none)
)
let size: ProfilePictureView.Size = .list
if let info: ProfilePictureView.Info = info {
ProfilePictureSwiftUI(
size: size,
info: info,
additionalInfo: additionalInfo
)
.frame(
width: size.viewSize,
height: size.viewSize,
alignment: .topLeading
)
}
VStack(
alignment: .leading,
spacing: 4
) {
if !messageViewModel.authorName.isEmpty {
Text(messageViewModel.authorName)
.bold()
.font(.system(size: 18))
.foregroundColor(themeColor: .textPrimary)
}
Text(messageViewModel.authorId)
.font(.spaceMono(size: 16))
.foregroundColor(themeColor: .textPrimary)
}
}
}
}
.frame(
maxWidth: .infinity,
maxHeight: .infinity,
alignment: .topLeading
)
.padding(
EdgeInsets(
top: 24,
leading: 24,
bottom: 24,
trailing: 24
)
)
}
.frame(maxHeight: .infinity)
.fixedSize(horizontal: false, vertical: true)
.padding(
EdgeInsets(
top: 4,
leading: 30,
bottom: 4,
trailing: 30
)
)
// Actions
if !actions.isEmpty {
ZStack {
RoundedRectangle(cornerRadius: 17)
.fill(themeColor: .backgroundSecondary)
VStack(
alignment: .leading,
spacing: 0
) {
ForEach(
0...(actions.count - 1),
id: \.self
) { index in
let tintColor: ThemeValue = actions[index].themeColor
Button(
action: {
actions[index].work()
dismiss?()
},
label: {
HStack(spacing: 24) {
Image(uiImage: actions[index].icon!.withRenderingMode(.alwaysTemplate))
.resizable()
.scaledToFit()
.foregroundColor(themeColor: tintColor)
.frame(width: 26, height: 26)
Text(actions[index].title)
.bold()
.font(.system(size: 18))
.foregroundColor(themeColor: tintColor)
}
.frame(maxWidth: .infinity, alignment: .topLeading)
}
)
.frame(height: 60)
if index < (actions.count - 1) {
Divider()
.foregroundColor(themeColor: .borderSeparator)
}
}
}
.frame(
maxWidth: .infinity,
maxHeight: .infinity,
alignment: .topLeading
)
.padding(
EdgeInsets(
top: 0,
leading: 24,
bottom: 0,
trailing: 24
)
)
}
.frame(maxHeight: .infinity)
.fixedSize(horizontal: false, vertical: true)
.padding(
EdgeInsets(
top: 4,
leading: 30,
bottom: 4,
trailing: 30
)
)
}
}
}
}
}
}
}
struct InfoBlock<Content>: View where Content: View {
let title: String
let content: () -> Content
var body: some View {
VStack(
alignment: .leading,
spacing: 4
) {
Text(self.title)
.bold()
.font(.system(size: 18))
.foregroundColor(themeColor: .textPrimary)
self.content()
}
.frame(
minWidth: 100,
alignment: .leading
)
}
}
final class MessageInfoViewController: SessionHostingViewController<MessageInfoView> {
init(actions: [ContextMenuVC.Action], messageViewModel: MessageViewModel) {
let messageInfoView = MessageInfoView(
actions: actions,
messageViewModel: messageViewModel
)
super.init(rootView: messageInfoView)
rootView.content.dismiss = dismiss
}
@MainActor required dynamic init?(coder aDecoder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override func viewDidLoad() {
super.viewDidLoad()
let customTitleFontSize = Values.largeFontSize
setNavBarTitle("message_info_title".localized(), customFontSize: customTitleFontSize)
}
func dismiss() {
self.navigationController?.popViewController(animated: true)
}
}
struct MessageInfoView_Previews: PreviewProvider {
static var messageViewModel: MessageViewModel {
let result = MessageViewModel(
optimisticMessageId: UUID(),
threadId: "d4f1g54sdf5g1d5f4g65ds4564df65f4g65d54gdfsg",
threadVariant: .contact,
threadExpirationType: nil,
threadExpirationTimer: nil,
threadOpenGroupServer: nil,
threadOpenGroupPublicKey: nil,
threadContactNameInternal: "Test",
timestampMs: SnodeAPI.currentOffsetTimestampMs(),
receivedAtTimestampMs: SnodeAPI.currentOffsetTimestampMs(),
authorId: "d4f1g54sdf5g1d5f4g65ds4564df65f4g65d54gdfsg",
authorNameInternal: "Test",
body: "Test Message",
expiresStartedAtMs: nil,
expiresInSeconds: nil,
state: .failed,
isSenderOpenGroupModerator: false,
currentUserProfile: Profile.fetchOrCreateCurrentUser(),
quote: nil,
quoteAttachment: nil,
linkPreview: nil,
linkPreviewAttachment: nil,
attachments: nil
)
return result
}
static var actions: [ContextMenuVC.Action] {
return [
.reply(messageViewModel, nil, using: Dependencies()),
.retry(messageViewModel, nil, using: Dependencies()),
.delete(messageViewModel, nil, using: Dependencies())
]
}
static var previews: some View {
MessageInfoView(
actions: actions,
messageViewModel: messageViewModel
)
}
}

25
Session/Media Viewing & Editing/PhotoCaptureViewController.swift
Unescape Escape View File

@ -16,16 +16,9 @@ enum PhotoCaptureError: Error, CustomStringConvertible {
case assertionError(description: String)
case initializationFailed
case captureFailed
var description: String {
switch self {
case .initializationFailed:
return NSLocalizedString("PHOTO_CAPTURE_UNABLE_TO_INITIALIZE_CAMERA", comment: "alert title")
case .captureFailed:
return NSLocalizedString("PHOTO_CAPTURE_UNABLE_TO_CAPTURE_IMAGE", comment: "alert title")
case .assertionError:
return NSLocalizedString("PHOTO_CAPTURE_GENERIC_ERROR", comment: "alert title, generic error preventing user from capturing a photo")
}
public var description: String {
return "cameraErrorUnavailable".localized()
}
}
@ -329,9 +322,9 @@ class PhotoCaptureViewController: OWSViewController {
Log.error("[PhotoCaptureViewController] Error: \(error)")
let modal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: CommonStrings.errorAlertTitle,
title: "theError".localized(),
body: .text("\(error)"),
cancelTitle: CommonStrings.dismissButton,
cancelTitle: "dismiss".localized(),
cancelStyle: .alert_text,
afterClosed: { [weak self] in self?.dismiss(animated: true) }
)
@ -344,11 +337,11 @@ class PhotoCaptureViewController: OWSViewController {
let imageName: String
switch photoCapture.flashMode {
case .auto:
imageName = "ic_flash_mode_auto"
imageName = "ic_flash_mode_auto" // stringlint:disable
case .on:
imageName = "ic_flash_mode_on"
imageName = "ic_flash_mode_on" // stringlint:disable
case .off:
imageName = "ic_flash_mode_off"
imageName = "ic_flash_mode_off" // stringlint:disable
default: preconditionFailure()
}
@ -653,7 +646,7 @@ class RecordingTimerView: UIView {
private lazy var timeFormatter: DateFormatter = {
let formatter = DateFormatter()
formatter.dateFormat = "mm:ss"
formatter.timeZone = TimeZone(identifier: "UTC")!
formatter.timeZone = TimeZone(identifier: "UTC")! // stringlint:disable
return formatter
}()

2
Session/Media Viewing & Editing/PhotoCollectionPickerViewModel.swift
Unescape Escape View File

@ -40,7 +40,7 @@ class PhotoCollectionPickerViewModel: SessionTableViewModel, ObservableTableSour
// MARK: - Content
let title: String = "NOTIFICATIONS_STYLE_SOUND_TITLE".localized()
let title: String = "notificationsSound".localized()
lazy var observation: TargetObservation = ObservationBuilder
.subject(photoCollections)

4
Session/Media Viewing & Editing/PhotoLibrary.swift
Unescape Escape View File

@ -185,7 +185,7 @@ class PhotoCollectionContents {
exportSession.outputFileType = AVFileType.mp4
exportSession.metadataItemFilter = AVMetadataItemFilter.forSharing()
let exportPath = FileSystem.temporaryFilePath(fileExtension: "mp4")
let exportPath = FileSystem.temporaryFilePath(fileExtension: "mp4") // stringlint:disable
let exportURL = URL(fileURLWithPath: exportPath)
exportSession.outputURL = exportURL
@ -250,7 +250,7 @@ class PhotoCollection {
func localizedTitle() -> String {
guard let localizedTitle = collection.localizedTitle?.stripped,
localizedTitle.count > 0 else {
return NSLocalizedString("PHOTO_PICKER_UNNAMED_COLLECTION", comment: "label for system photo collections which have no name.")
return "attachmentsAlbumUnnamed".localized()
}
return localizedTitle
}

34
Session/Media Viewing & Editing/SendMediaNavigationController.swift
Unescape Escape View File

@ -249,23 +249,7 @@ class SendMediaNavigationController: UINavigationController {
}
private func didRequestExit() {
guard attachmentDraftCollection.count > 0 else {
self.sendMediaNavDelegate?.sendMediaNavDidCancel(self)
return
}
let modal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "SEND_MEDIA_ABANDON_TITLE".localized(),
confirmTitle: "SEND_MEDIA_CONFIRM_ABANDON_ALBUM".localized(),
confirmStyle: .danger,
cancelStyle: .alert_text,
onConfirm: { [weak self] _ in
self?.sendMediaNavDelegate?.sendMediaNavDidCancel(self)
}
)
)
self.present(modal, animated: true)
self.sendMediaNavDelegate?.sendMediaNavDidCancel(self)
}
}
@ -309,8 +293,8 @@ extension SendMediaNavigationController: PhotoCaptureViewControllerDelegate {
if !pushApprovalViewController() {
let modal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS".localized(),
cancelTitle: "BUTTON_OK".localized(),
title: "attachmentsErrorMediaSelection".localized(),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)
@ -361,8 +345,8 @@ extension SendMediaNavigationController: ImagePickerGridControllerDelegate {
let modal: ConfirmationModal = ConfirmationModal(
targetView: self?.view,
info: ConfirmationModal.Info(
title: "IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS".localized(),
cancelTitle: "BUTTON_OK".localized(),
title: "attachmentsErrorMediaSelection".localized(),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)
@ -378,8 +362,8 @@ extension SendMediaNavigationController: ImagePickerGridControllerDelegate {
guard self?.pushApprovalViewController() == true else {
let modal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS".localized(),
cancelTitle: "BUTTON_OK".localized(),
title: "attachmentsErrorMediaSelection".localized(),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)
@ -429,8 +413,8 @@ extension SendMediaNavigationController: ImagePickerGridControllerDelegate {
let modal: ConfirmationModal = ConfirmationModal(
targetView: self.view,
info: ConfirmationModal.Info(
title: "IMAGE_PICKER_FAILED_TO_PROCESS_ATTACHMENTS".localized(),
cancelTitle: "BUTTON_OK".localized(),
title: "attachmentsErrorMediaSelection".localized(),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text
)
)

2
Session/Media Viewing & Editing/Transitions/MediaInteractiveDismiss.swift
Unescape Escape View File

@ -34,7 +34,7 @@ class MediaInteractiveDismiss: UIPercentDrivenInteractiveTransition {
let gesture: DirectionalPanGestureRecognizer = DirectionalPanGestureRecognizer(direction: .vertical, target: self, action: #selector(handleGesture(_:)))
// Allow panning with trackpad
if #available(iOS 13.4, *) { gesture.allowedScrollTypesMask = .continuous }
gesture.allowedScrollTypesMask = .continuous
view.addGestureRecognizer(gesture)
}

51
Session/Meta/AppDelegate.swift
Unescape Escape View File

@ -445,11 +445,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
/// This **must** be a standard `UIAlertController` instead of a `ConfirmationModal` because we may not
/// have access to the database when displaying this so can't extract theme information for styling purposes
let alert: UIAlertController = UIAlertController(
title: "Session",
title: Constants.app_name,
message: error.message,
preferredStyle: .alert
)
alert.addAction(UIAlertAction(title: "HELP_REPORT_BUG_ACTION_TITLE".localized(), style: .default) { _ in
alert.addAction(UIAlertAction(title: "helpReportABugExportLogs".localized(), style: .default) { _ in
HelpViewModel.shareLogs(viewControllerToDismiss: alert) { [weak self] in
// Don't bother showing the "Failed Startup" modal again if we happen to now
// have an initial view controller (this most likely means that the startup
@ -469,7 +469,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
// Offer the 'Restore' option if it was a migration error
case .databaseError:
alert.addAction(UIAlertAction(title: "vc_restore_title".localized(), style: .destructive) { [dependencies] _ in
alert.addAction(UIAlertAction(title: "onboardingAccountExists".localized(), style: .destructive) { [dependencies] _ in
// Reset the current database for a clean migration
dependencies.storage.resetForCleanMigration()
@ -502,12 +502,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
default: break
}
alert.addAction(UIAlertAction(title: "APP_STARTUP_EXIT".localized(), style: .default) { _ in
alert.addAction(UIAlertAction(title: "quit".put(key: "app_name", value: Constants.app_name).localized(), style: .default) { _ in
Log.flush()
exit(0)
})
Log.info("Showing startup alert due to error: \(error.name)")
Log.info("Showing startup alert due to error: \(error.description)")
self.window?.rootViewController?.present(alert, animated: animated, completion: presentationCompletion)
}
@ -520,10 +520,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
Log.info("Exiting because we are in the background and the database password is not accessible.")
let notificationContent: UNMutableNotificationContent = UNMutableNotificationContent()
notificationContent.body = String(
format: NSLocalizedString("NOTIFICATION_BODY_PHONE_LOCKED_FORMAT", comment: ""),
UIDevice.current.localizedModel
)
notificationContent.body = "notificationsIosRestart"
.put(key: "device", value: UIDevice.current.localizedModel)
.localized()
let notificationRequest: UNNotificationRequest = UNNotificationRequest(
identifier: UUID().uuidString,
content: notificationContent,
@ -923,37 +922,3 @@ private enum LifecycleMethod: Equatable {
}
}
}
// MARK: - StartupError
private enum StartupError: Error {
case databaseError(Error)
case failedToRestore
case startupTimeout
var name: String {
switch self {
case .databaseError(StorageError.startupFailed), .databaseError(DatabaseError.SQLITE_LOCKED), .databaseError(StorageError.databaseSuspended):
return "Database startup failed"
case .databaseError(StorageError.migrationNoLongerSupported): return "Unsupported version"
case .failedToRestore: return "Failed to restore"
case .databaseError: return "Database error"
case .startupTimeout: return "Startup timeout"
}
}
var message: String {
switch self {
case .databaseError(StorageError.startupFailed), .databaseError(DatabaseError.SQLITE_LOCKED), .databaseError(StorageError.databaseSuspended):
return "DATABASE_STARTUP_FAILED".localized()
case .databaseError(StorageError.migrationNoLongerSupported):
return "DATABASE_UNSUPPORTED_MIGRATION".localized()
case .failedToRestore: return "DATABASE_RESTORE_FAILED".localized()
case .databaseError: return "DATABASE_MIGRATION_FAILED".localized()
case .startupTimeout: return "APP_STARTUP_TIMEOUT".localized()
}
}
}

12
Session/Meta/Images.xcassets/ic_bin.imageset/Contents.json vendored
Unescape Escape View File

@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "Icon.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

61
Session/Meta/Images.xcassets/ic_bin.imageset/Icon.pdf vendored
Unescape Escape View File

@ -0,0 +1,61 @@
%PDF-1.7
1 0 obj
<< >>
endobj
2 0 obj
<< /Filter /FlateDecode
/Length 3 0 R
>>
stream
xe“MŽÕ0„÷>E.€±û×½$ÖÀ¢A =FB#q~ÊyI;‚¬œ/îêê²óþÓËŸŸûË×Ï<>ßÊûõ¶¿•ß¥×v<[»ïr•ß¸Ž&L‹`Uñmÿµ*ÿ_¼í¯EjôAªOa1ÞPBUÌYeÁGéS´)Ÿ&ìRÕ™yîsbShKõ˜Ø¨v¢¼í¥k ‰ºAD‚‚m
Îênì… A±&‡H£‡?!“„¼kŒÀˆðÑm e<C2A0>µS¶[a ís¾2Æb0£)D.&µYS4M}LkläËÆ^¨, »`rV†«q{NqÍF<C38D>éÈÕg
“<EFBFBD>NÄc†ÕÝMÐC¬ <0F>3Q¸ýç4öò-”ˆúRuÁ<0E>‡¤uxÇ1$…«ƒÕgRI»WŽŽh¦E6 ´¾1¤AÚaµ¨b§8â…梆½ÝüX]} ÷"戨¹%ƒfšOø( ùˆ¼%<&Æ3ÑÙd¡t³£ÏÍøÔÁs›-tPÃÁ¯ ÒJ¢g¼Cát\É#^œM¸@1!n ¹*Ê¥â½;b¼!¾Œ#Å„Zq_¿ B¼A%„4‹¯ZÍñÒJ"èaݺÀí\=)ñS¦À€I]3Ïú«Ë<C2AB><C38B>v ¹h:‡æ<E280A1>^#®>+ t<%ƒfšOø@¼ßËkùRþ~™õˆ
endstream
endobj
3 0 obj
507
endobj
4 0 obj
<< /Annots []
/Type /Page
/MediaBox [ 0.000000 0.000000 25.000000 25.000000 ]
/Resources 1 0 R
/Contents 2 0 R
/Parent 5 0 R
>>
endobj
5 0 obj
<< /Kids [ 4 0 R ]
/Count 1
/Type /Pages
>>
endobj
6 0 obj
<< /Pages 5 0 R
/Type /Catalog
>>
endobj
xref
0 7
0000000000 65535 f
0000000010 00000 n
0000000034 00000 n
0000000625 00000 n
0000000647 00000 n
0000000820 00000 n
0000000894 00000 n
trailer
<< /ID [ (some) (id) ]
/Root 6 0 R
/Size 7
>>
startxref
953
%%EOF

6
Session/Meta/MainAppContext.swift
Unescape Escape View File

@ -37,7 +37,7 @@ final class MainAppContext: AppContext {
var statusBarHeight: CGFloat { UIApplication.shared.statusBarFrame.size.height }
var openSystemSettingsAction: UIAlertAction? {
let result = UIAlertAction(
title: "OPEN_SETTINGS_BUTTON".localized(),
title: "sessionSettings".localized(),
style: .default
) { _ in UIApplication.shared.openSystemSettings() }
result.accessibilityIdentifier = "\(type(of: self)).system_settings"
@ -155,7 +155,7 @@ final class MainAppContext: AppContext {
func ensureSleepBlocking(_ shouldBeBlocking: Bool, blockingObjects: [Any]) {
if UIApplication.shared.isIdleTimerDisabled != shouldBeBlocking {
if shouldBeBlocking {
var logString: String = "Blocking sleep because of: \(String(describing: blockingObjects.first))"
var logString: String = "Blocking sleep because of: \(String(describing: blockingObjects.first))" // stringlint:disable
if blockingObjects.count > 1 {
logString = "\(logString) (and \(blockingObjects.count - 1) others)"
@ -199,7 +199,7 @@ final class MainAppContext: AppContext {
// b) modified time before app launch time.
let filePath: String = URL(fileURLWithPath: dirPath).appendingPathComponent(fileName).path
if !fileName.hasPrefix("ows_temp") {
if !fileName.hasPrefix("ows_temp") { // stringlint:disable
// It's fine if we can't get the attributes (the file may have been deleted since we found it),
// also don't delete files which were created in the last N minutes
guard

2
Session/Meta/Session-Info.plist
Unescape Escape View File

@ -81,6 +81,8 @@
<false/>
</dict>
</dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSAppleMusicUsageDescription</key>
<string>Session needs to use Apple Music to play media attachments.</string>

8
Session/Meta/SessionApp.swift
Unescape Escape View File

@ -14,16 +14,16 @@ public struct SessionApp {
static var versionInfo: String {
let buildNumber: String = (Bundle.main.infoDictionary?["CFBundleVersion"] as? String)
.map { " (\($0))" }
.map { " (\($0))" } // stringlint:disable
.defaulting(to: "")
let appVersion: String? = (Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String)
.map { "App: \($0)\(buildNumber)" }
.map { "App: \($0)\(buildNumber)" } // stringlint:disable
let commitInfo: String? = (Bundle.main.infoDictionary?["GitCommitHash"] as? String).map { "Commit: \($0)" }
let versionInfo: [String] = [
"iOS \(UIDevice.current.systemVersion)",
"iOS \(UIDevice.current.systemVersion)", // stringlint:disable
appVersion,
"libSession: \(LibSession.libSessionVersion)",
"libSession: \(LibSession.libSessionVersion)", // stringlint:disable
commitInfo
].compactMap { $0 }

41
Session/Meta/StartupError.swift
Unescape Escape View File

@ -0,0 +1,41 @@
// Copyright © 2024 Rangeproof Pty Ltd. All rights reserved.
//
// stringlint:disable
import Foundation
import GRDB
import SessionUtilitiesKit
internal enum StartupError: Error, CustomStringConvertible {
case databaseError(Error)
case failedToRestore
case startupTimeout
public var description: String {
switch self {
case .databaseError(StorageError.startupFailed), .databaseError(DatabaseError.SQLITE_LOCKED), .databaseError(StorageError.databaseSuspended):
return "Database startup failed"
case .databaseError(StorageError.migrationNoLongerSupported): return "Unsupported version"
case .failedToRestore: return "Failed to restore"
case .databaseError: return "Database error"
case .startupTimeout: return "Startup timeout"
}
}
var message: String {
switch self {
case .databaseError(StorageError.startupFailed), .databaseError(DatabaseError.SQLITE_LOCKED), .databaseError(StorageError.databaseSuspended), .failedToRestore, .databaseError:
return "databaseErrorGeneric".localized()
case .databaseError(StorageError.migrationNoLongerSupported):
return "databaseErrorUpdate"
.put(key: "app_name", value: Constants.app_name)
.localized()
case .startupTimeout:
return "databaseErrorTimeout"
.put(key: "app_name", value: Constants.app_name)
.localized()
}
}
}

1
Session/Meta/Translations/InfoPlist.xcstrings
View File

File diff suppressed because one or more lines are too long

389816
Session/Meta/Translations/Localizable.xcstrings
View File

File diff suppressed because it is too large Load Diff

1132
Session/Meta/Translations/ar.lproj/Localizable.strings
View File

File diff suppressed because it is too large Load Diff

1132
Session/Meta/Translations/be.lproj/Localizable.strings
View File

File diff suppressed because it is too large Load Diff

1132
Session/Meta/Translations/bg.lproj/Localizable.strings
View File

File diff suppressed because it is too large Load Diff

1132
Session/Meta/Translations/bn.lproj/Localizable.strings
View File

File diff suppressed because it is too large Load Diff

1132
Session/Meta/Translations/cs.lproj/Localizable.strings
View File

File diff suppressed because it is too large Load Diff

1132
Session/Meta/Translations/da.lproj/Localizable.strings
View File

File diff suppressed because it is too large Load Diff

1133
Session/Meta/Translations/de.lproj/Localizable.strings
View File

File diff suppressed because it is too large Load Diff

1132
Session/Meta/Translations/el.lproj/Localizable.strings
View File

File diff suppressed because it is too large Load Diff

1132
Session/Meta/Translations/en.lproj/Localizable.strings
View File

File diff suppressed because it is too large Load Diff

1132
Session/Meta/Translations/eo.lproj/Localizable.strings
View File

File diff suppressed because it is too large Load Diff

1132
Session/Meta/Translations/es-ES.lproj/Localizable.strings
View File

File diff suppressed because it is too large Load Diff

1132
Session/Meta/Translations/fa.lproj/Localizable.strings
View File

File diff suppressed because it is too large Load Diff

1132
Session/Meta/Translations/fi.lproj/Localizable.strings
View File

File diff suppressed because it is too large Load Diff

1132
Session/Meta/Translations/fil.lproj/Localizable.strings
View File

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save