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

Added localisations for some strings and resolved a bunch of warnings

Browse Source
pull/894/head
Morgan Pretty 6 months ago
parent ae323ffef3
commit a6e39d930f
47 changed files with 11584 additions and 11734 deletions
Show Stats Download Patch File Download Diff File

3
Scripts/LintLocalizableStrings.swift
Unescape Escape View File

@ -47,7 +47,7 @@ extension ProjectState {
"_SharedTestUtilities/", // Exclude shared test directory
"external/" // External dependencies
]
static let excludedPhrases: Set<String> = [ "", " ", " ", ",", ", ", "null", "\"", "@[0-9a-fA-F]{66}", "^[0-9A-Fa-f]+$", "/" ]
static let excludedPhrases: Set<String> = [ "", " ", " ", ",", ", ", "null", "\"", "\"\\($0)\"", "@[0-9a-fA-F]{66}", "^[0-9A-Fa-f]+$", "/" ]
static let excludedUnlocalizedStringLineMatching: Set<MatchType> = [
.contains(ProjectState.lintSuppression, caseSensitive: false),
.prefix("#import", caseSensitive: false),
@ -156,6 +156,7 @@ extension ProjectState {
.regex("case .* = "),
.regex("Error.*\\("),
.belowLineContaining("PreviewProvider"),
.belowLineContaining("#Preview"),
.regex("Crypto.*\\(id:"),
.containsAnd("id:", caseSensitive: false, .previousLine(numEarlier: 1, .regex("Crypto.*\\("))),
.regex(".*\\.like\\(\".*%\""),

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

@ -292,7 +292,6 @@
C33FD9C4255A54EF00E217F9 /* SessionSnodeKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C2A59F255385C100C340D1 /* SessionSnodeKit.framework */; };
C33FD9C5255A54EF00E217F9 /* SessionUtilitiesKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C2A679255388CC00C340D1 /* SessionUtilitiesKit.framework */; };
C33FDC58255A582000E217F9 /* ReverseDispatchQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = C33FDA9E255A57FF00E217F9 /* ReverseDispatchQueue.swift */; };
C33FDD49255A582000E217F9 /* ParamParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = C33FDB8F255A581200E217F9 /* ParamParser.swift */; };
C33FDD8D255A582000E217F9 /* OWSSignalAddress.swift in Sources */ = {isa = PBXBuildFile; fileRef = C33FDBD3255A581800E217F9 /* OWSSignalAddress.swift */; };
C3402FE52559036600EA6424 /* SessionUIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C331FF1B2558F9D300070591 /* SessionUIKit.framework */; };
C34C8F7423A7830B00D82669 /* SpaceMono-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C34C8F7323A7830A00D82669 /* SpaceMono-Bold.ttf */; };
@ -1545,7 +1544,6 @@
C33FDAFD255A580600E217F9 /* LRUCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LRUCache.swift; sourceTree = "<group>"; };
C33FDB3A255A580B00E217F9 /* PollerType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PollerType.swift; sourceTree = "<group>"; };
C33FDB3F255A580C00E217F9 /* String+SSK.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+SSK.swift"; sourceTree = "<group>"; };
C33FDB8F255A581200E217F9 /* ParamParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParamParser.swift; sourceTree = "<group>"; };
C33FDBA8255A581500E217F9 /* LinkPreviewDraft.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LinkPreviewDraft.swift; sourceTree = "<group>"; };
C33FDBD3255A581800E217F9 /* OWSSignalAddress.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OWSSignalAddress.swift; sourceTree = "<group>"; };
C33FDBDE255A581900E217F9 /* PushNotificationAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PushNotificationAPI.swift; sourceTree = "<group>"; };
@ -2281,7 +2279,6 @@
files = (
FD6A396B2C2D284500762359 /* YYImage in Frameworks */,
FD2286712C38D43000BC06F7 /* DifferenceKit in Frameworks */,
FD6A396B2C2D284500762359 /* YYImage in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -2319,9 +2316,6 @@
FD6A38EC2C2A63B500762359 /* KeychainSwift in Frameworks */,
FD6A38EF2C2A641200762359 /* DifferenceKit in Frameworks */,
FD6A396D2C2D284B00762359 /* YYImage in Frameworks */,
FD6A38EC2C2A63B500762359 /* KeychainSwift in Frameworks */,
FD6A38EF2C2A641200762359 /* DifferenceKit in Frameworks */,
FD6A396D2C2D284B00762359 /* YYImage in Frameworks */,
FDC289422C86AB5800020BC2 /* GRDB in Frameworks */,
FD6A38E92C2A630E00762359 /* CocoaLumberjackSwift in Frameworks */,
);
@ -3561,7 +3555,6 @@
C38EF2B1255B6D9C007E1867 /* UIViewController+Utilities.swift */,
C33FDBD3255A581800E217F9 /* OWSSignalAddress.swift */,
C38EF304255B6DBE007E1867 /* ImageCache.swift */,
C33FDB8F255A581200E217F9 /* ParamParser.swift */,
C33FDA9E255A57FF00E217F9 /* ReverseDispatchQueue.swift */,
C38EF241255B6D67007E1867 /* Collection+OWS.swift */,
C38EF3AE255B6DE5007E1867 /* OrderedDictionary.swift */,
@ -5113,7 +5106,7 @@
DefaultBuildSystemTypeForWorkspace = Original;
LastSwiftUpdateCheck = 1520;
LastTestingUpgradeCheck = 0600;
LastUpgradeCheck = 1520;
LastUpgradeCheck = 1600;
ORGANIZATIONNAME = "Rangeproof Pty Ltd";
TargetAttributes = {
453518671FC635DD00210559 = {
@ -5224,7 +5217,8 @@
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
Base
en,
Base,
);
mainGroup = D221A07E169C9E5E00537ABF;
packageReferences = (
@ -5790,7 +5784,6 @@
files = (
C38EF3C6255B6DE7007E1867 /* ImageEditorModel.swift in Sources */,
C38EF3C3255B6DE7007E1867 /* ImageEditorTextItem.swift in Sources */,
C33FDD49255A582000E217F9 /* ParamParser.swift in Sources */,
C38EF3C5255B6DE7007E1867 /* OWSViewController+ImageEditor.swift in Sources */,
C38EF385255B6DD2007E1867 /* AttachmentTextToolbar.swift in Sources */,
FD71161E28D9772700B47552 /* UIViewController+OWS.swift in Sources */,
@ -6868,7 +6861,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.ShareExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@ -7000,7 +6992,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.NotificationServiceExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
@ -7112,7 +7103,6 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@ -7133,7 +7123,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.SessionUIKit";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = NO;
SUPPORTS_MACCATALYST = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@ -7187,7 +7176,6 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
@ -7252,7 +7240,6 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@ -7280,7 +7267,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.SignalUtilitiesKit";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = NO;
SUPPORTS_MACCATALYST = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@ -7334,7 +7320,6 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
@ -7406,7 +7391,6 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@ -7437,7 +7421,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.SessionSnodeKit";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = NO;
SUPPORTS_MACCATALYST = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_INCLUDE_PATHS = "$(inherited) \"$(TARGET_BUILD_DIR)/libSessionUtil\"";
@ -7492,7 +7475,6 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
@ -7592,13 +7574,13 @@
/usr/lib/swift,
"\"$(TARGET_BUILD_DIR)/libSessionUtil\"",
);
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.SessionUtilitiesKit";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = NO;
SUPPORTS_MACCATALYST = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_INCLUDE_PATHS = "$(inherited) \"$(TARGET_BUILD_DIR)/libSessionUtil\"";
@ -7653,7 +7635,6 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
@ -7730,7 +7711,6 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@ -7761,7 +7741,6 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.SessionMessagingKit";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = NO;
SUPPORTS_MACCATALYST = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_INCLUDE_PATHS = "$(inherited) \"$(TARGET_BUILD_DIR)/libSessionUtil\"";
@ -7817,7 +7796,6 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
@ -7854,7 +7832,6 @@
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
STRIP_INSTALLED_PRODUCT = YES;
SUPPORTS_MACCATALYST = NO;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_INCLUDE_PATHS = "$(inherited) \"$(TARGET_BUILD_DIR)/libSessionUtil\"";
@ -7900,6 +7877,7 @@
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
@ -7973,7 +7951,9 @@
CODE_SIGN_IDENTITY = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 492;
ENABLE_BITCODE = NO;
ENABLE_MODULE_VERIFIER = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
@ -8021,7 +8001,6 @@
D221A0BD169C9E5F00537ABF /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ADDRESS_SANITIZER_CONTAINER_OVERFLOW = YES;
CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
@ -8078,7 +8057,6 @@
PROVISIONING_PROFILE_SPECIFIER = "";
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO;
SWIFT_OBJC_INTERFACE_HEADER_NAME = "Session-Swift.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
@ -8091,7 +8069,6 @@
D221A0BE169C9E5F00537ABF /* App_Store_Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ADDRESS_SANITIZER_CONTAINER_OVERFLOW = NO;
CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
@ -8156,6 +8133,7 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
ENABLE_MODULE_VERIFIER = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GENERATE_INFOPLIST_FILE = YES;
@ -8168,6 +8146,7 @@
FD2272512C32910F004D8A6C /* App_Store_Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ENABLE_MODULE_VERIFIER = NO;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
PRODUCT_BUNDLE_IDENTIFIER = io.oxen.SessionSnodeKitTests;
@ -8194,6 +8173,7 @@
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_MODULE_VERIFIER = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@ -8251,6 +8231,7 @@
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_MODULE_VERIFIER = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
@ -8297,6 +8278,7 @@
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_MODULE_VERIFIER = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@ -8353,6 +8335,7 @@
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_MODULE_VERIFIER = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
@ -8398,7 +8381,6 @@
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
ENABLE_MODULE_VERIFIER = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@ -8462,7 +8444,6 @@
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
ENABLE_MODULE_VERIFIER = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
@ -8511,6 +8492,7 @@
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_MODULE_VERIFIER = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@ -8567,6 +8549,7 @@
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_MODULE_VERIFIER = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;

6
Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme
Unescape Escape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "1600"
version = "1.8">
<BuildAction
parallelizeBuildables = "YES"
@ -42,7 +42,7 @@
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FD7C37AD2BBB8B1D009DEEA7"
BlueprintIdentifier = "FDB5DAF92A981C42002C8721"
BuildableName = "SessionSnodeKitTests.xctest"
BlueprintName = "SessionSnodeKitTests"
ReferencedContainer = "container:Session.xcodeproj">
@ -192,7 +192,7 @@
testExecutionOrdering = "random">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FD7C37AD2BBB8B1D009DEEA7"
BlueprintIdentifier = "FDB5DAF92A981C42002C8721"
BuildableName = "SessionSnodeKitTests.xctest"
BlueprintName = "SessionSnodeKitTests"
ReferencedContainer = "container:Session.xcodeproj">

2
Session.xcodeproj/xcshareddata/xcschemes/SessionMessagingKit.xcscheme
Unescape Escape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "1600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
Session.xcodeproj/xcshareddata/xcschemes/SessionNotificationServiceExtension.xcscheme
Unescape Escape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "1600"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction

2
Session.xcodeproj/xcshareddata/xcschemes/SessionShareExtension.xcscheme
Unescape Escape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "1600"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction

2
Session.xcodeproj/xcshareddata/xcschemes/SessionSnodeKit.xcscheme
Unescape Escape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "1600"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"

2
Session.xcodeproj/xcshareddata/xcschemes/SessionUIKit.xcscheme
Unescape Escape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1500"
LastUpgradeVersion = "1600"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"

2
Session.xcodeproj/xcshareddata/xcschemes/SessionUtil.xcscheme
Unescape Escape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1500"
LastUpgradeVersion = "1600"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"

2
Session.xcodeproj/xcshareddata/xcschemes/SessionUtilitiesKit.xcscheme
Unescape Escape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "1600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

2
Session.xcodeproj/xcshareddata/xcschemes/SignalUtilitiesKit.xcscheme
Unescape Escape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "1600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

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

@ -307,7 +307,7 @@ public extension SessionCallManager {
}
let iconMaskImage: UIImage = #imageLiteral(resourceName: "SessionGreen32")
let configuration = CXProviderConfiguration(localizedName: "Session") // stringlint:disable
let configuration = CXProviderConfiguration()
configuration.supportsVideo = true
configuration.maximumCallGroups = 1
configuration.maximumCallsPerCallGroup = 1

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

@ -2,7 +2,7 @@
import WebRTC
extension RTCSignalingState : CustomStringConvertible {
extension RTCSignalingState : @retroactive CustomStringConvertible {
public var description: String {
switch self {
@ -17,7 +17,7 @@ extension RTCSignalingState : CustomStringConvertible {
}
}
extension RTCIceConnectionState : CustomStringConvertible {
extension RTCIceConnectionState : @retroactive CustomStringConvertible {
public var description: String {
switch self {
@ -34,7 +34,7 @@ extension RTCIceConnectionState : CustomStringConvertible {
}
}
extension RTCIceGatheringState : CustomStringConvertible {
extension RTCIceGatheringState : @retroactive CustomStringConvertible {
public var description: String {
switch self {

3
Session/Closed Groups/EditGroupViewModel.swift
Unescape Escape View File

@ -164,7 +164,6 @@ class EditGroupViewModel: SessionTableViewModel, NavigatableStateHolder, Editabl
let userSessionId: SessionId = dependencies[cache: .general].sessionId
let isUpdatedGroup: Bool = (((try? SessionId.Prefix(from: threadId)) ?? .group) == .group)
let editIcon: UIImage? = UIImage(systemName: "pencil")
let sortedMembers: [WithProfile<GroupMember>] = {
guard !isUpdatedGroup else { return state.members }
@ -525,6 +524,7 @@ class EditGroupViewModel: SessionTableViewModel, NavigatableStateHolder, Editabl
switch (self?.inviteByIdValue, try? SessionId(from: self?.inviteByIdValue)) {
case (_, .some(let sessionId)) where sessionId.prefix == .standard:
guard !currentMemberIds.contains(sessionId.hexString) else {
// FIXME: Localise this
return showError("This Account ID or ONS belongs to an existing member")
}
@ -561,6 +561,7 @@ class EditGroupViewModel: SessionTableViewModel, NavigatableStateHolder, Editabl
},
receiveValue: { sessionIdHexString in
guard !currentMemberIds.contains(sessionIdHexString) else {
// FIXME: Localise this
return showError("This Account ID or ONS belongs to an existing member")
}

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

@ -6,8 +6,8 @@ import SessionMessagingKit
struct VoiceMessageView_SwiftUI: View {
@State var isPlaying: Bool = false
@State var time: String = "0:00"
@State var speed: String = "1.5×"
@State var time: String = "0:00" // stringlint:disable
@State var speed: String = "1.5×" // stringlint:disable
@State var progress: Double = 0.0
private static let width: CGFloat = 160

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

@ -1186,7 +1186,7 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
SessionThreadViewModel.searchTermParts(searchText)
.map { part -> String in
guard part.hasPrefix("\"") && part.hasSuffix("\"") else { return part }
guard part.hasPrefix("\"") && part.hasSuffix("\"") else { return part } // stringlint:disable
let partRange = (part.index(after: part.startIndex)..<part.index(before: part.endIndex))
return String(part[partRange])
@ -1198,8 +1198,8 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate {
normalizedBody
.ranges(
of: (Dependencies.isRTL ?
"(\(part.lowercased()))(^|[^a-zA-Z0-9])" :
"(^|[^a-zA-Z0-9])(\(part.lowercased()))"
"(\(part.lowercased()))(^|[^a-zA-Z0-9])" : // stringlint:disable
"(^|[^a-zA-Z0-9])(\(part.lowercased()))" // stringlint:disable
),
options: [.regularExpression]
)

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

@ -983,7 +983,8 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigatableStateHolder, Ob
SessionTableViewController(
viewModel: UserListViewModel<GroupMember>(
title: "promote".localized(),
emptyState: "There are no group members which can be promoted.",//.localized(),
// FIXME: Localise this
emptyState: "There are no group members which can be promoted.",
showProfileIcons: true,
request: SQLRequest("""
SELECT \(groupMember.allColumns)
@ -1069,7 +1070,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigatableStateHolder, Ob
ConfirmationModal(
info: ConfirmationModal.Info(
title: "theError".localized(),
body: .text("displayNameErrorDescriptionShorter".localized()),
body: .text("nicknameErrorShorter".localized()),
cancelTitle: "okay".localized(),
cancelStyle: .alert_text,
dismissType: .single
@ -1129,7 +1130,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigatableStateHolder, Ob
body: { [weak self, dependencies] in
guard isUpdatedGroup && dependencies[feature: .updatedGroupsAllowDescriptionEditing] else {
return .input(
explanation: NSAttributedString(string: "Group name is visible to all group members."),//.localized()),
explanation: NSAttributedString(string: "groupNameVisible".localized()),
info: ConfirmationModal.Info.Body.InputInfo(
placeholder: "groupNameEnter".localized(),
initialValue: currentName
@ -1139,7 +1140,8 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigatableStateHolder, Ob
}
return .dualInput(
explanation: NSAttributedString(string: "Group name and description are visible to all group members."),//.localized()),
// FIXME: Localise this
explanation: NSAttributedString(string: "Group name and description are visible to all group members."),
firstInfo: ConfirmationModal.Info.Body.InputInfo(
placeholder: "groupNameEnter".localized(),
initialValue: currentName
@ -1179,7 +1181,8 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigatableStateHolder, Ob
return "groupNameEnterShorter".localized()
}
guard !LibSession.isTooLong(groupDescription: (finalDescription ?? "")) else {
return "Please enter a shorter group description."//.localized()
// FIXME: Localise this
return "Please enter a shorter group description."
}
return nil // No error has occurred

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

@ -169,7 +169,7 @@ final class ConversationTitleView: UIView {
// No need to add themed subtitle content if we aren't adding the subtitle carousel
guard shouldHaveSubtitle else { return }
ThemeManager.onThemeChange(observer: self.labelCarouselView) { [weak self, dependencies] theme, _ in
ThemeManager.onThemeChange(observer: self.labelCarouselView) { [weak self] theme, _ in
guard let textPrimary: UIColor = theme.color(for: .textPrimary) else { return }
var labelInfos: [SessionLabelCarouselView.LabelInfo] = []

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

@ -28,7 +28,7 @@ struct StartConversationScreen: View {
.putNumber(1)
.localized()
NewConversationCell(
image: "Message",
image: "Message", // stringlint:disable
title: title
) {
let viewController: SessionHostingViewController = SessionHostingViewController(

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because it is too large Load Diff

2
Session/Settings/SettingsViewModel.swift
Unescape Escape View File

@ -455,7 +455,7 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl
info: ConfirmationModal.Info(
title: "displayNameSet".localized(),
body: .input(
explanation: nil,
explanation: NSAttributedString(string: "displayNameVisible".localized()),
info: ConfirmationModal.Info.Body.InputInfo(
placeholder: "displayNameEnter".localized(),
initialValue: current

13
SessionMessagingKit/Database/Models/Attachment.swift
Unescape Escape View File

@ -629,7 +629,7 @@ extension Attachment {
.components(separatedBy: CharacterSet(charactersIn: "<>|\\:()&;?*/~"))
.joined(separator: "_")
while normalizedFileName.hasPrefix(".") {
while normalizedFileName.hasPrefix(".") { // stringlint:disable
normalizedFileName = String(normalizedFileName.substring(from: 1))
}
@ -650,13 +650,16 @@ extension Attachment {
if !targetFileExtension.isEmpty {
// Store the file in a subdirectory whose name is the uniqueId of this attachment,
// to avoid collisions between multiple attachments with the same name
let attachmentFolder: String = Attachment.attachmentsFolder(using: dependencies).appending("/\(id)")
let attachmentFolder: String = Attachment
.attachmentsFolder(using: dependencies)
.appending("/\(id)") // stringlint:disable
guard case .success = Result(try FileSystem.ensureDirectoryExists(at: attachmentFolder, using: dependencies)) else {
return nil
}
return attachmentFolder.appending("/\(filenameWithoutExtension).\(targetFileExtension)")
return attachmentFolder
.appending("/\(filenameWithoutExtension).\(targetFileExtension)") // stringlint:disable
}
}
@ -665,7 +668,9 @@ extension Attachment {
UTType.fileExtensionDefault
).lowercased()
return Attachment.attachmentsFolder(using: dependencies).appending("/\(id).\(targetFileExtension)")
return Attachment
.attachmentsFolder(using: dependencies)
.appending("/\(id).\(targetFileExtension)") // stringlint:disable
}
public static func localRelativeFilePath(from originalFilePath: String?, using dependencies: Dependencies) -> String? {

15
SessionMessagingKit/Database/Models/ClosedGroup.swift
Unescape Escape View File

@ -461,10 +461,15 @@ public extension ClosedGroup {
case .invitedFallback: return "groupInviteYou".localized()
case .invitedAdmin(let adminName, let groupName):
return "\(adminName) invited you to rejoin \(groupName), where you are an Admin."//.localized()
return "groupInviteReinvite"
.put(key: "name", value: adminName)
.put(key: "group_name", value: groupName)
.localized()
case .invitedAdminFallback(let groupName):
return "You were invited to rejoin \(groupName), where you are an Admin."//.localized()
return "groupInviteReinviteYou"
.put(key: "group_name", value: groupName)
.localized()
case .updatedName(let name):
return "groupNameNew"
@ -529,9 +534,7 @@ public extension ClosedGroup {
.localized()
case .addedUsers(true, _, false): return "groupInviteYou".localized()
case .addedUsers(true, _, true):
return "groupInviteYou".localized()
case .addedUsers(true, _, true): return "groupInviteYouHistory".localized()
case .removedUsers(false, let names) where names.count > 2:
return "groupRemovedMultiple"
@ -560,7 +563,7 @@ public extension ClosedGroup {
.put(key: "name", value: names.first ?? "anonymous".localized())
.localized()
case .removedUsers(true, _): return "groupRemovedYou".localized()
case .removedUsers(true, _): return "groupRemovedYouGeneral".localized()
case .memberLeft(false, let name):
return "groupMemberLeft"

12
SessionMessagingKit/Database/Models/GroupMember.swift
Unescape Escape View File

@ -102,12 +102,12 @@ public extension GroupMember {
switch (role, roleStatus) {
case (_, .accepted): return nil // Nothing for "final" state
case (.zombie, _), (.moderator, _): return nil // Unused cases
case (.standard, .notSentYet): return "GROUP_MEMBER_STATUS_SENDING".localized()
case (.standard, .pending): return "GROUP_MEMBER_STATUS_SENT".localized()
case (.standard, .failed): return "GROUP_MEMBER_STATUS_FAILED".localized()
case (.admin, .notSentYet): return "GROUP_ADMIN_STATUS_SENDING".localized()
case (.admin, .pending): return "GROUP_ADMIN_STATUS_SENT".localized()
case (.admin, .failed): return "GROUP_ADMIN_STATUS_FAILED".localized()
case (.standard, .notSentYet): return "groupInviteSending".localized()
case (.standard, .pending): return "groupInviteSent".localized()
case (.standard, .failed): return "groupInviteFailed".localized()
case (.admin, .notSentYet): return "adminSendingPromotion".localized()
case (.admin, .pending): return "adminPromotionSent".localized()
case (.admin, .failed): return "adminPromotionFailed".localized()
}
}

5
SessionMessagingKit/Database/Models/SessionThread.swift
Unescape Escape View File

@ -127,10 +127,7 @@ public struct SessionThread: Codable, Identifiable, Equatable, FetchableRecord,
) {
self.id = id
self.variant = variant
self.creationDateTimestamp = (
creationDateTimestamp ??
(dependencies[cache: .snodeAPI].currentOffsetTimestampMs() / 1000)
)
self.creationDateTimestamp = creationDateTimestamp
self.shouldBeVisible = shouldBeVisible
self.messageDraft = messageDraft
self.notificationSound = notificationSound

2
SessionMessagingKit/Messages/Message.swift
Unescape Escape View File

@ -713,7 +713,7 @@ public extension Message {
using dependencies: Dependencies
) -> UInt64 {
// Not disappearing messages
guard let expiresInSeconds = message.expiresInSeconds else { return message.ttl }
guard message.expiresInSeconds != nil else { return message.ttl }
switch (destination, message) {
// Disappear after sent messages with exceptions

2
SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+Calls.swift
Unescape Escape View File

@ -200,7 +200,7 @@ extension MessageReceiver {
guard
dependencies[singleton: .callManager].currentWebRTCSessionMatches(callId: message.uuid),
var currentCall: CurrentCallProtocol = dependencies[singleton: .callManager].currentCall,
let currentCall: CurrentCallProtocol = dependencies[singleton: .callManager].currentCall,
currentCall.uuid == message.uuid,
let sender: String = message.sender
else { return }

4
SessionMessagingKit/Sending & Receiving/Pollers/SwarmPoller.swift
Unescape Escape View File

@ -232,7 +232,7 @@ public class SwarmPoller: SwarmPollerType & PollerType {
}
// Add a job to process the config messages first
var configMessageJobs: [Job] = allProcessedMessages
let configMessageJobs: [Job] = allProcessedMessages
.filter { $0.isConfigMessage && !$0.namespace.shouldHandleSynchronously }
.grouped { $0.threadId }
.compactMap { threadId, threadMessages in
@ -262,7 +262,7 @@ public class SwarmPoller: SwarmPollerType & PollerType {
// Add jobs for processing non-config messages which are dependant on the config message
// processing jobs
var standardMessageJobs: [Job] = allProcessedMessages
let standardMessageJobs: [Job] = allProcessedMessages
.filter { !$0.isConfigMessage && !$0.namespace.shouldHandleSynchronously }
.grouped { $0.threadId }
.compactMap { threadId, threadMessages in

33
SessionMessagingKit/Shared Models/MessageViewModel+DeletionActions.swift
Unescape Escape View File

@ -158,13 +158,16 @@ public extension MessageViewModel.DeletionBehaviours {
.putNumber(cellViewModels.count)
.localized(),
warning: (threadData.threadIsNoteToSelf ?
"Some of the messages you have selected cannot be deleted for everyone" :
"Some of the messages you have selected cannot be deleted from all of your devices"
),
body: (cellViewModels.count == 1 ?
"deleteMessageConfirm".localized() :
"deleteMessagesConfirm".localized()
"deleteMessageNoteToSelfWarning"
.putNumber(cellViewModels.count)
.localized() :
"deleteMessageWarning"
.putNumber(cellViewModels.count)
.localized()
),
body: "deleteMessageConfirm"
.putNumber(cellViewModels.count)
.localized(),
actions: [
NamedAction(
title: "deleteMessageDeviceOnly".localized(),
@ -215,10 +218,9 @@ public extension MessageViewModel.DeletionBehaviours {
.putNumber(cellViewModels.count)
.localized(),
warning: nil,
body: (cellViewModels.count == 1 ?
"deleteMessageConfirm".localized() :
"deleteMessagesConfirm".localized()
),
body: "deleteMessageConfirm"
.putNumber(cellViewModels.count)
.localized(),
actions: [
NamedAction(
title: "deleteMessageDeviceOnly".localized(),
@ -258,7 +260,9 @@ public extension MessageViewModel.DeletionBehaviours {
title: "deleteMessage"
.putNumber(cellViewModels.count)
.localized(),
warning: "Some of the messages you have selected cannot be deleted for everyone",
warning: "deleteMessageWarning"
.putNumber(cellViewModels.count)
.localized(),
body: (cellViewModels.count == 1 ?
"deleteMessageDescriptionDevice".localized() :
"deleteMessagesDescriptionDevice".localized()
@ -293,10 +297,9 @@ public extension MessageViewModel.DeletionBehaviours {
.putNumber(cellViewModels.count)
.localized(),
warning: nil,
body: (cellViewModels.count == 1 ?
"deleteMessageConfirm".localized() :
"deleteMessagesConfirm".localized()
),
body: "deleteMessageConfirm"
.putNumber(cellViewModels.count)
.localized(),
actions: [
NamedAction(
title: "deleteMessageDeviceOnly".localized(),

2
SessionMessagingKit/Utilities/OWSAudioPlayer.m
Unescape Escape View File

@ -70,7 +70,7 @@ NS_ASSUME_NONNULL_BEGIN
_mediaUrl = mediaUrl;
_delegate = delegate;
NSString *audioActivityDescription = [NSString stringWithFormat:@"%@ %@", @"OWSAudioPlayer", self.mediaUrl];
NSString *audioActivityDescription = [NSString stringWithFormat:@"%@ %@", @"OWSAudioPlayer", self.mediaUrl]; // stringlint:disable
_audioActivity = [[OWSAudioActivity alloc] initWithAudioDescription:audioActivityDescription behavior:audioBehavior];
[[NSNotificationCenter defaultCenter] addObserver:self

2
SessionMessagingKit/Utilities/OWSAudioSession.swift
Unescape Escape View File

@ -23,7 +23,7 @@ public class AudioActivity: NSObject {
// MARK:
override public var description: String {
return "<[AudioActivity] audioDescription: \"\(audioDescription)\">"
return "<[AudioActivity] audioDescription: \"\(audioDescription)\">" // stringlint:disable
}
}

10
SessionMessagingKit/Utilities/OWSWindowManager.m
Unescape Escape View File

@ -8,7 +8,7 @@
NS_ASSUME_NONNULL_BEGIN
NSString *const IsScreenBlockActiveDidChangeNotification = @"IsScreenBlockActiveDidChangeNotification";
NSString *const IsScreenBlockActiveDidChangeNotification = @"IsScreenBlockActiveDidChangeNotification"; // stringlint:disable
// Behind everything, especially the root window.
const UIWindowLevel UIWindowLevel_Background = -1.f;
@ -234,7 +234,7 @@ const UIWindowLevel UIWindowLevel_ScreenBlocking(void)
// we re-enable autorotation.
// NSString *encodedSelectorString1 = @"isInterfaceAutorotationDisabled".encodedForSelector;
NSString *encodedSelectorString1 = @"egVaAAZ2BHdydHZSBwYBBAEGcgZ6AQBVegVyc312dQ==";
NSString *encodedSelectorString1 = @"egVaAAZ2BHdydHZSBwYBBAEGcgZ6AQBVegVyc312dQ=="; // stringlint:disable
NSString *_Nullable selectorString1 = encodedSelectorString1.decodedForSelector;
if (selectorString1 == nil) {
return;
@ -254,7 +254,7 @@ const UIWindowLevel UIWindowLevel_ScreenBlocking(void)
// after verifying the methods/classes exist.
// NSString *encodedKlassString = @"UIScrollToDismissSupport".encodedForSelector;
NSString *encodedKlassString = @"ZlpkdAQBfX1lAVV6BX56BQVkBwICAQQG";
NSString *encodedKlassString = @"ZlpkdAQBfX1lAVV6BX56BQVkBwICAQQG"; // stringlint:disable
NSString *_Nullable klassString = encodedKlassString.decodedForSelector;
if (klassString == nil) {
return;
@ -265,7 +265,7 @@ const UIWindowLevel UIWindowLevel_ScreenBlocking(void)
}
// NSString *encodedSelector2String = @"supportForScreen:".encodedForSelector;
NSString *encodedSelector2String = @"BQcCAgEEBlcBBGR0BHZ2AEs=";
NSString *encodedSelector2String = @"BQcCAgEEBlcBBGR0BHZ2AEs="; // stringlint:disable
NSString *_Nullable selector2String = encodedSelector2String.decodedForSelector;
if (selector2String == nil) {
return;
@ -279,7 +279,7 @@ const UIWindowLevel UIWindowLevel_ScreenBlocking(void)
id dismissSupport = func2(klass, selector2, UIScreen.mainScreen);
// NSString *encodedSelector3String = @"finishScrollViewTransition".encodedForSelector;
NSString *encodedSelector3String = @"d3oAegV5ZHQEAX19Z3p2CWUEcgAFegZ6AQA=";
NSString *encodedSelector3String = @"d3oAegV5ZHQEAX19Z3p2CWUEcgAFegZ6AQA="; // stringlint:disable
NSString *_Nullable selector3String = encodedSelector3String.decodedForSelector;
if (selector3String == nil) {
return;

40
SessionMessagingKit/Utilities/Preferences+Sound.swift
Unescape Escape View File

@ -110,32 +110,32 @@ public extension Preferences {
case .`default`: return ""
// Notification Sounds
case .aurora: return (quiet ? "aurora-quiet.aifc" : "aurora.aifc")
case .bamboo: return (quiet ? "bamboo-quiet.aifc" : "bamboo.aifc")
case .chord: return (quiet ? "chord-quiet.aifc" : "chord.aifc")
case .circles: return (quiet ? "circles-quiet.aifc" : "circles.aifc")
case .complete: return (quiet ? "complete-quiet.aifc" : "complete.aifc")
case .hello: return (quiet ? "hello-quiet.aifc" : "hello.aifc")
case .input: return (quiet ? "input-quiet.aifc" : "input.aifc")
case .keys: return (quiet ? "keys-quiet.aifc" : "keys.aifc")
case .note: return (quiet ? "note-quiet.aifc" : "note.aifc")
case .popcorn: return (quiet ? "popcorn-quiet.aifc" : "popcorn.aifc")
case .pulse: return (quiet ? "pulse-quiet.aifc" : "pulse.aifc")
case .synth: return (quiet ? "synth-quiet.aifc" : "synth.aifc")
case .signalClassic: return (quiet ? "classic-quiet.aifc" : "classic.aifc")
case .aurora: return (quiet ? "aurora-quiet.aifc" : "aurora.aifc") // stringlint:disable
case .bamboo: return (quiet ? "bamboo-quiet.aifc" : "bamboo.aifc") // stringlint:disable
case .chord: return (quiet ? "chord-quiet.aifc" : "chord.aifc") // stringlint:disable
case .circles: return (quiet ? "circles-quiet.aifc" : "circles.aifc") // stringlint:disable
case .complete: return (quiet ? "complete-quiet.aifc" : "complete.aifc") // stringlint:disable
case .hello: return (quiet ? "hello-quiet.aifc" : "hello.aifc") // stringlint:disable
case .input: return (quiet ? "input-quiet.aifc" : "input.aifc") // stringlint:disable
case .keys: return (quiet ? "keys-quiet.aifc" : "keys.aifc") // stringlint:disable
case .note: return (quiet ? "note-quiet.aifc" : "note.aifc") // stringlint:disable
case .popcorn: return (quiet ? "popcorn-quiet.aifc" : "popcorn.aifc") // stringlint:disable
case .pulse: return (quiet ? "pulse-quiet.aifc" : "pulse.aifc") // stringlint:disable
case .synth: return (quiet ? "synth-quiet.aifc" : "synth.aifc") // stringlint:disable
case .signalClassic: return (quiet ? "classic-quiet.aifc" : "classic.aifc") // stringlint:disable
// Ringtone Sounds
case .opening: return "Opening.m4r"
case .opening: return "Opening.m4r" // stringlint:disable
// Calls
case .callConnecting: return "ringback_tone_ansi.caf"
case .callOutboundRinging: return "ringback_tone_ansi.caf"
case .callBusy: return "busy_tone_ansi.caf"
case .callFailure: return "end_call_tone_cept.caf"
case .callConnecting: return "ringback_tone_ansi.caf" // stringlint:disable
case .callOutboundRinging: return "ringback_tone_ansi.caf" // stringlint:disable
case .callBusy: return "busy_tone_ansi.caf" // stringlint:disable
case .callFailure: return "end_call_tone_cept.caf" // stringlint:disable
// Other
case .messageSent: return "message_sent.aiff"
case .none: return "silence.aiff"
case .messageSent: return "message_sent.aiff" // stringlint:disable
case .none: return "silence.aiff" // stringlint:disable
}
}

3
SessionSnodeKit/Types/ProxiedContentDownloader.swift
Unescape Escape View File

@ -1,6 +1,7 @@
//
// Copyright (c) 2019 Open Whisper Systems. All rights reserved.
//
// stringlint:disable
import Foundation
import Combine
@ -18,7 +19,7 @@ public extension Singleton {
identifier: "proxiedContentDownloader",
createInstance: { dependencies in
ProxiedContentDownloader(
downloadFolderName: "proxiedContent", // stringlint:disable
downloadFolderName: "proxiedContent",
using: dependencies
)
}

4
SessionTests/Conversations/Settings/ThreadSettingsViewModelSpec.swift
Unescape Escape View File

@ -517,7 +517,7 @@ class ThreadSettingsViewModelSpec: QuickSpec {
expect(modal?.info.title).to(equal("groupInformationSet".localized()))
expect(modal?.info.body).to(equal(
.input(
explanation: NSAttributedString(string: "Group name is visible to all group members."),
explanation: NSAttributedString(string: "groupNameVisible".localized()),
info: ConfirmationModal.Info.Body.InputInfo(
placeholder: "groupNameEnter".localized(),
initialValue: "TestGroup"
@ -948,7 +948,7 @@ class ThreadSettingsViewModelSpec: QuickSpec {
expect(modal?.info.title).to(equal("groupInformationSet".localized()))
expect(modal?.info.body).to(equal(
.input(
explanation: NSAttributedString(string: "Group name is visible to all group members."),
explanation: NSAttributedString(string: "groupNameVisible".localized()),
info: ConfirmationModal.Info.Body.InputInfo(
placeholder: "groupNameEnter".localized(),
initialValue: "TestGroup"

24
SessionUtilitiesKit/Database/Models/Setting.swift
Unescape Escape View File

@ -25,42 +25,30 @@ extension Setting {
// MARK: - Numeric Setting
fileprivate init?<T: Numeric>(key: String, value: T?) {
guard let value: T = value else { return nil }
var targetValue: T = value
guard var value: T = value else { return nil }
self.key = key
self.value = Data(bytes: &targetValue, count: MemoryLayout.size(ofValue: targetValue))
self.value = withUnsafeBytes(of: &value) { Data($0) }
}
fileprivate func value<T: Numeric>(as type: T.Type) -> T? {
// Note: The 'assumingMemoryBound' is essentially going to try to convert
// the memory into the provided type so can result in invalid data being
// returned if the type is incorrect. But it does seem safer than the 'load'
// method which crashed under certain circumstances (an `Int` value of 0)
return value.withUnsafeBytes {
$0.baseAddress?.assumingMemoryBound(to: T.self).pointee
$0.loadUnaligned(as: T.self)
}
}
// MARK: - Bool Setting
fileprivate init?(key: String, value: Bool?) {
guard let value: Bool = value else { return nil }
var targetValue: Bool = value
guard var value: Bool = value else { return nil }
self.key = key
self.value = Data(bytes: &targetValue, count: MemoryLayout.size(ofValue: targetValue))
self.value = withUnsafeBytes(of: &value) { Data($0) }
}
public func unsafeValue(as type: Bool.Type) -> Bool? {
// Note: The 'assumingMemoryBound' is essentially going to try to convert
// the memory into the provided type so can result in invalid data being
// returned if the type is incorrect. But it does seem safer than the 'load'
// method which crashed under certain circumstances (an `Int` value of 0)
return value.withUnsafeBytes {
$0.baseAddress?.assumingMemoryBound(to: Bool.self).pointee
$0.loadUnaligned(as: Bool.self)
}
}

2
SessionUtilitiesKit/General/Feature.swift
Unescape Escape View File

@ -215,6 +215,8 @@ public struct FeatureValue<R> {
// MARK: - Bool FeatureOption
extension Bool: @retroactive CaseIterable {}
extension Bool: @retroactive RawRepresentable {}
extension Bool: FeatureOption {
public static let allCases: [Bool] = [false, true]

2
SessionUtilitiesKit/General/UIDevice+featureSupport.swift
Unescape Escape View File

@ -41,7 +41,7 @@ public extension UIDevice {
func ows_setOrientation(_ orientation: UIInterfaceOrientation) {
// XXX - This is not officially supported, but there's no other way to programmatically rotate
// the interface.
let orientationKey = "orientation"
let orientationKey = "orientation" // stringlint:disable
self.setValue(orientation.rawValue, forKey: orientationKey)
// Not strictly necessary for the orientation to appear as changed

2
SessionUtilitiesKit/JobRunner/JobRunnerError.swift
Unescape Escape View File

@ -1,4 +1,6 @@
// Copyright © 2022 Rangeproof Pty Ltd. All rights reserved.
//
// stringlint:disable
import Foundation

7
SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorCropViewController.swift
Unescape Escape View File

@ -241,9 +241,10 @@ class ImageEditorCropViewController: OWSViewController {
Log.error("[ImageEditorCropViewController] Missing cropLockButton")
return
}
cropLockButton.setImage(imageName: (isCropLocked
? "image_editor_crop_lock"
: "image_editor_crop_unlock"))
cropLockButton.setImage(imageName: (isCropLocked ?
"image_editor_crop_lock" : // stringlint:disable
"image_editor_crop_unlock" // stringlint:disable
))
}
@objc

4
SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorTextViewController.swift
Unescape Escape View File

@ -76,8 +76,8 @@ private class VAlignTextView: UITextView {
override var keyCommands: [UIKeyCommand]? {
return [
UIKeyCommand(input: "\r", modifierFlags: .command, action: #selector(self.modifiedReturnPressed(sender:)), discoverabilityTitle: "Add Text"),
UIKeyCommand(input: "\r", modifierFlags: .alternate, action: #selector(self.modifiedReturnPressed(sender:)), discoverabilityTitle: "Add Text")
UIKeyCommand(input: "\r", modifierFlags: .command, action: #selector(self.modifiedReturnPressed(sender:))),
UIKeyCommand(input: "\r", modifierFlags: .alternate, action: #selector(self.modifiedReturnPressed(sender:)))
]
}

4
SignalUtilitiesKit/Media Viewing & Editing/MediaMessageView.swift
Unescape Escape View File

@ -278,7 +278,7 @@ public class MediaMessageView: UIView {
if attachment.isUrl {
// We only load Link Previews for HTTPS urls so append an explanation for not
if let linkPreviewURL: String = linkPreviewInfo?.url {
if let targetUrl: URL = URL(string: linkPreviewURL), targetUrl.scheme?.lowercased() != "https" {
if let targetUrl: URL = URL(string: linkPreviewURL), targetUrl.scheme?.lowercased() != "https" { // stringlint:disable
label.font = UIFont.systemFont(ofSize: Values.verySmallFontSize)
label.text = "linkPreviewsErrorUnsecure".localized()
label.themeTextColor = (mode == .attachmentApproval ?
@ -505,7 +505,7 @@ public class MediaMessageView: UIView {
self?.subtitleLabel.isHidden = false
// Set the error text appropriately
if let targetUrl: URL = URL(string: linkPreviewURL), targetUrl.scheme?.lowercased() != "https" {
if let targetUrl: URL = URL(string: linkPreviewURL), targetUrl.scheme?.lowercased() != "https" { // stringlint:disable
// This error case is handled already in the 'subtitleLabel' creation
}
else {

2
SignalUtilitiesKit/Media Viewing & Editing/OWSVideoPlayer.swift
Unescape Escape View File

@ -18,7 +18,7 @@ public class OWSVideoPlayer {
@objc public init(url: URL) {
self.avPlayer = AVPlayer(url: url)
self.audioActivity = AudioActivity(audioDescription: "[OWSVideoPlayer] url:\(url)", behavior: .playback)
self.audioActivity = AudioActivity(audioDescription: "[OWSVideoPlayer] url:\(url)", behavior: .playback) // stringlint:disable
NotificationCenter.default.addObserver(self,
selector: #selector(playerItemDidPlayToCompletion(_:)),

8
SignalUtilitiesKit/Screen Lock/ScreenLock.swift
Unescape Escape View File

@ -170,14 +170,6 @@ public class ScreenLock {
Log.error(.screenLock, "Local authentication error: biometryNotEnrolled.")
return .failure(error: "lockAppEnablePasscode".localized())
case .biometryLockout:
Log.error(.screenLock, "Local authentication error: biometryLockout.")
return .failure(error: "lockAppEnablePasscode".localized())
case .biometryNotEnrolled:
Log.error(.screenLock, "Local authentication error: biometryNotEnrolled.")
return .failure(error: "lockAppEnablePasscode".localized())
case .biometryLockout:
Log.error(.screenLock, "Local authentication error: biometryLockout.")
return .failure(error: "authenticateFailedTooManyAttempts".localized())

2
SignalUtilitiesKit/Screen Lock/ScreenLockViewController.swift
Unescape Escape View File

@ -95,7 +95,7 @@ open class ScreenLockViewController: UIViewController {
self.logoView.isHidden = !shouldShowBlockWindow
let signature: String = String(format: "%d", shouldHaveScreenLock)
let signature: String = String(format: "%d", shouldHaveScreenLock) // stringlint:disable
// Skip redundant work to avoid interfering with ongoing animations
guard signature != self.screenBlockingSignature else { return }

142
SignalUtilitiesKit/Utilities/ParamParser.swift
Unescape Escape View File

@ -1,142 +0,0 @@
//
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
import Foundation
// A DSL for parsing expected and optional values from a Dictionary, appropriate for
// validating a service response.
//
// Additionally it includes some helpers to DRY up common conversions.
//
// Rather than exhaustively enumerate accessors for types like `requireUInt32`, `requireInt64`, etc.
// We instead leverage generics at the call site.
//
// do {
// // Required
// let name: String = try paramParser.required(key: "name")
// let count: UInt32 = try paramParser.required(key: "count")
//
// // Optional
// let last_seen: Date? = try paramParser.optional(key: "last_seen")
//
// return Foo(name: name, count: count, isNew: lastSeen == nil)
// } catch {
// handleInvalidResponse(error: error)
// }
//
public class ParamParser {
public typealias Key = AnyHashable
let dictionary: Dictionary<Key, Any>
public init(dictionary: Dictionary<Key, Any>) {
self.dictionary = dictionary
}
public convenience init?(responseObject: Any?) {
guard let responseDict = responseObject as? [String: AnyObject] else {
return nil
}
self.init(dictionary: responseDict)
}
// MARK: Errors
public enum ParseError: Error {
case missingField(Key)
case invalidFormat(Key)
}
private func invalid(key: Key) -> ParseError {
return ParseError.invalidFormat(key)
}
private func missing(key: Key) -> ParseError {
return ParseError.missingField(key)
}
// MARK: - Public API
public func required<T>(key: Key) throws -> T {
guard let value: T = try optional(key: key) else {
throw missing(key: key)
}
return value
}
public func optional<T>(key: Key) throws -> T? {
guard let someValue = dictionary[key] else {
return nil
}
guard !(someValue is NSNull) else {
return nil
}
guard let typedValue = someValue as? T else {
throw invalid(key: key)
}
return typedValue
}
// MARK: FixedWidthIntegers (e.g. Int, Int32, UInt, UInt32, etc.)
// You can't blindly cast accross Integer types, so we need to specify and validate which Int type we want.
// In general, you'll find numeric types parsed into a Dictionary as `Int`.
public func required<T>(key: Key) throws -> T where T: FixedWidthInteger {
guard let value: T = try optional(key: key) else {
throw missing(key: key)
}
return value
}
public func optional<T>(key: Key) throws -> T? where T: FixedWidthInteger {
guard let someValue: Any = try optional(key: key) else {
return nil
}
switch someValue {
case let typedValue as T:
return typedValue
case let int as Int:
guard int >= T.min, int <= T.max else {
throw invalid(key: key)
}
return T(int)
default:
throw invalid(key: key)
}
}
// MARK: Base64 Data
public func requiredBase64EncodedData(key: Key) throws -> Data {
guard let data: Data = try optionalBase64EncodedData(key: key) else {
throw ParseError.missingField(key)
}
return data
}
public func optionalBase64EncodedData(key: Key) throws -> Data? {
guard let encodedData: String = try self.optional(key: key) else {
return nil
}
guard let data = Data(base64Encoded: encodedData) else {
throw ParseError.invalidFormat(key)
}
guard data.count > 0 else {
return nil
}
return data
}
}
Write Preview
Loading…
Cancel
Save