diff --git a/Podfile b/Podfile index 45d04c6ca..c572f9ea7 100644 --- a/Podfile +++ b/Podfile @@ -39,6 +39,10 @@ target 'SignalShareExtension' do shared_pods end +target 'SignalMessaging' do + shared_pods +end + post_install do |installer| # Disable some asserts when building for tests set_building_for_tests_config(installer, 'SignalServiceKit') diff --git a/Podfile.lock b/Podfile.lock index 430574b12..23d8fab2a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -193,6 +193,6 @@ SPEC CHECKSUMS: YapDatabase: cd911121580ff16675f65ad742a9eb0ab4d9e266 YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54 -PODFILE CHECKSUM: df609163e658e2e341c703a666541302f4e1d97f +PODFILE CHECKSUM: f096474080b243d44e1f2197b8789eb9384ded1c COCOAPODS: 1.3.1 diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 871e53517..cc55f41c0 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -25,9 +25,22 @@ 343A65981FC4CFE7000477A1 /* ConversationScrollButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 343A65961FC4CFE6000477A1 /* ConversationScrollButton.m */; }; 343D3D9B1E9283F100165CA4 /* BlockListUIUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 343D3D9A1E9283F100165CA4 /* BlockListUIUtils.m */; }; 34480B361FD0929200BC14EF /* ShareAppExtensionContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B351FD0929200BC14EF /* ShareAppExtensionContext.m */; }; + 34480B491FD0A60200BC14EF /* OWSMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B481FD0A60200BC14EF /* OWSMath.h */; }; + 34480B521FD0A7A400BC14EF /* OWSLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B4A1FD0A7A200BC14EF /* OWSLogger.h */; }; + 34480B531FD0A7A400BC14EF /* OWSLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B4B1FD0A7A300BC14EF /* OWSLogger.m */; }; + 34480B551FD0A7A400BC14EF /* DebugLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B4D1FD0A7A300BC14EF /* DebugLogger.h */; }; + 34480B561FD0A7A400BC14EF /* DebugLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B4E1FD0A7A300BC14EF /* DebugLogger.m */; }; + 34480B571FD0A7A400BC14EF /* OWSScrubbingLogFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B4F1FD0A7A300BC14EF /* OWSScrubbingLogFormatter.h */; }; + 34480B591FD0A7A400BC14EF /* OWSScrubbingLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B511FD0A7A400BC14EF /* OWSScrubbingLogFormatter.m */; }; + 34480B5B1FD0A7E300BC14EF /* SignalMessaging-Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 34480B5A1FD0A7E300BC14EF /* SignalMessaging-Prefix.pch */; }; + 34480B611FD0A98800BC14EF /* UIColor+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B5D1FD0A98800BC14EF /* UIColor+OWS.h */; }; + 34480B621FD0A98800BC14EF /* UIColor+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B5E1FD0A98800BC14EF /* UIColor+OWS.m */; }; + 34480B631FD0A98800BC14EF /* UIView+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B5F1FD0A98800BC14EF /* UIView+OWS.h */; }; + 34480B641FD0A98800BC14EF /* UIView+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B601FD0A98800BC14EF /* UIView+OWS.m */; }; + 34480B671FD0AA9400BC14EF /* UIFont+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 34480B651FD0AA9400BC14EF /* UIFont+OWS.m */; }; + 34480B681FD0AA9400BC14EF /* UIFont+OWS.h in Headers */ = {isa = PBXBuildFile; fileRef = 34480B661FD0AA9400BC14EF /* UIFont+OWS.h */; }; 344F2F671E57A932000D9322 /* UIViewController+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 344F2F661E57A932000D9322 /* UIViewController+OWS.m */; }; 34533F181EA8D2070006114F /* OWSAudioAttachmentPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 34533F171EA8D2070006114F /* OWSAudioAttachmentPlayer.m */; }; - 34535D821E256BE9008A4747 /* UIView+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = 34535D811E256BE9008A4747 /* UIView+OWS.m */; }; 3453D8EA1EC0D4ED003F9E6F /* OWSAlerts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3453D8E91EC0D4ED003F9E6F /* OWSAlerts.swift */; }; 345671011E89A5F1006EE662 /* ThreadUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 345671001E89A5F1006EE662 /* ThreadUtil.m */; }; 346B66311F4E29B200E5122F /* CropScaleImageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346B66301F4E29B200E5122F /* CropScaleImageViewController.swift */; }; @@ -197,7 +210,6 @@ 4563ADF11F22BD7100DEB8C7 /* OWS106EnsureProfileComplete.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4563ADF01F22BD7100DEB8C7 /* OWS106EnsureProfileComplete.swift */; }; 45666EC61D99483D008FE134 /* OWSAvatarBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 45666EC51D99483D008FE134 /* OWSAvatarBuilder.m */; }; 45666EC91D994C0D008FE134 /* OWSGroupAvatarBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 45666EC81D994C0D008FE134 /* OWSGroupAvatarBuilder.m */; }; - 45666F561D9B2827008FE134 /* OWSScrubbingLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 45666F551D9B2827008FE134 /* OWSScrubbingLogFormatter.m */; }; 45666F581D9B2880008FE134 /* OWSScrubbingLogFormatterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45666F571D9B2880008FE134 /* OWSScrubbingLogFormatterTest.m */; }; 45666F761D9BFE00008FE134 /* OWS100RemoveTSRecipientsMigration.m in Sources */ = {isa = PBXBuildFile; fileRef = 45666F751D9BFE00008FE134 /* OWS100RemoveTSRecipientsMigration.m */; }; 45666F7B1D9C0533008FE134 /* OWSDatabaseMigration.m in Sources */ = {isa = PBXBuildFile; fileRef = 45666F7A1D9C0533008FE134 /* OWSDatabaseMigration.m */; }; @@ -253,7 +265,6 @@ 45C9DEB91DF4E35A0065CA84 /* WebRTCCallMessageHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45C9DEB71DF4E35A0065CA84 /* WebRTCCallMessageHandler.swift */; }; 45CB2FA81CB7146C00E1B343 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 45CB2FA71CB7146C00E1B343 /* Launch Screen.storyboard */; }; 45CD81EF1DC030E7004C9430 /* AccountManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45CD81EE1DC030E7004C9430 /* AccountManager.swift */; }; - 45CD81F21DC03A22004C9430 /* OWSLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 45CD81F11DC03A22004C9430 /* OWSLogger.m */; }; 45D231771DC7E8F10034FA89 /* SessionResetJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45D231761DC7E8F10034FA89 /* SessionResetJob.swift */; }; 45D231781DC7E8F10034FA89 /* SessionResetJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45D231761DC7E8F10034FA89 /* SessionResetJob.swift */; }; 45DF5DF21DDB843F00C936C7 /* CompareSafetyNumbersActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45DF5DF11DDB843F00C936C7 /* CompareSafetyNumbersActivity.swift */; }; @@ -279,6 +290,7 @@ 45FBC5C91DF8575700E9B410 /* CallKitCallManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45FBC59A1DF8575700E9B410 /* CallKitCallManager.swift */; }; 45FBC5D11DF8592E00E9B410 /* SignalCall.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45FBC5D01DF8592E00E9B410 /* SignalCall.swift */; }; 45FBC5D21DF8592E00E9B410 /* SignalCall.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45FBC5D01DF8592E00E9B410 /* SignalCall.swift */; }; + 4AC4EA13C8A444455DAB351F /* Pods_SignalMessaging.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 264242150E87D10A357DB07B /* Pods_SignalMessaging.framework */; }; 70377AAB1918450100CAF501 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70377AAA1918450100CAF501 /* MobileCoreServices.framework */; }; 7038632718F70C0700D4A43F /* CryptoTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 7038632418F70C0700D4A43F /* CryptoTools.m */; }; 768A1A2B17FC9CD300E00ED8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 768A1A2A17FC9CD300E00ED8 /* libz.dylib */; }; @@ -341,15 +353,12 @@ B660F7171C29988E00687D6E /* OWSContactsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB040918170B33006006FC /* OWSContactsManager.m */; }; B660F7181C29988E00687D6E /* CryptoTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 7038632418F70C0700D4A43F /* CryptoTools.m */; }; B660F71B1C29988E00687D6E /* Environment.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB041318170B33006006FC /* Environment.m */; }; - B660F71C1C29988E00687D6E /* DebugLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = B6C93C4D199567AD00EDF894 /* DebugLogger.m */; }; B660F71F1C29988E00687D6E /* OWSPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB041918170B33006006FC /* OWSPreferences.m */; }; B660F7201C29988E00687D6E /* Release.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB041B18170B33006006FC /* Release.m */; }; B660F7211C29988E00687D6E /* SignalKeyingStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B1013B196D213F007E3930 /* SignalKeyingStorage.m */; }; B660F7221C29988E00687D6E /* VersionMigrations.m in Sources */ = {isa = PBXBuildFile; fileRef = B60C16641988999D00E97A6C /* VersionMigrations.m */; }; B660F7561C29988E00687D6E /* PushManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B9ECFB198B31BA00C620D3 /* PushManager.m */; }; B660F7721C29988E00687D6E /* AppStoreRating.m in Sources */ = {isa = PBXBuildFile; fileRef = B6DA6B061B8A2F9A00CA6F98 /* AppStoreRating.m */; }; - B660F7751C29988E00687D6E /* UIColor+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = FCFA64B31A24F3880007FB87 /* UIColor+OWS.m */; }; - B660F7761C29988E00687D6E /* UIFont+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = FCFA64B61A24F6730007FB87 /* UIFont+OWS.m */; }; B660F7771C29988E00687D6E /* UIImage+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = B68112E91A4D9EC400BA82FF /* UIImage+OWS.m */; }; B660F77F1C29988E00687D6E /* DateUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B90418E5183E9DD40038554A /* DateUtil.m */; }; B660F7811C29988E00687D6E /* FunctionalUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB04EB18170B33006006FC /* FunctionalUtil.m */; }; @@ -364,7 +373,6 @@ B6B1013C196D213F007E3930 /* SignalKeyingStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B1013B196D213F007E3930 /* SignalKeyingStorage.m */; }; B6B226971BE4B7D200860F4D /* ContactsUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6B226961BE4B7D200860F4D /* ContactsUI.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; B6B9ECFC198B31BA00C620D3 /* PushManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B9ECFB198B31BA00C620D3 /* PushManager.m */; }; - B6C93C4E199567AD00EDF894 /* DebugLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = B6C93C4D199567AD00EDF894 /* DebugLogger.m */; }; B6DA6B071B8A2F9A00CA6F98 /* AppStoreRating.m in Sources */ = {isa = PBXBuildFile; fileRef = B6DA6B061B8A2F9A00CA6F98 /* AppStoreRating.m */; }; B6F509971AA53F760068F56A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B6F509951AA53F760068F56A /* Localizable.strings */; }; B6FE7EB71ADD62FA00A6D22F /* PushKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6FE7EB61ADD62FA00A6D22F /* PushKit.framework */; }; @@ -400,8 +408,6 @@ FC9120411A39EFB70074545C /* qr@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC91203F1A39EFB70074545C /* qr@2x.png */; }; FCB11D8C1A129A76002F93FB /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCB11D8B1A129A76002F93FB /* CoreMedia.framework */; }; FCC81A981A44558300DFEC7D /* UIDevice+TSHardwareVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = FCC81A971A44558300DFEC7D /* UIDevice+TSHardwareVersion.m */; }; - FCFA64B41A24F3880007FB87 /* UIColor+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = FCFA64B31A24F3880007FB87 /* UIColor+OWS.m */; }; - FCFA64B71A24F6730007FB87 /* UIFont+OWS.m in Sources */ = {isa = PBXBuildFile; fileRef = FCFA64B61A24F6730007FB87 /* UIFont+OWS.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -464,7 +470,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 = ""; }; - 34009B651EC4CB11001D95D1 /* OWSMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSMath.h; sourceTree = ""; }; + 264242150E87D10A357DB07B /* Pods_SignalMessaging.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SignalMessaging.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3400C7901EAF89CD008A8584 /* SendExternalFileViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SendExternalFileViewController.h; sourceTree = ""; }; 3400C7911EAF89CD008A8584 /* SendExternalFileViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SendExternalFileViewController.m; sourceTree = ""; }; 3400C7941EAF99F4008A8584 /* SelectThreadViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectThreadViewController.h; sourceTree = ""; }; @@ -498,13 +504,25 @@ 34480B351FD0929200BC14EF /* ShareAppExtensionContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShareAppExtensionContext.m; sourceTree = ""; }; 34480B371FD092A900BC14EF /* SignalShareExtension-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SignalShareExtension-Bridging-Header.h"; sourceTree = ""; }; 34480B381FD092E300BC14EF /* SignalShareExtension-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SignalShareExtension-Prefix.pch"; sourceTree = ""; }; + 34480B481FD0A60200BC14EF /* OWSMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSMath.h; sourceTree = ""; }; + 34480B4A1FD0A7A200BC14EF /* OWSLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSLogger.h; sourceTree = ""; }; + 34480B4B1FD0A7A300BC14EF /* OWSLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSLogger.m; sourceTree = ""; }; + 34480B4D1FD0A7A300BC14EF /* DebugLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugLogger.h; sourceTree = ""; }; + 34480B4E1FD0A7A300BC14EF /* DebugLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DebugLogger.m; sourceTree = ""; }; + 34480B4F1FD0A7A300BC14EF /* OWSScrubbingLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSScrubbingLogFormatter.h; sourceTree = ""; }; + 34480B511FD0A7A400BC14EF /* OWSScrubbingLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSScrubbingLogFormatter.m; sourceTree = ""; }; + 34480B5A1FD0A7E300BC14EF /* SignalMessaging-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SignalMessaging-Prefix.pch"; sourceTree = ""; }; + 34480B5D1FD0A98800BC14EF /* UIColor+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+OWS.h"; sourceTree = ""; }; + 34480B5E1FD0A98800BC14EF /* UIColor+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+OWS.m"; sourceTree = ""; }; + 34480B5F1FD0A98800BC14EF /* UIView+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+OWS.h"; sourceTree = ""; }; + 34480B601FD0A98800BC14EF /* UIView+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+OWS.m"; sourceTree = ""; }; + 34480B651FD0AA9400BC14EF /* UIFont+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIFont+OWS.m"; sourceTree = ""; }; + 34480B661FD0AA9400BC14EF /* UIFont+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIFont+OWS.h"; sourceTree = ""; }; 34491FC11FB0F78500B3E5A3 /* my */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = my; path = translations/my.lproj/Localizable.strings; sourceTree = ""; }; 344F2F651E57A932000D9322 /* UIViewController+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIViewController+OWS.h"; path = "util/UIViewController+OWS.h"; sourceTree = ""; }; 344F2F661E57A932000D9322 /* UIViewController+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIViewController+OWS.m"; path = "util/UIViewController+OWS.m"; sourceTree = ""; }; 34533F161EA8D2070006114F /* OWSAudioAttachmentPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSAudioAttachmentPlayer.h; sourceTree = ""; }; 34533F171EA8D2070006114F /* OWSAudioAttachmentPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSAudioAttachmentPlayer.m; sourceTree = ""; }; - 34535D801E256BE9008A4747 /* UIView+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+OWS.h"; sourceTree = ""; }; - 34535D811E256BE9008A4747 /* UIView+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+OWS.m"; sourceTree = ""; }; 3453D8E91EC0D4ED003F9E6F /* OWSAlerts.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OWSAlerts.swift; sourceTree = ""; }; 345670FF1E89A5F1006EE662 /* ThreadUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadUtil.h; sourceTree = ""; }; 345671001E89A5F1006EE662 /* ThreadUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThreadUtil.m; sourceTree = ""; }; @@ -736,8 +754,6 @@ 45666EC51D99483D008FE134 /* OWSAvatarBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSAvatarBuilder.m; sourceTree = ""; }; 45666EC71D994C0D008FE134 /* OWSGroupAvatarBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSGroupAvatarBuilder.h; sourceTree = ""; }; 45666EC81D994C0D008FE134 /* OWSGroupAvatarBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSGroupAvatarBuilder.m; sourceTree = ""; }; - 45666F541D9B2827008FE134 /* OWSScrubbingLogFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSScrubbingLogFormatter.h; sourceTree = ""; }; - 45666F551D9B2827008FE134 /* OWSScrubbingLogFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSScrubbingLogFormatter.m; sourceTree = ""; }; 45666F571D9B2880008FE134 /* OWSScrubbingLogFormatterTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSScrubbingLogFormatterTest.m; sourceTree = ""; }; 45666F741D9BFE00008FE134 /* OWS100RemoveTSRecipientsMigration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWS100RemoveTSRecipientsMigration.h; path = Migrations/OWS100RemoveTSRecipientsMigration.h; sourceTree = ""; }; 45666F751D9BFE00008FE134 /* OWS100RemoveTSRecipientsMigration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWS100RemoveTSRecipientsMigration.m; path = Migrations/OWS100RemoveTSRecipientsMigration.m; sourceTree = ""; }; @@ -792,8 +808,6 @@ 45C9DEB71DF4E35A0065CA84 /* WebRTCCallMessageHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebRTCCallMessageHandler.swift; sourceTree = ""; }; 45CB2FA71CB7146C00E1B343 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = "Launch Screen.storyboard"; path = "Signal/src/util/Launch Screen.storyboard"; sourceTree = SOURCE_ROOT; }; 45CD81EE1DC030E7004C9430 /* AccountManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountManager.swift; sourceTree = ""; }; - 45CD81F01DC03A22004C9430 /* OWSLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSLogger.h; sourceTree = ""; }; - 45CD81F11DC03A22004C9430 /* OWSLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSLogger.m; sourceTree = ""; }; 45D231761DC7E8F10034FA89 /* SessionResetJob.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SessionResetJob.swift; path = Jobs/SessionResetJob.swift; sourceTree = ""; }; 45DF5DF11DDB843F00C936C7 /* CompareSafetyNumbersActivity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CompareSafetyNumbersActivity.swift; sourceTree = ""; }; 45E282DE1D08E67800ADD4C8 /* gl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = gl; path = translations/gl.lproj/Localizable.strings; sourceTree = ""; }; @@ -843,7 +857,10 @@ 76EB052E18170B33006006FC /* ContactTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactTableViewCell.h; sourceTree = ""; }; 76EB052F18170B33006006FC /* ContactTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactTableViewCell.m; sourceTree = ""; }; 8981C8F64D94D3C52EB67A2C /* Pods-SignalTests.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SignalTests.test.xcconfig"; path = "Pods/Target Support Files/Pods-SignalTests/Pods-SignalTests.test.xcconfig"; sourceTree = ""; }; + 8EEE74B0753448C085B48721 /* Pods-SignalMessaging.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SignalMessaging.app store release.xcconfig"; path = "Pods/Target Support Files/Pods-SignalMessaging/Pods-SignalMessaging.app store release.xcconfig"; sourceTree = ""; }; + 948239851C08032C842937CC /* Pods-SignalMessaging.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SignalMessaging.test.xcconfig"; path = "Pods/Target Support Files/Pods-SignalMessaging/Pods-SignalMessaging.test.xcconfig"; sourceTree = ""; }; 954AEE681DF33D32002E5410 /* ContactsPickerTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactsPickerTest.swift; sourceTree = ""; }; + 9B533A9FA46206D3D99C9ADA /* Pods-SignalMessaging.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SignalMessaging.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SignalMessaging/Pods-SignalMessaging.debug.xcconfig"; sourceTree = ""; }; 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; }; @@ -933,8 +950,6 @@ B6B9ECFA198B31BA00C620D3 /* PushManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = PushManager.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; B6B9ECFB198B31BA00C620D3 /* PushManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PushManager.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; B6BC3D0C1AA544B100C2907F /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = translations/da.lproj/Localizable.strings; sourceTree = ""; }; - B6C93C4C199567AD00EDF894 /* DebugLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugLogger.h; sourceTree = ""; }; - B6C93C4D199567AD00EDF894 /* DebugLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DebugLogger.m; sourceTree = ""; }; B6DA6B051B8A2F9A00CA6F98 /* AppStoreRating.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppStoreRating.h; sourceTree = ""; }; B6DA6B061B8A2F9A00CA6F98 /* AppStoreRating.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppStoreRating.m; sourceTree = ""; }; B6F509961AA53F760068F56A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = translations/en.lproj/Localizable.strings; sourceTree = ""; }; @@ -976,10 +991,6 @@ FCB11D8B1A129A76002F93FB /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; FCC81A961A44558300DFEC7D /* UIDevice+TSHardwareVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIDevice+TSHardwareVersion.h"; sourceTree = ""; }; FCC81A971A44558300DFEC7D /* UIDevice+TSHardwareVersion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIDevice+TSHardwareVersion.m"; sourceTree = ""; }; - FCFA64B21A24F3880007FB87 /* UIColor+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+OWS.h"; sourceTree = ""; }; - FCFA64B31A24F3880007FB87 /* UIColor+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+OWS.m"; sourceTree = ""; }; - FCFA64B51A24F6730007FB87 /* UIFont+OWS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = "UIFont+OWS.h"; path = "util/UIFont+OWS.h"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - FCFA64B61A24F6730007FB87 /* UIFont+OWS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = "UIFont+OWS.m"; path = "util/UIFont+OWS.m"; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -996,6 +1007,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4AC4EA13C8A444455DAB351F /* Pods_SignalMessaging.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1079,6 +1091,33 @@ path = utils; sourceTree = ""; }; + 34480B471FD0A60200BC14EF /* utils */ = { + isa = PBXGroup; + children = ( + 34480B4D1FD0A7A300BC14EF /* DebugLogger.h */, + 34480B4E1FD0A7A300BC14EF /* DebugLogger.m */, + 34480B4A1FD0A7A200BC14EF /* OWSLogger.h */, + 34480B4B1FD0A7A300BC14EF /* OWSLogger.m */, + 34480B481FD0A60200BC14EF /* OWSMath.h */, + 34480B4F1FD0A7A300BC14EF /* OWSScrubbingLogFormatter.h */, + 34480B511FD0A7A400BC14EF /* OWSScrubbingLogFormatter.m */, + ); + path = utils; + sourceTree = ""; + }; + 34480B5C1FD0A98800BC14EF /* categories */ = { + isa = PBXGroup; + children = ( + 34480B5D1FD0A98800BC14EF /* UIColor+OWS.h */, + 34480B5E1FD0A98800BC14EF /* UIColor+OWS.m */, + 34480B661FD0AA9400BC14EF /* UIFont+OWS.h */, + 34480B651FD0AA9400BC14EF /* UIFont+OWS.m */, + 34480B5F1FD0A98800BC14EF /* UIView+OWS.h */, + 34480B601FD0A98800BC14EF /* UIView+OWS.m */, + ); + path = categories; + sourceTree = ""; + }; 3448BFC01EDF0EA7005B2D69 /* ConversationView */ = { isa = PBXGroup; children = ( @@ -1364,9 +1403,12 @@ 453518931FC63DBF00210559 /* SignalMessaging */ = { isa = PBXGroup; children = ( - 453518941FC63DBF00210559 /* SignalMessaging.h */, 453518951FC63DBF00210559 /* Info.plist */, + 34480B5A1FD0A7E300BC14EF /* SignalMessaging-Prefix.pch */, + 34480B5C1FD0A98800BC14EF /* categories */, + 453518941FC63DBF00210559 /* SignalMessaging.h */, 453518A01FC63DD500210559 /* StorageCoordinator.swift */, + 34480B471FD0A60200BC14EF /* utils */, ); path = SignalMessaging; sourceTree = ""; @@ -1561,8 +1603,6 @@ 76EB041118170B33006006FC /* environment */ = { isa = PBXGroup; children = ( - B6C93C4C199567AD00EDF894 /* DebugLogger.h */, - B6C93C4D199567AD00EDF894 /* DebugLogger.m */, 76EB041218170B33006006FC /* Environment.h */, 76EB041318170B33006006FC /* Environment.m */, 4505C2BD1E648E6E00CEBF41 /* ExperienceUpgrades */, @@ -1618,11 +1658,6 @@ 34D99C911F2937CC00D284D6 /* OWSAnalytics.swift */, 34D5CC941EA6AFAD005515DB /* OWSContactsSyncing.h */, 34D5CC951EA6AFAD005515DB /* OWSContactsSyncing.m */, - 45CD81F01DC03A22004C9430 /* OWSLogger.h */, - 45CD81F11DC03A22004C9430 /* OWSLogger.m */, - 34009B651EC4CB11001D95D1 /* OWSMath.h */, - 45666F541D9B2827008FE134 /* OWSScrubbingLogFormatter.h */, - 45666F551D9B2827008FE134 /* OWSScrubbingLogFormatter.m */, 34D99C921F2937CC00D284D6 /* OWSSwiftUtils.swift */, 4579431C1E7C8CE9008ED0C0 /* Pastelog.h */, 4579431D1E7C8CE9008ED0C0 /* Pastelog.m */, @@ -1687,6 +1722,9 @@ 69349DE607F5BA6036C9AC60 /* Pods-SignalShareExtension.debug.xcconfig */, 1C93CF3971B64E8B6C1F9AC1 /* Pods-SignalShareExtension.test.xcconfig */, 435EAC2E5E22D3F087EB3192 /* Pods-SignalShareExtension.app store release.xcconfig */, + 9B533A9FA46206D3D99C9ADA /* Pods-SignalMessaging.debug.xcconfig */, + 948239851C08032C842937CC /* Pods-SignalMessaging.test.xcconfig */, + 8EEE74B0753448C085B48721 /* Pods-SignalMessaging.app store release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -1885,6 +1923,7 @@ D17BB5C25D615AB49813100C /* Pods_Signal.framework */, 0F94C85CB0B235DA37F68ED0 /* Pods_SignalShareExtension.framework */, 748A5CAEDD7C919FC64C6807 /* Pods_SignalTests.framework */, + 264242150E87D10A357DB07B /* Pods_SignalMessaging.framework */, ); name = Frameworks; sourceTree = ""; @@ -1938,16 +1977,10 @@ 450449371F45EE7D002D1ADA /* NSString+OWS.h */, 450449381F45EE7D002D1ADA /* NSString+OWS.m */, 45C0DC1A1E68FE9000E04C47 /* UIApplication+OWS.swift */, - FCFA64B21A24F3880007FB87 /* UIColor+OWS.h */, - FCFA64B31A24F3880007FB87 /* UIColor+OWS.m */, 45BB93371E688E14001E3939 /* UIDevice+featureSupport.swift */, - FCFA64B51A24F6730007FB87 /* UIFont+OWS.h */, - FCFA64B61A24F6730007FB87 /* UIFont+OWS.m */, B68112E81A4D9EC400BA82FF /* UIImage+OWS.h */, B68112E91A4D9EC400BA82FF /* UIImage+OWS.m */, 45C0DC1D1E69011F00E04C47 /* UIStoryboard+OWS.swift */, - 34535D801E256BE9008A4747 /* UIView+OWS.h */, - 34535D811E256BE9008A4747 /* UIView+OWS.m */, 344F2F651E57A932000D9322 /* UIViewController+OWS.h */, 344F2F661E57A932000D9322 /* UIViewController+OWS.m */, EF764C331DB67CC5000D9A87 /* UIViewController+Permissions.h */, @@ -1964,7 +1997,15 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 34480B491FD0A60200BC14EF /* OWSMath.h in Headers */, + 34480B521FD0A7A400BC14EF /* OWSLogger.h in Headers */, + 34480B551FD0A7A400BC14EF /* DebugLogger.h in Headers */, + 34480B571FD0A7A400BC14EF /* OWSScrubbingLogFormatter.h in Headers */, + 34480B611FD0A98800BC14EF /* UIColor+OWS.h in Headers */, 453518961FC63DBF00210559 /* SignalMessaging.h in Headers */, + 34480B631FD0A98800BC14EF /* UIView+OWS.h in Headers */, + 34480B5B1FD0A7E300BC14EF /* SignalMessaging-Prefix.pch in Headers */, + 34480B681FD0AA9400BC14EF /* UIFont+OWS.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1995,10 +2036,12 @@ isa = PBXNativeTarget; buildConfigurationList = 4535189E1FC63DBF00210559 /* Build configuration list for PBXNativeTarget "SignalMessaging" */; buildPhases = ( + F4C416F20E3CB0B25DC10C56 /* [CP] Check Pods Manifest.lock */, 4535188D1FC63DBF00210559 /* Sources */, 4535188E1FC63DBF00210559 /* Frameworks */, 4535188F1FC63DBF00210559 /* Headers */, 453518901FC63DBF00210559 /* Resources */, + 6C612B7B27FC78638EB7B113 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -2091,7 +2134,7 @@ 453518911FC63DBF00210559 = { CreatedOnToolsVersion = 9.2; DevelopmentTeam = U68MSDN6DR; - LastSwiftMigration = 0920; + LastSwiftMigration = 0910; ProvisioningStyle = Automatic; }; D221A088169C9E5E00537ABF = { @@ -2480,6 +2523,21 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + 6C612B7B27FC78638EB7B113 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SignalMessaging/Pods-SignalMessaging-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; 7B85A55670DC3D49AFBF7359 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -2521,6 +2579,24 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SignalTests/Pods-SignalTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; + F4C416F20E3CB0B25DC10C56 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-SignalMessaging-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; F76686434770E2BBEBD9665A /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -2553,6 +2629,12 @@ buildActionMask = 2147483647; files = ( 453518A11FC63DD500210559 /* StorageCoordinator.swift in Sources */, + 34480B621FD0A98800BC14EF /* UIColor+OWS.m in Sources */, + 34480B531FD0A7A400BC14EF /* OWSLogger.m in Sources */, + 34480B641FD0A98800BC14EF /* UIView+OWS.m in Sources */, + 34480B671FD0AA9400BC14EF /* UIFont+OWS.m in Sources */, + 34480B591FD0A7A400BC14EF /* OWSScrubbingLogFormatter.m in Sources */, + 34480B561FD0A7A400BC14EF /* DebugLogger.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2584,7 +2666,6 @@ 340CB2241EAC155C0001CAA1 /* ContactsViewHelper.m in Sources */, 34D1F0AB1F867BFC0066283D /* OWSContactOffersCell.m in Sources */, 34CE88EC1F3237260098030F /* OWSProfileManager.m in Sources */, - 45CD81F21DC03A22004C9430 /* OWSLogger.m in Sources */, 4542F0941EB9372700C7EE92 /* SystemContactsFetcher.swift in Sources */, B60C16651988999D00E97A6C /* VersionMigrations.m in Sources */, 343A65981FC4CFE7000477A1 /* ConversationScrollButton.m in Sources */, @@ -2603,7 +2684,6 @@ 45794E861E00620000066731 /* CallUIAdapter.swift in Sources */, 4585C4681ED8F8D200896AEA /* SafetyNumberConfirmationAlert.swift in Sources */, 450D19131F85236600970622 /* RemoteVideoView.m in Sources */, - FCFA64B71A24F6730007FB87 /* UIFont+OWS.m in Sources */, B6B9ECFC198B31BA00C620D3 /* PushManager.m in Sources */, 45DF5DF21DDB843F00C936C7 /* CompareSafetyNumbersActivity.swift in Sources */, 34C04D801F6195E6004308B3 /* OWSFlatButton.swift in Sources */, @@ -2657,7 +2737,6 @@ 34BECE301F7ABCF800D7438D /* GifPickerLayout.swift in Sources */, 3472229F1EB22FFE00E53955 /* AddToGroupViewController.m in Sources */, 343A65951FC47D5E000477A1 /* DebugUISyncMessages.m in Sources */, - 45666F561D9B2827008FE134 /* OWSScrubbingLogFormatter.m in Sources */, 45C0DC1E1E69011F00E04C47 /* UIStoryboard+OWS.swift in Sources */, 34B3F8861E8DF1700035BE1A /* NotificationSettingsOptionsViewController.m in Sources */, 452ECA4D1E087E7200E2F016 /* MessageFetcherJob.swift in Sources */, @@ -2682,14 +2761,12 @@ 45F170CC1E310E22003FC1F2 /* WeakTimer.swift in Sources */, 34B3F8871E8DF1700035BE1A /* NotificationSettingsViewController.m in Sources */, 458E38371D668EBF0094BD24 /* OWSDeviceProvisioningURLParser.m in Sources */, - FCFA64B41A24F3880007FB87 /* UIColor+OWS.m in Sources */, 4517642B1DE939FD00EDB8B9 /* ContactCell.swift in Sources */, 450573FE1E78A06D00615BB4 /* OWS103EnableVideoCalling.m in Sources */, 34B3F8751E8DF1700035BE1A /* CallViewController.swift in Sources */, 34D8C0281ED3673300188D7C /* DebugUITableViewController.m in Sources */, 3497DBEC1ECE257500DB2605 /* OWSCountryMetadata.m in Sources */, 34B3F8851E8DF1700035BE1A /* NewGroupViewController.m in Sources */, - B6C93C4E199567AD00EDF894 /* DebugLogger.m in Sources */, 34D8C0271ED3673300188D7C /* DebugUIMessages.m in Sources */, 34D1F0B41F86D31D0066283D /* ConversationCollectionView.m in Sources */, 34B3F8821E8DF1700035BE1A /* NewContactThreadViewController.m in Sources */, @@ -2699,7 +2776,6 @@ 34B3F8771E8DF1700035BE1A /* ContactsPicker.swift in Sources */, 45C0DC1B1E68FE9000E04C47 /* UIApplication+OWS.swift in Sources */, 45638BDF1F3DDB2200128435 /* MessageSender+Promise.swift in Sources */, - 34535D821E256BE9008A4747 /* UIView+OWS.m in Sources */, 45F3AEB61DFDE7900080CE33 /* AvatarImageView.swift in Sources */, 7038632718F70C0700D4A43F /* CryptoTools.m in Sources */, 45FBC5C81DF8575700E9B410 /* CallKitCallManager.swift in Sources */, @@ -2785,7 +2861,6 @@ B660F7171C29988E00687D6E /* OWSContactsManager.m in Sources */, B660F7181C29988E00687D6E /* CryptoTools.m in Sources */, B660F71B1C29988E00687D6E /* Environment.m in Sources */, - B660F71C1C29988E00687D6E /* DebugLogger.m in Sources */, B660F71F1C29988E00687D6E /* OWSPreferences.m in Sources */, 451DA3CA1F148A9F008E2423 /* DeviceSleepManager.swift in Sources */, B660F7201C29988E00687D6E /* Release.m in Sources */, @@ -2820,8 +2895,6 @@ 456AC8341E3A775E00A3C7FC /* Weak.swift in Sources */, 454EBAB41F2BE14C00ACE0BB /* OWSAnalytics.swift in Sources */, B660F7721C29988E00687D6E /* AppStoreRating.m in Sources */, - B660F7751C29988E00687D6E /* UIColor+OWS.m in Sources */, - B660F7761C29988E00687D6E /* UIFont+OWS.m in Sources */, 45360B8E1F9521F800FA666C /* Searcher.swift in Sources */, B660F7771C29988E00687D6E /* UIImage+OWS.m in Sources */, 45360B921F952AB400FA666C /* OWSFlatButton.swift in Sources */, @@ -3316,6 +3389,7 @@ }; 4535189B1FC63DBF00210559 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 9B533A9FA46206D3D99C9ADA /* Pods-SignalMessaging.debug.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -3343,6 +3417,8 @@ GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "SignalMessaging/SignalMessaging-Prefix.pch"; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = SignalMessaging/Info.plist; @@ -3364,6 +3440,7 @@ }; 4535189C1FC63DBF00210559 /* Test */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 948239851C08032C842937CC /* Pods-SignalMessaging.test.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -3406,6 +3483,8 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "SignalMessaging/SignalMessaging-Prefix.pch"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -3432,6 +3511,7 @@ }; 4535189D1FC63DBF00210559 /* App Store Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 8EEE74B0753448C085B48721 /* Pods-SignalMessaging.app store release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -3474,6 +3554,8 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "SignalMessaging/SignalMessaging-Prefix.pch"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; diff --git a/Signal/translations/bin/auto-genstrings b/Signal/translations/bin/auto-genstrings index b00cbd05f..c70f433cb 100755 --- a/Signal/translations/bin/auto-genstrings +++ b/Signal/translations/bin/auto-genstrings @@ -7,8 +7,10 @@ REPO_ROOT=$BIN_DIR/../../.. cd $REPO_ROOT SSK_DIR="./SignalServiceKit/src" +SAE_DIR="./SignalShareExtension" +SM_DIR="./SignalMessaging" -TARGETS="Signal/src ${SSK_DIR}" +TARGETS="Signal/src ${SSK_DIR} ${SAE_DIR} ${SM_DIR}" TMP="$(mktemp -d)" STRINGFILE="Signal/translations/en.lproj/Localizable.strings" diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 5e9397707..c1dd815d5 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1513,6 +1513,9 @@ /* action sheet item */ "SHARE_ACTION_TWEET" = "Twitter"; +/* Indicates that the share extension is still loading. */ +"SHARE_EXTENSION_LOADING" = "Loading..."; + /* Action sheet item */ "SHOW_SAFETY_NUMBER_ACTION" = "Show New Safety Number"; diff --git a/SignalMessaging/SignalMessaging-Prefix.pch b/SignalMessaging/SignalMessaging-Prefix.pch new file mode 100644 index 000000000..27fe91e1d --- /dev/null +++ b/SignalMessaging/SignalMessaging-Prefix.pch @@ -0,0 +1,24 @@ +// +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// + +#import + +#ifdef __OBJC__ + #import + #import + + @import CocoaLumberjack; + #ifdef DEBUG + static const NSUInteger ddLogLevel = DDLogLevelAll; + #else + static const NSUInteger ddLogLevel = DDLogLevelInfo; + #endif + + #import + #import + #import + #import + #import + #import +#endif diff --git a/Signal/src/UIColor+OWS.h b/SignalMessaging/categories/UIColor+OWS.h similarity index 100% rename from Signal/src/UIColor+OWS.h rename to SignalMessaging/categories/UIColor+OWS.h diff --git a/Signal/src/UIColor+OWS.m b/SignalMessaging/categories/UIColor+OWS.m similarity index 99% rename from Signal/src/UIColor+OWS.m rename to SignalMessaging/categories/UIColor+OWS.m index 562888057..57e4f4061 100644 --- a/Signal/src/UIColor+OWS.m +++ b/SignalMessaging/categories/UIColor+OWS.m @@ -2,9 +2,9 @@ // Copyright (c) 2017 Open Whisper Systems. All rights reserved. // -#import "Cryptography.h" #import "OWSMath.h" #import "UIColor+OWS.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/util/UIFont+OWS.h b/SignalMessaging/categories/UIFont+OWS.h similarity index 100% rename from Signal/src/util/UIFont+OWS.h rename to SignalMessaging/categories/UIFont+OWS.h diff --git a/Signal/src/util/UIFont+OWS.m b/SignalMessaging/categories/UIFont+OWS.m similarity index 88% rename from Signal/src/util/UIFont+OWS.m rename to SignalMessaging/categories/UIFont+OWS.m index edf0ca36a..1e0d46c05 100644 --- a/Signal/src/util/UIFont+OWS.m +++ b/SignalMessaging/categories/UIFont+OWS.m @@ -6,7 +6,8 @@ @implementation UIFont (OWS) -+ (UIFont *)ows_thinFontWithSize:(CGFloat)size { ++ (UIFont *)ows_thinFontWithSize:(CGFloat)size +{ if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(8, 2)) { return [UIFont systemFontOfSize:size weight:UIFontWeightThin]; } else { @@ -14,7 +15,8 @@ } } -+ (UIFont *)ows_lightFontWithSize:(CGFloat)size { ++ (UIFont *)ows_lightFontWithSize:(CGFloat)size +{ if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(8, 2)) { return [UIFont systemFontOfSize:size weight:UIFontWeightLight]; } else { @@ -22,7 +24,8 @@ } } -+ (UIFont *)ows_regularFontWithSize:(CGFloat)size { ++ (UIFont *)ows_regularFontWithSize:(CGFloat)size +{ if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(8, 2)) { return [UIFont systemFontOfSize:size weight:UIFontWeightRegular]; } else { @@ -30,7 +33,8 @@ } } -+ (UIFont *)ows_mediumFontWithSize:(CGFloat)size { ++ (UIFont *)ows_mediumFontWithSize:(CGFloat)size +{ if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(8, 2)) { return [UIFont systemFontOfSize:size weight:UIFontWeightMedium]; } else { @@ -38,7 +42,8 @@ } } -+ (UIFont *)ows_boldFontWithSize:(CGFloat)size { ++ (UIFont *)ows_boldFontWithSize:(CGFloat)size +{ return [UIFont boldSystemFontOfSize:size]; } @@ -61,7 +66,8 @@ #pragma mark - Dynamic Type -+ (UIFont *)ows_dynamicTypeBodyFont { ++ (UIFont *)ows_dynamicTypeBodyFont +{ return [UIFont preferredFontForTextStyle:UIFontTextStyleBody]; } @@ -75,7 +81,8 @@ return [UIFont preferredFontForTextStyle:UIFontTextStyleFootnote]; } -+ (UIFont *)ows_dynamicTypeTitle2Font { ++ (UIFont *)ows_dynamicTypeTitle2Font +{ if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) { return [UIFont preferredFontForTextStyle:UIFontTextStyleTitle2]; } else { diff --git a/Signal/src/UIView+OWS.h b/SignalMessaging/categories/UIView+OWS.h similarity index 100% rename from Signal/src/UIView+OWS.h rename to SignalMessaging/categories/UIView+OWS.h diff --git a/Signal/src/UIView+OWS.m b/SignalMessaging/categories/UIView+OWS.m similarity index 89% rename from Signal/src/UIView+OWS.m rename to SignalMessaging/categories/UIView+OWS.m index cc0943649..e762a4289 100644 --- a/Signal/src/UIView+OWS.m +++ b/SignalMessaging/categories/UIView+OWS.m @@ -2,8 +2,8 @@ // Copyright (c) 2017 Open Whisper Systems. All rights reserved. // -#import "UIView+OWS.h" #import "OWSMath.h" +#import "UIView+OWS.h" NS_ASSUME_NONNULL_BEGIN @@ -36,8 +36,8 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) - (NSArray *)autoPinWidthToSuperviewWithMargin:(CGFloat)margin { NSArray *result = @[ - [self autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:margin], - [self autoPinEdgeToSuperviewEdge:ALEdgeRight withInset:margin], + [self autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:margin], + [self autoPinEdgeToSuperviewEdge:ALEdgeRight withInset:margin], ]; return result; } @@ -45,8 +45,8 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) - (NSArray *)autoPinWidthToSuperview { NSArray *result = @[ - [self autoPinEdgeToSuperviewEdge:ALEdgeLeft], - [self autoPinEdgeToSuperviewEdge:ALEdgeRight], + [self autoPinEdgeToSuperviewEdge:ALEdgeLeft], + [self autoPinEdgeToSuperviewEdge:ALEdgeRight], ]; return result; } @@ -63,8 +63,8 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) - (NSArray *)autoPinHeightToSuperviewWithMargin:(CGFloat)margin { NSArray *result = @[ - [self autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:margin], - [self autoPinEdgeToSuperviewEdge:ALEdgeBottom withInset:margin], + [self autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:margin], + [self autoPinEdgeToSuperviewEdge:ALEdgeBottom withInset:margin], ]; return result; } @@ -72,8 +72,8 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) - (NSArray *)autoPinHeightToSuperview { NSArray *result = @[ - [self autoPinEdgeToSuperviewEdge:ALEdgeTop], - [self autoPinEdgeToSuperviewEdge:ALEdgeBottom], + [self autoPinEdgeToSuperviewEdge:ALEdgeTop], + [self autoPinEdgeToSuperviewEdge:ALEdgeBottom], ]; return result; } @@ -81,10 +81,10 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) - (NSArray *)autoPinToSuperviewEdges { NSArray *result = @[ - [self autoPinEdgeToSuperviewEdge:ALEdgeLeft ], - [self autoPinEdgeToSuperviewEdge:ALEdgeRight ], - [self autoPinEdgeToSuperviewEdge:ALEdgeTop ], - [self autoPinEdgeToSuperviewEdge:ALEdgeBottom ], + [self autoPinEdgeToSuperviewEdge:ALEdgeLeft], + [self autoPinEdgeToSuperviewEdge:ALEdgeRight], + [self autoPinEdgeToSuperviewEdge:ALEdgeTop], + [self autoPinEdgeToSuperviewEdge:ALEdgeBottom], ]; return result; } @@ -302,17 +302,17 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) - (NSLayoutConstraint *)autoPinLeadingToTrailingOfView:(UIView *)view { OWSAssert(view); - + return [self autoPinLeadingToTrailingOfView:view margin:0]; } - (NSLayoutConstraint *)autoPinLeadingToTrailingOfView:(UIView *)view margin:(CGFloat)margin { OWSAssert(view); - + if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) { NSLayoutConstraint *constraint = - [self.leadingAnchor constraintEqualToAnchor:view.trailingAnchor constant:margin]; + [self.leadingAnchor constraintEqualToAnchor:view.trailingAnchor constant:margin]; constraint.active = YES; return constraint; } else { @@ -323,17 +323,17 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value) - (NSLayoutConstraint *)autoPinTrailingToLeadingOfView:(UIView *)view { OWSAssert(view); - + return [self autoPinTrailingToLeadingOfView:view margin:0]; } - (NSLayoutConstraint *)autoPinTrailingToLeadingOfView:(UIView *)view margin:(CGFloat)margin { OWSAssert(view); - + if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(9, 0)) { NSLayoutConstraint *constraint = - [self.trailingAnchor constraintEqualToAnchor:view.leadingAnchor constant:-margin]; + [self.trailingAnchor constraintEqualToAnchor:view.leadingAnchor constant:-margin]; constraint.active = YES; return constraint; } else { diff --git a/Signal/src/environment/DebugLogger.h b/SignalMessaging/utils/DebugLogger.h similarity index 100% rename from Signal/src/environment/DebugLogger.h rename to SignalMessaging/utils/DebugLogger.h diff --git a/Signal/src/environment/DebugLogger.m b/SignalMessaging/utils/DebugLogger.m similarity index 86% rename from Signal/src/environment/DebugLogger.m rename to SignalMessaging/utils/DebugLogger.m index 3a8706e00..83e44f917 100644 --- a/Signal/src/environment/DebugLogger.m +++ b/SignalMessaging/utils/DebugLogger.m @@ -7,7 +7,6 @@ #import #pragma mark Logging - Production logging wants us to write some logs to a file in case we need it for debugging. - #import @interface DebugLogger () @@ -16,17 +15,19 @@ @implementation DebugLogger -+ (instancetype)sharedLogger { ++ (instancetype)sharedLogger +{ static DebugLogger *sharedManager = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - sharedManager = [self new]; + sharedManager = [self new]; }); return sharedManager; } -- (void)enableFileLogging { +- (void)enableFileLogging +{ // Logging to file, because it's in the Cache folder, they are not uploaded in iTunes/iCloud backups. self.fileLogger = [DDFileLogger new]; // 24 hour rolling. @@ -40,16 +41,19 @@ [DDLog addLogger:self.fileLogger]; } -- (void)disableFileLogging { +- (void)disableFileLogging +{ [DDLog removeLogger:self.fileLogger]; self.fileLogger = nil; } -- (void)enableTTYLogging { +- (void)enableTTYLogging +{ [DDLog addLogger:DDTTYLogger.sharedInstance]; } -- (void)wipeLogs { +- (void)wipeLogs +{ BOOL reenableLogging = (self.fileLogger ? YES : NO); NSError *error; NSArray *logsPath = self.fileLogger.logFileManager.unsortedLogFilePaths; @@ -71,9 +75,10 @@ } } -- (NSString *)logsDirectory { - NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES); - NSString *baseDir = ([paths count] > 0) ? [paths objectAtIndex:0] : nil; +- (NSString *)logsDirectory +{ + NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES); + NSString *baseDir = ([paths count] > 0) ? [paths objectAtIndex:0] : nil; NSString *logsDirectory = [baseDir stringByAppendingPathComponent:@"Logs"]; if (![[NSFileManager defaultManager] fileExistsAtPath:logsDirectory]) { diff --git a/Signal/src/util/OWSLogger.h b/SignalMessaging/utils/OWSLogger.h similarity index 77% rename from Signal/src/util/OWSLogger.h rename to SignalMessaging/utils/OWSLogger.h index 7bfa0a247..d47e92cc8 100644 --- a/Signal/src/util/OWSLogger.h +++ b/SignalMessaging/utils/OWSLogger.h @@ -1,5 +1,6 @@ -// Created by Michael Kirk on 10/25/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. +// +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/util/OWSLogger.m b/SignalMessaging/utils/OWSLogger.m similarity index 59% rename from Signal/src/util/OWSLogger.m rename to SignalMessaging/utils/OWSLogger.m index 2a1b6f449..f869ae403 100644 --- a/Signal/src/util/OWSLogger.m +++ b/SignalMessaging/utils/OWSLogger.m @@ -1,5 +1,6 @@ -// Created by Michael Kirk on 10/25/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. +// +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// #import "OWSLogger.h" @@ -9,27 +10,27 @@ NS_ASSUME_NONNULL_BEGIN + (void)verbose:(NSString *)logString { - DDLogVerbose(logString); + DDLogVerbose(@"%@", logString); } + (void)debug:(NSString *)logString { - DDLogDebug(logString); + DDLogDebug(@"%@", logString); } + (void)info:(NSString *)logString { - DDLogInfo(logString); + DDLogInfo(@"%@", logString); } + (void)warn:(NSString *)logString { - DDLogWarn(logString); + DDLogWarn(@"%@", logString); } + (void)error:(NSString *)logString { - DDLogError(logString); + DDLogError(@"%@", logString); } + (void)flush diff --git a/Signal/src/util/OWSMath.h b/SignalMessaging/utils/OWSMath.h similarity index 100% rename from Signal/src/util/OWSMath.h rename to SignalMessaging/utils/OWSMath.h diff --git a/Signal/src/util/OWSScrubbingLogFormatter.h b/SignalMessaging/utils/OWSScrubbingLogFormatter.h similarity index 53% rename from Signal/src/util/OWSScrubbingLogFormatter.h rename to SignalMessaging/utils/OWSScrubbingLogFormatter.h index a9dd0ffa2..3d8a3c0e7 100644 --- a/Signal/src/util/OWSScrubbingLogFormatter.h +++ b/SignalMessaging/utils/OWSScrubbingLogFormatter.h @@ -1,5 +1,6 @@ -// Created by Michael Kirk on 9/27/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. +// +// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// NS_ASSUME_NONNULL_BEGIN diff --git a/Signal/src/util/OWSScrubbingLogFormatter.m b/SignalMessaging/utils/OWSScrubbingLogFormatter.m similarity index 100% rename from Signal/src/util/OWSScrubbingLogFormatter.m rename to SignalMessaging/utils/OWSScrubbingLogFormatter.m diff --git a/SignalShareExtension/Base.lproj/MainInterface.storyboard b/SignalShareExtension/Base.lproj/MainInterface.storyboard index 8f0606ad0..2e59abc17 100644 --- a/SignalShareExtension/Base.lproj/MainInterface.storyboard +++ b/SignalShareExtension/Base.lproj/MainInterface.storyboard @@ -1,11 +1,11 @@ - + - + diff --git a/SignalShareExtension/ShareViewController.swift b/SignalShareExtension/ShareViewController.swift index 76ac57d86..a8f4574ca 100644 --- a/SignalShareExtension/ShareViewController.swift +++ b/SignalShareExtension/ShareViewController.swift @@ -3,26 +3,56 @@ // import UIKit -import Social import SignalMessaging import PureLayout import SignalServiceKit -class ShareViewController: SLComposeServiceViewController { +class ShareViewController: UIViewController { + + override func loadView() { + super.loadView() + + // This should be the first thing we do. + SetCurrentAppContext(ShareAppExtensionContext()) + +// DebugLogger.shared().enableTTYLogging() +// if _isDebugAssertConfiguration() { +// DebugLogger.shared().enableFileLogging() +// } else { +// // TODO: Consult OWSPreferences.loggingIsEnabled. +// DebugLogger.shared().enableFileLogging() +// } + + _ = AppVersion() + +//DDLogWarn(@"%@ application: didFinishLaunchingWithOptions.", self.logTag); +// +//// We need to do this _after_ we set up logging but _before_ we do +//// anything else. +//[self ensureIsReadyForAppExtensions]; +// +//#if RELEASE +// // ensureIsReadyForAppExtensions may have changed the state of the logging +// // preference (due to [NSUserDefaults migrateToSharedUserDefaults]), so honor +// // that change if necessary. +//if (loggingIsEnabled && !OWSPreferences.loggingIsEnabled) { +// [DebugLogger.sharedLogger disableFileLogging]; +//} +//#endif +// +//[AppVersion instance]; +// +//[self startupLogging]; + + Logger.debug("\(self.logTag()) \(#function)") + print("\(self.logTag()) \(#function) \(self.view.frame)") + } override func viewDidLoad() { super.viewDidLoad() - // None of the following code is intended to be used, it only serves to prove - // the project has been configured correctly - - // Proof of cocoapods, utilizes PureLayout - let someView = UIView() - someView.backgroundColor = UIColor.green - view.addSubview(someView) - someView.autoPinEdgesToSuperviewEdges() - someView.alpha = 0.2 + showLoadingAnimation() let proofOfSharedFramework = StorageCoordinator.shared.path let proofOfSSK = textSecureServerURL @@ -31,24 +61,51 @@ class ShareViewController: SLComposeServiceViewController { //let proofOfSharedStorage = TSAccountManager.localNumber() let proofOfSharedStorage = "TODO" - self.placeholder = "shared framework: \(proofOfSharedFramework) \n sharedStorage: \(proofOfSharedStorage) \n proof of ssk: \(proofOfSSK)" - } + print("shared framework: \(proofOfSharedFramework) \n sharedStorage: \(proofOfSharedStorage) \n proof of ssk: \(proofOfSSK)") - override func isContentValid() -> Bool { - // Do validation of contentText and/or NSExtensionContext attachments here - return true + Logger.debug("\(self.logTag()) \(#function)") + print("\(self.logTag()) \(#function) \(self.view.frame)") } - override func didSelectPost() { - // This is called after the user selects Post. Do the upload of contentText and/or NSExtensionContext attachments. + private func showLoadingAnimation() { + Logger.debug("\(self.logTag()) \(#function)") + print("\(self.logTag()) \(#function) \(self.view.frame)") + + // Proof of cocoapods, utilizes PureLayout + let rootView = UIView() + rootView.backgroundColor = UIColor.ows_signalBrandBlue() + view.addSubview(rootView) + rootView.autoCenterInSuperview() + rootView.autoSetDimension(.width, toSize: 200) + rootView.autoSetDimension(.height, toSize: 300) + rootView.layer.cornerRadius = 3 + + let activityIndicator = UIActivityIndicatorView(activityIndicatorStyle:.whiteLarge) + rootView.addSubview(activityIndicator) + activityIndicator.autoCenterInSuperview() + activityIndicator.startAnimating() - // Inform the host that we're done, so it un-blocks its UI. Note: Alternatively you could call super's -didSelectPost, which will similarly complete the extension context. - self.extensionContext!.completeRequest(returningItems: [], completionHandler: nil) + let label = UILabel() + label.textColor = UIColor.white + label.font = UIFont.ows_mediumFont(withSize: 14) + label.text = NSLocalizedString("SHARE_EXTENSION_LOADING", + comment: "Indicates that the share extension is still loading.") + rootView.addSubview(label) + label.autoHCenterInSuperview() + label.autoPinEdge(.top, to: .bottom, of: activityIndicator, withOffset: 10) } - override func configurationItems() -> [Any]! { - // To add configuration options via table cells at the bottom of the sheet, return an array of SLComposeSheetConfigurationItem here. - return [] + override func viewWillAppear(_ animated: Bool) { + Logger.debug("\(self.logTag()) \(#function)") + print("\(self.logTag()) \(#function) \(self.view.frame)") + + super.viewWillAppear(animated) } + override func viewDidAppear(_ animated: Bool) { + Logger.debug("\(self.logTag()) \(#function)") + print("\(self.logTag()) \(#function) \(self.view.frame)") + + super.viewDidAppear(animated) + } } diff --git a/SignalShareExtension/SignalShareExtension-Bridging-Header.h b/SignalShareExtension/SignalShareExtension-Bridging-Header.h index 1e209a39e..8da866ec8 100644 --- a/SignalShareExtension/SignalShareExtension-Bridging-Header.h +++ b/SignalShareExtension/SignalShareExtension-Bridging-Header.h @@ -2,4 +2,15 @@ // Copyright (c) 2017 Open Whisper Systems. All rights reserved. // +#import "DebugLogger.h" +#import "OWSLogger.h" +#import "ShareAppExtensionContext.h" +#import "UIColor+OWS.h" +#import "UIFont+OWS.h" +#import "UIView+OWS.h" +#import +#import +#import #import +#import +#import