From 5e894c11495ab8c911ffed986c228d7b41a7dabd Mon Sep 17 00:00:00 2001 From: Mikunj Date: Fri, 3 May 2019 11:42:56 +1000 Subject: [PATCH] Fixes stuff that broke during merge --- LokiKit/LokiKit/Mnemonic/Mnemonic.swift | 20 +++--- Signal.xcodeproj/project.pbxproj | 72 ++++--------------- .../xcshareddata/xcschemes/Signal.xcscheme | 18 ++++- .../{LokiUtil => Loki}/LokiMessagingAPI.swift | 0 4 files changed, 39 insertions(+), 71 deletions(-) rename Signal/src/util/{LokiUtil => Loki}/LokiMessagingAPI.swift (100%) diff --git a/LokiKit/LokiKit/Mnemonic/Mnemonic.swift b/LokiKit/LokiKit/Mnemonic/Mnemonic.swift index f1ade5cf8..9dad42123 100644 --- a/LokiKit/LokiKit/Mnemonic/Mnemonic.swift +++ b/LokiKit/LokiKit/Mnemonic/Mnemonic.swift @@ -1,16 +1,16 @@ import CryptoSwift /// Based on [mnemonic.js](https://github.com/loki-project/loki-messenger/blob/development/libloki/modules/mnemonic.js) . -enum Mnemonic { +public enum Mnemonic { - struct Language : Hashable { + public struct Language : Hashable { let filename: String let prefixLength: Int - static let english = Language(filename: "english", prefixLength: 3) - static let japanese = Language(filename: "japanese", prefixLength: 3) - static let portuguese = Language(filename: "portuguese", prefixLength: 4) - static let spanish = Language(filename: "spanish", prefixLength: 4) + public static let english = Language(filename: "english", prefixLength: 3) + public static let japanese = Language(filename: "japanese", prefixLength: 3) + public static let portuguese = Language(filename: "portuguese", prefixLength: 4) + public static let spanish = Language(filename: "spanish", prefixLength: 4) private static var wordSetCache: [Language:[String]] = [:] private static var truncatedWordSetCache: [Language:[String]] = [:] @@ -43,10 +43,10 @@ enum Mnemonic { } } - enum DecodingError : LocalizedError { + public enum DecodingError : LocalizedError { case generic, inputTooShort, missingLastWord, invalidWord, verificationFailed - var errorDescription: String { + public var errorDescription: String { switch self { case .generic: return NSLocalizedString("Something went wrong. Please check your mnemonic and try again.", comment: "") case .inputTooShort: return NSLocalizedString("Looks like you didn't enter enough words. Please check your mnemonic and try again.", comment: "") @@ -57,7 +57,7 @@ enum Mnemonic { } } - static func encode(hexEncodedString string: String, language: Language = .english) -> String { + public static func encode(hexEncodedString string: String, language: Language = .english) -> String { var string = string let wordSet = language.loadWordSet() let prefixLength = language.prefixLength @@ -87,7 +87,7 @@ enum Mnemonic { return result.joined(separator: " ") } - static func decode(mnemonic: String, language: Language = .english) throws -> String { + public static func decode(mnemonic: String, language: Language = .english) throws -> String { var words = mnemonic.split(separator: " ").map { String($0) } let truncatedWordSet = language.loadTruncatedWordSet() let prefixLength = language.prefixLength diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index db2b436de..e0389f85d 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 242D3F4B227966A30035F945 /* ProofOfWork.swift in Sources */ = {isa = PBXBuildFile; fileRef = 242D3F4A227966A20035F945 /* ProofOfWork.swift */; }; + 2482B0CA227BD34D00143B38 /* LokiMessagingAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2482B0C9227BD34D00143B38 /* LokiMessagingAPI.swift */; }; 2AE2882E4C2B96BFFF9EE27C /* Pods_SignalShareExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F94C85CB0B235DA37F68ED0 /* Pods_SignalShareExtension.framework */; }; 3403B95D20EA9527001A1F44 /* OWSContactShareButtonsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3403B95B20EA9526001A1F44 /* OWSContactShareButtonsView.m */; }; 34074F61203D0CBE004596AE /* OWSSounds.m in Sources */ = {isa = PBXBuildFile; fileRef = 34074F5F203D0CBD004596AE /* OWSSounds.m */; }; @@ -558,15 +558,6 @@ B6FE7EB71ADD62FA00A6D22F /* PushKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6FE7EB61ADD62FA00A6D22F /* PushKit.framework */; }; B821F2F82272CED3002C88C0 /* OnboardingAccountDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B821F2F72272CED3002C88C0 /* OnboardingAccountDetailsViewController.swift */; }; B821F2FA2272CEEE002C88C0 /* OnboardingKeyPairViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B821F2F92272CEEE002C88C0 /* OnboardingKeyPairViewController.swift */; }; - B858E395227BCB4F00C1722C /* BuildConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B858E394227BCB4F00C1722C /* BuildConfiguration.swift */; }; - B8DC3D7722795E2400D909D6 /* ECKeyPair.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8DC3D7422795E2300D909D6 /* ECKeyPair.swift */; }; - B8DC3D7822795E2400D909D6 /* ECKeyPair.m in Sources */ = {isa = PBXBuildFile; fileRef = B8DC3D7522795E2300D909D6 /* ECKeyPair.m */; }; - B8DC3D7922795E2400D909D6 /* LokiMessagingAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8DC3D7622795E2400D909D6 /* LokiMessagingAPI.swift */; }; - B8DC3D8022795E4000D909D6 /* portuguese.txt in Resources */ = {isa = PBXBuildFile; fileRef = B8DC3D7B22795E4000D909D6 /* portuguese.txt */; }; - B8DC3D8122795E4000D909D6 /* spanish.txt in Resources */ = {isa = PBXBuildFile; fileRef = B8DC3D7C22795E4000D909D6 /* spanish.txt */; }; - B8DC3D8222795E4000D909D6 /* Mnemonic.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8DC3D7D22795E4000D909D6 /* Mnemonic.swift */; }; - B8DC3D8322795E4000D909D6 /* english.txt in Resources */ = {isa = PBXBuildFile; fileRef = B8DC3D7E22795E4000D909D6 /* english.txt */; }; - B8DC3D8422795E4000D909D6 /* japanese.txt in Resources */ = {isa = PBXBuildFile; fileRef = B8DC3D7F22795E4000D909D6 /* japanese.txt */; }; B90418E6183E9DD40038554A /* DateUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B90418E5183E9DD40038554A /* DateUtil.m */; }; B9EB5ABD1884C002007CBB57 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9EB5ABC1884C002007CBB57 /* MessageUI.framework */; }; BFF3FB9730634F37D25903F4 /* Pods_Signal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D17BB5C25D615AB49813100C /* Pods_Signal.framework */; }; @@ -661,7 +652,7 @@ 0F94C85CB0B235DA37F68ED0 /* Pods_SignalShareExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SignalShareExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1C93CF3971B64E8B6C1F9AC1 /* Pods-SignalShareExtension.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SignalShareExtension.test.xcconfig"; path = "Pods/Target Support Files/Pods-SignalShareExtension/Pods-SignalShareExtension.test.xcconfig"; sourceTree = ""; }; 1CE3CD5C23334683BDD3D78C /* Pods-Signal.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Signal.test.xcconfig"; path = "Pods/Target Support Files/Pods-Signal/Pods-Signal.test.xcconfig"; sourceTree = ""; }; - 242D3F4A227966A20035F945 /* ProofOfWork.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProofOfWork.swift; sourceTree = ""; }; + 2482B0C9227BD34D00143B38 /* LokiMessagingAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LokiMessagingAPI.swift; sourceTree = ""; }; 264242150E87D10A357DB07B /* Pods_SignalMessaging.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SignalMessaging.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3403B95B20EA9526001A1F44 /* OWSContactShareButtonsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSContactShareButtonsView.m; sourceTree = ""; }; 3403B95C20EA9527001A1F44 /* OWSContactShareButtonsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSContactShareButtonsView.h; sourceTree = ""; }; @@ -1352,16 +1343,6 @@ B6FE7EB61ADD62FA00A6D22F /* PushKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PushKit.framework; path = System/Library/Frameworks/PushKit.framework; sourceTree = SDKROOT; }; B821F2F72272CED3002C88C0 /* OnboardingAccountDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingAccountDetailsViewController.swift; sourceTree = ""; }; B821F2F92272CEEE002C88C0 /* OnboardingKeyPairViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingKeyPairViewController.swift; sourceTree = ""; }; - B858E394227BCB4F00C1722C /* BuildConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuildConfiguration.swift; sourceTree = ""; }; - B8DC3D7322795E2300D909D6 /* ECKeyPair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ECKeyPair.h; sourceTree = ""; }; - B8DC3D7422795E2300D909D6 /* ECKeyPair.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ECKeyPair.swift; sourceTree = ""; }; - B8DC3D7522795E2300D909D6 /* ECKeyPair.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ECKeyPair.m; sourceTree = ""; }; - B8DC3D7622795E2400D909D6 /* LokiMessagingAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LokiMessagingAPI.swift; sourceTree = ""; }; - B8DC3D7B22795E4000D909D6 /* portuguese.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = portuguese.txt; sourceTree = ""; }; - B8DC3D7C22795E4000D909D6 /* spanish.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = spanish.txt; sourceTree = ""; }; - B8DC3D7D22795E4000D909D6 /* Mnemonic.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Mnemonic.swift; sourceTree = ""; }; - B8DC3D7E22795E4000D909D6 /* english.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = english.txt; sourceTree = ""; }; - B8DC3D7F22795E4000D909D6 /* japanese.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = japanese.txt; sourceTree = ""; }; B90418E4183E9DD40038554A /* DateUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateUtil.h; sourceTree = ""; }; B90418E5183E9DD40038554A /* DateUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateUtil.m; sourceTree = ""; }; B97940251832BD2400BD66CB /* UIUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIUtil.h; sourceTree = ""; }; @@ -1475,6 +1456,14 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 2482B0C8227BD34D00143B38 /* Loki */ = { + isa = PBXGroup; + children = ( + 2482B0C9227BD34D00143B38 /* LokiMessagingAPI.swift */, + ); + path = Loki; + sourceTree = ""; + }; 34074F54203D0722004596AE /* Sounds */ = { isa = PBXGroup; children = ( @@ -2437,9 +2426,10 @@ isa = PBXGroup; children = ( 4CC1ECFA211A553000CC13BE /* AppUpdateNag.swift */, - B90418E4183E9DD40038554A /* DateUtil.h */, 3496956121A301A100DCFE74 /* Backup */, + B90418E4183E9DD40038554A /* DateUtil.h */, B90418E5183E9DD40038554A /* DateUtil.m */, + 2482B0C8227BD34D00143B38 /* Loki */, 34B0796C1FCF46B000E248C2 /* MainAppContext.h */, 34B0796B1FCF46B000E248C2 /* MainAppContext.m */, 34D99C911F2937CC00D284D6 /* OWSAnalytics.swift */, @@ -2614,36 +2604,9 @@ name = Translations; sourceTree = ""; }; - B8DC3D7222795D7000D909D6 /* LokiKit */ = { - isa = PBXGroup; - children = ( - B8DC3D7A22795E2C00D909D6 /* Mnemonic */, - B858E394227BCB4F00C1722C /* BuildConfiguration.swift */, - B8DC3D7322795E2300D909D6 /* ECKeyPair.h */, - B8DC3D7522795E2300D909D6 /* ECKeyPair.m */, - B8DC3D7422795E2300D909D6 /* ECKeyPair.swift */, - B8DC3D7622795E2400D909D6 /* LokiMessagingAPI.swift */, - 242D3F4A227966A20035F945 /* ProofOfWork.swift */, - ); - path = LokiKit; - sourceTree = ""; - }; - B8DC3D7A22795E2C00D909D6 /* Mnemonic */ = { - isa = PBXGroup; - children = ( - B8DC3D7E22795E4000D909D6 /* english.txt */, - B8DC3D7F22795E4000D909D6 /* japanese.txt */, - B8DC3D7B22795E4000D909D6 /* portuguese.txt */, - B8DC3D7C22795E4000D909D6 /* spanish.txt */, - B8DC3D7D22795E4000D909D6 /* Mnemonic.swift */, - ); - path = Mnemonic; - sourceTree = ""; - }; D221A07E169C9E5E00537ABF = { isa = PBXGroup; children = ( - B8DC3D7222795D7000D909D6 /* LokiKit */, D221A093169C9E5E00537ABF /* Signal */, 453518691FC635DD00210559 /* SignalShareExtension */, 453518931FC63DBF00210559 /* SignalMessaging */, @@ -3142,11 +3105,9 @@ 45B74A812044AAB600CD42F8 /* chord-quiet.aifc in Resources */, 45B74A832044AAB600CD42F8 /* circles.aifc in Resources */, 45B74A892044AAB600CD42F8 /* circles-quiet.aifc in Resources */, - B8DC3D8022795E4000D909D6 /* portuguese.txt in Resources */, 4503F1BF20470A5B00CEE724 /* classic.aifc in Resources */, 4503F1BE20470A5B00CEE724 /* classic-quiet.aifc in Resources */, 45B74A7E2044AAB600CD42F8 /* complete.aifc in Resources */, - B8DC3D8322795E4000D909D6 /* english.txt in Resources */, 45B74A872044AAB600CD42F8 /* complete-quiet.aifc in Resources */, 45B74A772044AAB600CD42F8 /* hello.aifc in Resources */, 4C61819F219E1796009BD6B5 /* typing-animation-dark.gif in Resources */, @@ -3154,13 +3115,11 @@ 45B74A792044AAB600CD42F8 /* input.aifc in Resources */, 45B74A8C2044AAB600CD42F8 /* input-quiet.aifc in Resources */, 45B74A7A2044AAB600CD42F8 /* keys.aifc in Resources */, - B8DC3D8122795E4000D909D6 /* spanish.txt in Resources */, 45B74A762044AAB600CD42F8 /* keys-quiet.aifc in Resources */, 45B74A862044AAB600CD42F8 /* note.aifc in Resources */, 45B74A7F2044AAB600CD42F8 /* note-quiet.aifc in Resources */, 45B74A842044AAB600CD42F8 /* popcorn.aifc in Resources */, 45B74A7D2044AAB600CD42F8 /* popcorn-quiet.aifc in Resources */, - B8DC3D8422795E4000D909D6 /* japanese.txt in Resources */, 45B74A822044AAB600CD42F8 /* pulse.aifc in Resources */, 34B6A90B218BA1D1007C4606 /* typing-animation.gif in Resources */, 45B74A802044AAB600CD42F8 /* pulse-quiet.aifc in Resources */, @@ -3623,7 +3582,6 @@ 4C1885D2218F8E1C00B67051 /* PhotoGridViewCell.swift in Sources */, 45C9DEB81DF4E35A0065CA84 /* WebRTCCallMessageHandler.swift in Sources */, 34D1F0501F7D45A60066283D /* GifPickerCell.swift in Sources */, - B8DC3D8222795E4000D909D6 /* Mnemonic.swift in Sources */, 3496957421A301A100DCFE74 /* OWSBackupAPI.swift in Sources */, 34D99C931F2937CC00D284D6 /* OWSAnalytics.swift in Sources */, 340FC8B8204DAC8D007AEB0F /* AddToGroupViewController.m in Sources */, @@ -3634,7 +3592,6 @@ 340FC8B4204DAC8D007AEB0F /* OWSBackupSettingsViewController.m in Sources */, 34D1F0871F8678AA0066283D /* ConversationViewItem.m in Sources */, 451A13B11E13DED2000A50FD /* AppNotifications.swift in Sources */, - B8DC3D7822795E2400D909D6 /* ECKeyPair.m in Sources */, 34D99CE4217509C2000AFB39 /* AppEnvironment.swift in Sources */, 348570A820F67575004FF32B /* OWSMessageHeaderView.m in Sources */, 450DF2091E0DD2C6003D14BE /* UserNotificationsAdaptee.swift in Sources */, @@ -3651,7 +3608,6 @@ 34D2CCE0206939B400CB1A14 /* DebugUIMessagesAssetLoader.m in Sources */, 4CEB78C92178EBAB00F315D2 /* OWSSessionResetJobRecord.m in Sources */, 45794E861E00620000066731 /* CallUIAdapter.swift in Sources */, - 242D3F4B227966A30035F945 /* ProofOfWork.swift in Sources */, 340FC8BA204DAC8D007AEB0F /* FingerprintViewScanController.m in Sources */, 4585C4681ED8F8D200896AEA /* SafetyNumberConfirmationAlert.swift in Sources */, 4C20B2B920CA10DE001BAC90 /* ConversationSearchViewController.swift in Sources */, @@ -3788,7 +3744,6 @@ 340FC8B6204DAC8D007AEB0F /* OWSQRCodeScanningViewController.m in Sources */, 4CB5F26920F7D060004D1B42 /* MessageActions.swift in Sources */, 340FC8B5204DAC8D007AEB0F /* AboutTableViewController.m in Sources */, - B8DC3D7722795E2400D909D6 /* ECKeyPair.swift in Sources */, 34BECE2B1F74C12700D7438D /* DebugUIStress.m in Sources */, 340FC8B9204DAC8D007AEB0F /* UpdateGroupViewController.m in Sources */, 3448E1662215B313004B052E /* OnboardingCaptchaViewController.swift in Sources */, @@ -3807,17 +3762,16 @@ 346B66311F4E29B200E5122F /* CropScaleImageViewController.swift in Sources */, 45E5A6991F61E6DE001E4A8A /* MarqueeLabel.swift in Sources */, 34D1F0B01F867BFC0066283D /* OWSSystemMessageCell.m in Sources */, - B858E395227BCB4F00C1722C /* BuildConfiguration.swift in Sources */, 45A663C51F92EC760027B59E /* GroupTableViewCell.swift in Sources */, 34CA631B2097806F00E526A0 /* OWSContactShareView.m in Sources */, 34D1F0861F8678AA0066283D /* ConversationViewController.m in Sources */, + 2482B0CA227BD34D00143B38 /* LokiMessagingAPI.swift in Sources */, 3427C64320F500E000EEC730 /* OWSMessageTimerView.m in Sources */, B90418E6183E9DD40038554A /* DateUtil.m in Sources */, 3448E15E221333F5004B052E /* OnboardingController.swift in Sources */, 340FC8BD204DAC8D007AEB0F /* ShowGroupMembersViewController.m in Sources */, 3496956F21A301A100DCFE74 /* OWSBackupLazyRestore.swift in Sources */, 459311FC1D75C948008DD4F0 /* OWSDeviceTableViewCell.m in Sources */, - B8DC3D7922795E2400D909D6 /* LokiMessagingAPI.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme index 3117b9039..a52676373 100644 --- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme +++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme @@ -28,12 +28,26 @@ buildForAnalyzing = "YES"> + + + + diff --git a/Signal/src/util/LokiUtil/LokiMessagingAPI.swift b/Signal/src/util/Loki/LokiMessagingAPI.swift similarity index 100% rename from Signal/src/util/LokiUtil/LokiMessagingAPI.swift rename to Signal/src/util/Loki/LokiMessagingAPI.swift