Fixed compile issue and bumped version number

pull/988/head
Morgan Pretty 8 months ago
parent 2032dafc74
commit 07cbbbbd94

@ -1812,7 +1812,6 @@
FD6A39442C2B783D00762359 /* UINavigationController+Utilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UINavigationController+Utilities.swift"; sourceTree = "<group>"; };
FD6A39482C2BB85A00762359 /* Crypto+Attachments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Crypto+Attachments.swift"; sourceTree = "<group>"; };
FD6A39702C2E3F5800762359 /* GRDBExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GRDBExtensions.swift; sourceTree = "<group>"; };
FD6A39762C2E885600762359 /* SSKMockedExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SSKMockedExtensions.swift; sourceTree = "<group>"; };
FD6A7A682818BE7300035AC1 /* RetrieveDefaultOpenGroupRoomsJob.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RetrieveDefaultOpenGroupRoomsJob.swift; sourceTree = "<group>"; };
FD6A7A6A2818C17C00035AC1 /* UpdateProfilePictureJob.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateProfilePictureJob.swift; sourceTree = "<group>"; };
FD6A7A6C2818C61500035AC1 /* _002_SetupStandardJobs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = _002_SetupStandardJobs.swift; sourceTree = "<group>"; };
@ -3539,7 +3538,6 @@
FDE7214E287E50D50093DF33 /* Scripts */,
D221A08C169C9E5E00537ABF /* Frameworks */,
D221A08A169C9E5E00537ABF /* Products */,
FD2DD58D2C6DB8A70073D9BE /* Recovered References */,
);
sourceTree = "<group>";
};
@ -3838,14 +3836,6 @@
path = Database;
sourceTree = "<group>";
};
FD2DD58D2C6DB8A70073D9BE /* Recovered References */ = {
isa = PBXGroup;
children = (
FD6A39762C2E885600762359 /* SSKMockedExtensions.swift */,
);
name = "Recovered References";
sourceTree = "<group>";
};
FD37E9C428A1C701003AE748 /* Themes */ = {
isa = PBXGroup;
children = (
@ -7679,7 +7669,7 @@
CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 471;
CURRENT_PROJECT_VERSION = 472;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -7716,7 +7706,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 2.7.0;
MARKETING_VERSION = 2.7.1;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"-fobjc-arc-exceptions",
@ -7757,7 +7747,7 @@
CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 471;
CURRENT_PROJECT_VERSION = 472;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
@ -7789,7 +7779,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 2.7.0;
MARKETING_VERSION = 2.7.1;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = (
"-DNS_BLOCK_ASSERTIONS=1",

@ -1141,12 +1141,7 @@ public class SignalAttachment: Equatable, Hashable {
isConvertibleToTextMessage.hash(into: &hasher)
isConvertibleToContactShare.hash(into: &hasher)
isVoiceMessage.hash(into: &hasher)
/// There was a crash in `AttachmentApprovalViewController` when trying to generate the hash
/// value to store in a dictionary, I'm guessing it's due to either `dataSource`, `cachedImage` or `cachedVideoPreview`
/// so, instead of trying to hash them directly which involves unknown behaviours due to `NSObject` & `UIImage` types, this
/// has been reworked to use primitives
dataSource.uniqueId.hash(into: &hasher)
dataSource.hash(into: &hasher)
cachedImage?.size.width.hash(into: &hasher)
cachedImage?.size.height.hash(into: &hasher)
cachedVideoPreview?.size.width.hash(into: &hasher)

Loading…
Cancel
Save