mirror of https://github.com/oxen-io/session-ios
Import SSK (and history) into Signal-iOS
git remote add ssk ../SignalServiceKit git remote update git merge -s ours --allow-unrelated-histories --no-commit ssk/master git read-tree --prefix=SignalServiceKit -u ssk/master git commitpull/1/head
Michael Kirk
8 years ago
commit
ccb4a88742
@ -0,0 +1,15 @@
|
||||
---
|
||||
BasedOnStyle: WebKit
|
||||
AllowShortFunctionsOnASingleLine: false
|
||||
BinPackArguments: false
|
||||
BinPackParameters: false
|
||||
ColumnLimit: 120
|
||||
IndentCaseLabels: true
|
||||
MaxEmptyLinesToKeep: 2
|
||||
ObjCSpaceAfterProperty: true
|
||||
ObjCSpaceBeforeProtocolList: true
|
||||
PointerBindsToType: false
|
||||
SpacesBeforeTrailingComments: 1
|
||||
TabWidth: 8
|
||||
UseTab: Never
|
||||
...
|
||||
@ -0,0 +1,30 @@
|
||||
# Xcode
|
||||
#
|
||||
.DS_Store
|
||||
build/
|
||||
*.pbxuser
|
||||
!default.pbxuser
|
||||
*.mode1v3
|
||||
!default.mode1v3
|
||||
*.mode2v3
|
||||
!default.mode2v3
|
||||
*.perspectivev3
|
||||
!default.perspectivev3
|
||||
xcuserdata
|
||||
*.xccheckout
|
||||
*.moved-aside
|
||||
DerivedData
|
||||
*.hmap
|
||||
*.ipa
|
||||
*.xcuserstate
|
||||
xcshareddata
|
||||
|
||||
Pods/
|
||||
|
||||
# CocoaPods
|
||||
#
|
||||
# We recommend against adding the Pods directory to your .gitignore. However
|
||||
# you should judge for yourself, the pros and cons are mentioned at:
|
||||
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
|
||||
#
|
||||
#Pods/
|
||||
@ -0,0 +1,17 @@
|
||||
language: objective-c
|
||||
|
||||
osx_image: xcode8.3
|
||||
|
||||
env:
|
||||
-EARLY_START_SIMULATOR=1 # early starting simulator reduces false negatives due to test timeouts
|
||||
|
||||
before_install:
|
||||
- brew update
|
||||
- bundle
|
||||
- bundle exec pod repo update --silent
|
||||
|
||||
after_failure:
|
||||
- sleep 10 # This prevents the occasional output truncation that happens when piping to xcpretty.
|
||||
|
||||
script: make scan_test
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
## Contributor agreement
|
||||
|
||||
Apple requires contributors to iOS projects to relicense their code on submit. We'll have to have individual contributors sign something to enable this.
|
||||
|
||||
Our volunteer legal have put together a form you can sign electronically. So no scanning, faxing, or carrier pigeons involved. How modern:
|
||||
https://whispersystems.org/cla/
|
||||
|
||||
Please go ahead and sign, putting your github username in "Address line #2", so that we can accept your pull requests at our heart's delight.
|
||||
|
||||
## Code Conventions
|
||||
|
||||
Follow all [Signal-iOS Code Conventions](https://github.com/WhisperSystems/Signal-iOS/blob/master/CONTRIBUTING.md).
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
# Uncomment this line to define a global platform for your project
|
||||
# platform :ios, '8.0'
|
||||
# Uncomment this line if you're using Swift
|
||||
# use_frameworks!
|
||||
|
||||
link_with 'TSKitOSXTestApp', 'TSKitOSXTestAppTests'
|
||||
pod 'SignalServiceKit', :path => '../../SignalServiceKit.podspec'
|
||||
|
||||
target 'TSKitOSXTestApp' do
|
||||
|
||||
end
|
||||
|
||||
target 'TSKitOSXTestAppTests' do
|
||||
|
||||
end
|
||||
|
||||
@ -0,0 +1,84 @@
|
||||
PODS:
|
||||
- 25519 (2.0.2)
|
||||
- AFNetworking (2.6.3):
|
||||
- AFNetworking/NSURLConnection (= 2.6.3)
|
||||
- AFNetworking/NSURLSession (= 2.6.3)
|
||||
- AFNetworking/Reachability (= 2.6.3)
|
||||
- AFNetworking/Security (= 2.6.3)
|
||||
- AFNetworking/Serialization (= 2.6.3)
|
||||
- AFNetworking/UIKit (= 2.6.3)
|
||||
- AFNetworking/NSURLConnection (2.6.3):
|
||||
- AFNetworking/Reachability
|
||||
- AFNetworking/Security
|
||||
- AFNetworking/Serialization
|
||||
- AFNetworking/NSURLSession (2.6.3):
|
||||
- AFNetworking/Reachability
|
||||
- AFNetworking/Security
|
||||
- AFNetworking/Serialization
|
||||
- AFNetworking/Reachability (2.6.3)
|
||||
- AFNetworking/Security (2.6.3)
|
||||
- AFNetworking/Serialization (2.6.3)
|
||||
- AxolotlKit (0.8):
|
||||
- 25519 (~> 2.0.1)
|
||||
- HKDFKit (~> 0.0.3)
|
||||
- ProtocolBuffers (~> 1.9.8)
|
||||
- CocoaLumberjack (2.2.0):
|
||||
- CocoaLumberjack/Default (= 2.2.0)
|
||||
- CocoaLumberjack/Extensions (= 2.2.0)
|
||||
- CocoaLumberjack/Core (2.2.0)
|
||||
- CocoaLumberjack/Default (2.2.0):
|
||||
- CocoaLumberjack/Core
|
||||
- CocoaLumberjack/Extensions (2.2.0):
|
||||
- CocoaLumberjack/Default
|
||||
- HKDFKit (0.0.3)
|
||||
- libPhoneNumber-iOS (0.8.10)
|
||||
- Mantle (2.0.6):
|
||||
- Mantle/extobjc (= 2.0.6)
|
||||
- Mantle/extobjc (2.0.6)
|
||||
- ProtocolBuffers (1.9.9.2)
|
||||
- SocketRocket-PinningPolicy (0.4.2)
|
||||
- SQLCipher/common (3.1.0)
|
||||
- SQLCipher/fts (3.1.0):
|
||||
- SQLCipher/common
|
||||
- SSKeychain (1.2.3)
|
||||
- TextSecureKit (0.0.1):
|
||||
- AFNetworking
|
||||
- AxolotlKit
|
||||
- libPhoneNumber-iOS
|
||||
- Mantle
|
||||
- SocketRocket-PinningPolicy
|
||||
- SSKeychain
|
||||
- TwistedOakCollapsingFutures
|
||||
- YapDatabase/SQLCipher
|
||||
- TwistedOakCollapsingFutures (1.0.0):
|
||||
- UnionFind (~> 1.0)
|
||||
- UnionFind (1.0.1)
|
||||
- YapDatabase/SQLCipher (2.7.6):
|
||||
- CocoaLumberjack (~> 2)
|
||||
- SQLCipher/fts
|
||||
|
||||
DEPENDENCIES:
|
||||
- TextSecureKit (from `../../TextSecureKit.podspec`)
|
||||
|
||||
EXTERNAL SOURCES:
|
||||
TextSecureKit:
|
||||
:path: "../../TextSecureKit.podspec"
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
'25519': dc4bad7e2dbcbf1efa121068a705a44cd98c80fc
|
||||
AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
|
||||
AxolotlKit: a33962f26943990e5d69d05b30470cea18caeed0
|
||||
CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
|
||||
HKDFKit: c058305d6f64b84f28c50bd7aa89574625bcb62a
|
||||
libPhoneNumber-iOS: 7bfd00f843fdcd82b5182b463e8eb3b27579f41d
|
||||
Mantle: 299966b00759634931699f69cb6a30b9239b944d
|
||||
ProtocolBuffers: 7111461618460961e6b7469177ec45ee551b4f0e
|
||||
SocketRocket-PinningPolicy: 28f8b3e9584feef9a1c7018deca4b08224784e97
|
||||
SQLCipher: c44fcca49c31483c2489cfb79aa7a69407f3794a
|
||||
SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
|
||||
TextSecureKit: 37044bf08f10fa38bb0d2a22763fcbd0610d9ccc
|
||||
TwistedOakCollapsingFutures: f359b90f203e9ab13dfb92c9ff41842a7fe1cd0c
|
||||
UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
|
||||
YapDatabase: 00e5a5d1b5dba1bd540ef644576233b5612e6122
|
||||
|
||||
COCOAPODS: 0.39.0
|
||||
@ -0,0 +1,537 @@
|
||||
// !$*UTF8*$!
|
||||
{
|
||||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 46;
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
1DD46D960BAA4BD8CDB4413A /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D37810DFDE3195597E7C896B /* libPods.a */; };
|
||||
8BC0C8C6194A28EA6C8C76F6 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D37810DFDE3195597E7C896B /* libPods.a */; };
|
||||
B6B645BA1C13BF0F00B2445E /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B645B91C13BF0F00B2445E /* AppDelegate.m */; };
|
||||
B6B645BD1C13BF0F00B2445E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B645BC1C13BF0F00B2445E /* main.m */; };
|
||||
B6B645C01C13BF0F00B2445E /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B645BF1C13BF0F00B2445E /* ViewController.m */; };
|
||||
B6B645C21C13BF0F00B2445E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B6B645C11C13BF0F00B2445E /* Assets.xcassets */; };
|
||||
B6B645C51C13BF0F00B2445E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B6B645C31C13BF0F00B2445E /* Main.storyboard */; };
|
||||
B6B645D01C13BF0F00B2445E /* TSKitOSXTestAppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B6B645CF1C13BF0F00B2445E /* TSKitOSXTestAppTests.m */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXContainerItemProxy section */
|
||||
B6B645CC1C13BF0F00B2445E /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = B6B645AD1C13BF0F00B2445E /* Project object */;
|
||||
proxyType = 1;
|
||||
remoteGlobalIDString = B6B645B41C13BF0F00B2445E;
|
||||
remoteInfo = TSKitOSXTestApp;
|
||||
};
|
||||
/* End PBXContainerItemProxy section */
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
B6B645B51C13BF0F00B2445E /* TSKitOSXTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TSKitOSXTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
B6B645B81C13BF0F00B2445E /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
|
||||
B6B645B91C13BF0F00B2445E /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
|
||||
B6B645BC1C13BF0F00B2445E /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
|
||||
B6B645BE1C13BF0F00B2445E /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
|
||||
B6B645BF1C13BF0F00B2445E /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
|
||||
B6B645C11C13BF0F00B2445E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
||||
B6B645C41C13BF0F00B2445E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
|
||||
B6B645C61C13BF0F00B2445E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
B6B645CB1C13BF0F00B2445E /* TSKitOSXTestAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TSKitOSXTestAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
B6B645CF1C13BF0F00B2445E /* TSKitOSXTestAppTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TSKitOSXTestAppTests.m; sourceTree = "<group>"; };
|
||||
B6B645D11C13BF0F00B2445E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
D25164F0D0A75D3B009D179E /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
|
||||
D37810DFDE3195597E7C896B /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
D8B53DAB4F6C37DE3B5B6421 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
B6B645B21C13BF0F00B2445E /* Frameworks */ = {
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
1DD46D960BAA4BD8CDB4413A /* libPods.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
B6B645C81C13BF0F00B2445E /* Frameworks */ = {
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
8BC0C8C6194A28EA6C8C76F6 /* libPods.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXFrameworksBuildPhase section */
|
||||
|
||||
/* Begin PBXGroup section */
|
||||
44BAD04F52F626009242899A /* Pods */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
D8B53DAB4F6C37DE3B5B6421 /* Pods.debug.xcconfig */,
|
||||
D25164F0D0A75D3B009D179E /* Pods.release.xcconfig */,
|
||||
);
|
||||
name = Pods;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
B6B645AC1C13BF0F00B2445E = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
B6B645B71C13BF0F00B2445E /* TSKitOSXTestApp */,
|
||||
B6B645CE1C13BF0F00B2445E /* TSKitOSXTestAppTests */,
|
||||
B6B645B61C13BF0F00B2445E /* Products */,
|
||||
44BAD04F52F626009242899A /* Pods */,
|
||||
CF0FD83194551D00D0A9E796 /* Frameworks */,
|
||||
);
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
B6B645B61C13BF0F00B2445E /* Products */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
B6B645B51C13BF0F00B2445E /* TSKitOSXTestApp.app */,
|
||||
B6B645CB1C13BF0F00B2445E /* TSKitOSXTestAppTests.xctest */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
B6B645B71C13BF0F00B2445E /* TSKitOSXTestApp */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
B6B645B81C13BF0F00B2445E /* AppDelegate.h */,
|
||||
B6B645B91C13BF0F00B2445E /* AppDelegate.m */,
|
||||
B6B645BE1C13BF0F00B2445E /* ViewController.h */,
|
||||
B6B645BF1C13BF0F00B2445E /* ViewController.m */,
|
||||
B6B645C11C13BF0F00B2445E /* Assets.xcassets */,
|
||||
B6B645C31C13BF0F00B2445E /* Main.storyboard */,
|
||||
B6B645C61C13BF0F00B2445E /* Info.plist */,
|
||||
B6B645BB1C13BF0F00B2445E /* Supporting Files */,
|
||||
);
|
||||
path = TSKitOSXTestApp;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
B6B645BB1C13BF0F00B2445E /* Supporting Files */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
B6B645BC1C13BF0F00B2445E /* main.m */,
|
||||
);
|
||||
name = "Supporting Files";
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
B6B645CE1C13BF0F00B2445E /* TSKitOSXTestAppTests */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
B6B645CF1C13BF0F00B2445E /* TSKitOSXTestAppTests.m */,
|
||||
B6B645D11C13BF0F00B2445E /* Info.plist */,
|
||||
);
|
||||
path = TSKitOSXTestAppTests;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
CF0FD83194551D00D0A9E796 /* Frameworks */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
D37810DFDE3195597E7C896B /* libPods.a */,
|
||||
);
|
||||
name = Frameworks;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* End PBXGroup section */
|
||||
|
||||
/* Begin PBXNativeTarget section */
|
||||
B6B645B41C13BF0F00B2445E /* TSKitOSXTestApp */ = {
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = B6B645D41C13BF0F00B2445E /* Build configuration list for PBXNativeTarget "TSKitOSXTestApp" */;
|
||||
buildPhases = (
|
||||
5510D7D5A0FB978CCDE637CD /* Check Pods Manifest.lock */,
|
||||
B6B645B11C13BF0F00B2445E /* Sources */,
|
||||
B6B645B21C13BF0F00B2445E /* Frameworks */,
|
||||
B6B645B31C13BF0F00B2445E /* Resources */,
|
||||
0B6AA14EB6AADC45842BF572 /* Embed Pods Frameworks */,
|
||||
B03CB2B8E19917764946C929 /* Copy Pods Resources */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
dependencies = (
|
||||
);
|
||||
name = TSKitOSXTestApp;
|
||||
productName = TSKitOSXTestApp;
|
||||
productReference = B6B645B51C13BF0F00B2445E /* TSKitOSXTestApp.app */;
|
||||
productType = "com.apple.product-type.application";
|
||||
};
|
||||
B6B645CA1C13BF0F00B2445E /* TSKitOSXTestAppTests */ = {
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = B6B645D71C13BF0F00B2445E /* Build configuration list for PBXNativeTarget "TSKitOSXTestAppTests" */;
|
||||
buildPhases = (
|
||||
46B61195C95610428F143504 /* Check Pods Manifest.lock */,
|
||||
B6B645C71C13BF0F00B2445E /* Sources */,
|
||||
B6B645C81C13BF0F00B2445E /* Frameworks */,
|
||||
B6B645C91C13BF0F00B2445E /* Resources */,
|
||||
68742E9FB715CC7841C50B7C /* Embed Pods Frameworks */,
|
||||
935C78DBEEB53BD139240165 /* Copy Pods Resources */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
dependencies = (
|
||||
B6B645CD1C13BF0F00B2445E /* PBXTargetDependency */,
|
||||
);
|
||||
name = TSKitOSXTestAppTests;
|
||||
productName = TSKitOSXTestAppTests;
|
||||
productReference = B6B645CB1C13BF0F00B2445E /* TSKitOSXTestAppTests.xctest */;
|
||||
productType = "com.apple.product-type.bundle.unit-test";
|
||||
};
|
||||
/* End PBXNativeTarget section */
|
||||
|
||||
/* Begin PBXProject section */
|
||||
B6B645AD1C13BF0F00B2445E /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
attributes = {
|
||||
LastUpgradeCheck = 0710;
|
||||
ORGANIZATIONNAME = "Open Whisper Systems";
|
||||
TargetAttributes = {
|
||||
B6B645B41C13BF0F00B2445E = {
|
||||
CreatedOnToolsVersion = 7.1.1;
|
||||
};
|
||||
B6B645CA1C13BF0F00B2445E = {
|
||||
CreatedOnToolsVersion = 7.1.1;
|
||||
TestTargetID = B6B645B41C13BF0F00B2445E;
|
||||
};
|
||||
};
|
||||
};
|
||||
buildConfigurationList = B6B645B01C13BF0F00B2445E /* Build configuration list for PBXProject "TSKitOSXTestApp" */;
|
||||
compatibilityVersion = "Xcode 3.2";
|
||||
developmentRegion = English;
|
||||
hasScannedForEncodings = 0;
|
||||
knownRegions = (
|
||||
en,
|
||||
Base,
|
||||
);
|
||||
mainGroup = B6B645AC1C13BF0F00B2445E;
|
||||
productRefGroup = B6B645B61C13BF0F00B2445E /* Products */;
|
||||
projectDirPath = "";
|
||||
projectRoot = "";
|
||||
targets = (
|
||||
B6B645B41C13BF0F00B2445E /* TSKitOSXTestApp */,
|
||||
B6B645CA1C13BF0F00B2445E /* TSKitOSXTestAppTests */,
|
||||
);
|
||||
};
|
||||
/* End PBXProject section */
|
||||
|
||||
/* Begin PBXResourcesBuildPhase section */
|
||||
B6B645B31C13BF0F00B2445E /* Resources */ = {
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
B6B645C21C13BF0F00B2445E /* Assets.xcassets in Resources */,
|
||||
B6B645C51C13BF0F00B2445E /* Main.storyboard in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
B6B645C91C13BF0F00B2445E /* Resources */ = {
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXResourcesBuildPhase section */
|
||||
|
||||
/* Begin PBXShellScriptBuildPhase section */
|
||||
0B6AA14EB6AADC45842BF572 /* Embed Pods Frameworks */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "Embed Pods Frameworks";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
46B61195C95610428F143504 /* Check Pods Manifest.lock */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "Check Pods Manifest.lock";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
5510D7D5A0FB978CCDE637CD /* Check Pods Manifest.lock */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "Check Pods Manifest.lock";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
68742E9FB715CC7841C50B7C /* Embed Pods Frameworks */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "Embed Pods Frameworks";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
935C78DBEEB53BD139240165 /* Copy Pods Resources */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "Copy Pods Resources";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
B03CB2B8E19917764946C929 /* Copy Pods Resources */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "Copy Pods Resources";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
/* End PBXShellScriptBuildPhase section */
|
||||
|
||||
/* Begin PBXSourcesBuildPhase section */
|
||||
B6B645B11C13BF0F00B2445E /* Sources */ = {
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
B6B645C01C13BF0F00B2445E /* ViewController.m in Sources */,
|
||||
B6B645BD1C13BF0F00B2445E /* main.m in Sources */,
|
||||
B6B645BA1C13BF0F00B2445E /* AppDelegate.m in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
B6B645C71C13BF0F00B2445E /* Sources */ = {
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
B6B645D01C13BF0F00B2445E /* TSKitOSXTestAppTests.m in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXSourcesBuildPhase section */
|
||||
|
||||
/* Begin PBXTargetDependency section */
|
||||
B6B645CD1C13BF0F00B2445E /* PBXTargetDependency */ = {
|
||||
isa = PBXTargetDependency;
|
||||
target = B6B645B41C13BF0F00B2445E /* TSKitOSXTestApp */;
|
||||
targetProxy = B6B645CC1C13BF0F00B2445E /* PBXContainerItemProxy */;
|
||||
};
|
||||
/* End PBXTargetDependency section */
|
||||
|
||||
/* Begin PBXVariantGroup section */
|
||||
B6B645C31C13BF0F00B2445E /* Main.storyboard */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
B6B645C41C13BF0F00B2445E /* Base */,
|
||||
);
|
||||
name = Main.storyboard;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* End PBXVariantGroup section */
|
||||
|
||||
/* Begin XCBuildConfiguration section */
|
||||
B6B645D21C13BF0F00B2445E /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
||||
CLANG_CXX_LIBRARY = "libc++";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_ENUM_CONVERSION = YES;
|
||||
CLANG_WARN_INT_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
CODE_SIGN_IDENTITY = "-";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEBUG_INFORMATION_FORMAT = dwarf;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"DEBUG=1",
|
||||
"$(inherited)",
|
||||
);
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.11;
|
||||
MTL_ENABLE_DEBUG_INFO = YES;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SDKROOT = macosx;
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
B6B645D31C13BF0F00B2445E /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
||||
CLANG_CXX_LIBRARY = "libc++";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_ENUM_CONVERSION = YES;
|
||||
CLANG_WARN_INT_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
CODE_SIGN_IDENTITY = "-";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
ENABLE_NS_ASSERTIONS = NO;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.11;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
SDKROOT = macosx;
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
B6B645D51C13BF0F00B2445E /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = D8B53DAB4F6C37DE3B5B6421 /* Pods.debug.xcconfig */;
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
INFOPLIST_FILE = TSKitOSXTestApp/Info.plist;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.TSKitOSXTestApp;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
B6B645D61C13BF0F00B2445E /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = D25164F0D0A75D3B009D179E /* Pods.release.xcconfig */;
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
INFOPLIST_FILE = TSKitOSXTestApp/Info.plist;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.TSKitOSXTestApp;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
B6B645D81C13BF0F00B2445E /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = D8B53DAB4F6C37DE3B5B6421 /* Pods.debug.xcconfig */;
|
||||
buildSettings = {
|
||||
BUNDLE_LOADER = "$(TEST_HOST)";
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
INFOPLIST_FILE = TSKitOSXTestAppTests/Info.plist;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.TSKitOSXTestAppTests;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TSKitOSXTestApp.app/Contents/MacOS/TSKitOSXTestApp";
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
B6B645D91C13BF0F00B2445E /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = D25164F0D0A75D3B009D179E /* Pods.release.xcconfig */;
|
||||
buildSettings = {
|
||||
BUNDLE_LOADER = "$(TEST_HOST)";
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
INFOPLIST_FILE = TSKitOSXTestAppTests/Info.plist;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.TSKitOSXTestAppTests;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TSKitOSXTestApp.app/Contents/MacOS/TSKitOSXTestApp";
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
/* End XCBuildConfiguration section */
|
||||
|
||||
/* Begin XCConfigurationList section */
|
||||
B6B645B01C13BF0F00B2445E /* Build configuration list for PBXProject "TSKitOSXTestApp" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
B6B645D21C13BF0F00B2445E /* Debug */,
|
||||
B6B645D31C13BF0F00B2445E /* Release */,
|
||||
);
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
B6B645D41C13BF0F00B2445E /* Build configuration list for PBXNativeTarget "TSKitOSXTestApp" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
B6B645D51C13BF0F00B2445E /* Debug */,
|
||||
B6B645D61C13BF0F00B2445E /* Release */,
|
||||
);
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
B6B645D71C13BF0F00B2445E /* Build configuration list for PBXNativeTarget "TSKitOSXTestAppTests" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
B6B645D81C13BF0F00B2445E /* Debug */,
|
||||
B6B645D91C13BF0F00B2445E /* Release */,
|
||||
);
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
/* End XCConfigurationList section */
|
||||
};
|
||||
rootObject = B6B645AD1C13BF0F00B2445E /* Project object */;
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Workspace
|
||||
version = "1.0">
|
||||
<FileRef
|
||||
location = "self:TSKitOSXTestApp.xcodeproj">
|
||||
</FileRef>
|
||||
</Workspace>
|
||||
@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Workspace
|
||||
version = "1.0">
|
||||
<FileRef
|
||||
location = "group:TSKitOSXTestApp.xcodeproj">
|
||||
</FileRef>
|
||||
<FileRef
|
||||
location = "group:Pods/Pods.xcodeproj">
|
||||
</FileRef>
|
||||
</Workspace>
|
||||
@ -0,0 +1,15 @@
|
||||
//
|
||||
// AppDelegate.h
|
||||
// TSKitOSXTestApp
|
||||
//
|
||||
// Created by Frederic Jacobs on 06/12/15.
|
||||
// Copyright © 2015 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
||||
@interface AppDelegate : NSObject <NSApplicationDelegate>
|
||||
|
||||
|
||||
@end
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
//
|
||||
// AppDelegate.m
|
||||
// TSKitOSXTestApp
|
||||
//
|
||||
// Created by Frederic Jacobs on 06/12/15.
|
||||
// Copyright © 2015 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "AppDelegate.h"
|
||||
|
||||
@interface AppDelegate ()
|
||||
|
||||
@end
|
||||
|
||||
@implementation AppDelegate
|
||||
|
||||
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
|
||||
// Insert code here to initialize your application
|
||||
}
|
||||
|
||||
- (void)applicationWillTerminate:(NSNotification *)aNotification {
|
||||
// Insert code here to tear down your application
|
||||
}
|
||||
|
||||
@end
|
||||
@ -0,0 +1,58 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "16x16",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "16x16",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "32x32",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "32x32",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "128x128",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "128x128",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "256x256",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "256x256",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "512x512",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "mac",
|
||||
"size" : "512x512",
|
||||
"scale" : "2x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,681 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="6198" systemVersion="14A297b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
|
||||
<dependencies>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6198"/>
|
||||
</dependencies>
|
||||
<scenes>
|
||||
<!--Application-->
|
||||
<scene sceneID="JPo-4y-FX3">
|
||||
<objects>
|
||||
<application id="hnw-xV-0zn" sceneMemberID="viewController">
|
||||
<menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
|
||||
<items>
|
||||
<menuItem title="TSKitOSXTestApp" id="1Xt-HY-uBw">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="TSKitOSXTestApp" systemMenu="apple" id="uQy-DD-JDr">
|
||||
<items>
|
||||
<menuItem title="About TSKitOSXTestApp" id="5kV-Vb-QxS">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
|
||||
<menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
|
||||
<menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
|
||||
<menuItem title="Services" id="NMo-om-nkz">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
|
||||
<menuItem title="Hide TSKitOSXTestApp" keyEquivalent="h" id="Olw-nP-bQN">
|
||||
<connections>
|
||||
<action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="hideOtherApplications:" target="Ady-hI-5gd" id="VT4-aY-XCT"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Show All" id="Kd2-mp-pUS">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="unhideAllApplications:" target="Ady-hI-5gd" id="Dhg-Le-xox"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
|
||||
<menuItem title="Quit TSKitOSXTestApp" keyEquivalent="q" id="4sb-4s-VLi">
|
||||
<connections>
|
||||
<action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="File" id="dMs-cI-mzQ">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="File" id="bib-Uj-vzu">
|
||||
<items>
|
||||
<menuItem title="New" keyEquivalent="n" id="Was-JA-tGl">
|
||||
<connections>
|
||||
<action selector="newDocument:" target="Ady-hI-5gd" id="4Si-XN-c54"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Open…" keyEquivalent="o" id="IAo-SY-fd9">
|
||||
<connections>
|
||||
<action selector="openDocument:" target="Ady-hI-5gd" id="bVn-NM-KNZ"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Open Recent" id="tXI-mr-wws">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="oas-Oc-fiZ">
|
||||
<items>
|
||||
<menuItem title="Clear Menu" id="vNY-rz-j42">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="clearRecentDocuments:" target="Ady-hI-5gd" id="Daa-9d-B3U"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="m54-Is-iLE"/>
|
||||
<menuItem title="Close" keyEquivalent="w" id="DVo-aG-piG">
|
||||
<connections>
|
||||
<action selector="performClose:" target="Ady-hI-5gd" id="HmO-Ls-i7Q"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Save…" keyEquivalent="s" id="pxx-59-PXV">
|
||||
<connections>
|
||||
<action selector="saveDocument:" target="Ady-hI-5gd" id="teZ-XB-qJY"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Save As…" keyEquivalent="S" id="Bw7-FT-i3A">
|
||||
<connections>
|
||||
<action selector="saveDocumentAs:" target="Ady-hI-5gd" id="mDf-zr-I0C"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Revert to Saved" id="KaW-ft-85H">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="revertDocumentToSaved:" target="Ady-hI-5gd" id="iJ3-Pv-kwq"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="aJh-i4-bef"/>
|
||||
<menuItem title="Page Setup…" keyEquivalent="P" id="qIS-W8-SiK">
|
||||
<modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="runPageLayout:" target="Ady-hI-5gd" id="Din-rz-gC5"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Print…" keyEquivalent="p" id="aTl-1u-JFS">
|
||||
<connections>
|
||||
<action selector="print:" target="Ady-hI-5gd" id="qaZ-4w-aoO"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Edit" id="5QF-Oa-p0T">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Edit" id="W48-6f-4Dl">
|
||||
<items>
|
||||
<menuItem title="Undo" keyEquivalent="z" id="dRJ-4n-Yzg">
|
||||
<connections>
|
||||
<action selector="undo:" target="Ady-hI-5gd" id="M6e-cu-g7V"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Redo" keyEquivalent="Z" id="6dh-zS-Vam">
|
||||
<connections>
|
||||
<action selector="redo:" target="Ady-hI-5gd" id="oIA-Rs-6OD"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="WRV-NI-Exz"/>
|
||||
<menuItem title="Cut" keyEquivalent="x" id="uRl-iY-unG">
|
||||
<connections>
|
||||
<action selector="cut:" target="Ady-hI-5gd" id="YJe-68-I9s"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Copy" keyEquivalent="c" id="x3v-GG-iWU">
|
||||
<connections>
|
||||
<action selector="copy:" target="Ady-hI-5gd" id="G1f-GL-Joy"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Paste" keyEquivalent="v" id="gVA-U4-sdL">
|
||||
<connections>
|
||||
<action selector="paste:" target="Ady-hI-5gd" id="UvS-8e-Qdg"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Paste and Match Style" keyEquivalent="V" id="WeT-3V-zwk">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="pasteAsPlainText:" target="Ady-hI-5gd" id="cEh-KX-wJQ"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Delete" id="pa3-QI-u2k">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="delete:" target="Ady-hI-5gd" id="0Mk-Ml-PaM"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Select All" keyEquivalent="a" id="Ruw-6m-B2m">
|
||||
<connections>
|
||||
<action selector="selectAll:" target="Ady-hI-5gd" id="VNm-Mi-diN"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="uyl-h8-XO2"/>
|
||||
<menuItem title="Find" id="4EN-yA-p0u">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Find" id="1b7-l0-nxx">
|
||||
<items>
|
||||
<menuItem title="Find…" tag="1" keyEquivalent="f" id="Xz5-n4-O0W">
|
||||
<connections>
|
||||
<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="cD7-Qs-BN4"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="YEy-JH-Tfz">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="WD3-Gg-5AJ"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Find Next" tag="2" keyEquivalent="g" id="q09-fT-Sye">
|
||||
<connections>
|
||||
<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="NDo-RZ-v9R"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Find Previous" tag="3" keyEquivalent="G" id="OwM-mh-QMV">
|
||||
<connections>
|
||||
<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="HOh-sY-3ay"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="buJ-ug-pKt">
|
||||
<connections>
|
||||
<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="U76-nv-p5D"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Jump to Selection" keyEquivalent="j" id="S0p-oC-mLd">
|
||||
<connections>
|
||||
<action selector="centerSelectionInVisibleArea:" target="Ady-hI-5gd" id="IOG-6D-g5B"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Spelling and Grammar" id="Dv1-io-Yv7">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Spelling" id="3IN-sU-3Bg">
|
||||
<items>
|
||||
<menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="HFo-cy-zxI">
|
||||
<connections>
|
||||
<action selector="showGuessPanel:" target="Ady-hI-5gd" id="vFj-Ks-hy3"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Check Document Now" keyEquivalent=";" id="hz2-CU-CR7">
|
||||
<connections>
|
||||
<action selector="checkSpelling:" target="Ady-hI-5gd" id="fz7-VC-reM"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="bNw-od-mp5"/>
|
||||
<menuItem title="Check Spelling While Typing" id="rbD-Rh-wIN">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleContinuousSpellChecking:" target="Ady-hI-5gd" id="7w6-Qz-0kB"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Check Grammar With Spelling" id="mK6-2p-4JG">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleGrammarChecking:" target="Ady-hI-5gd" id="muD-Qn-j4w"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Correct Spelling Automatically" id="78Y-hA-62v">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticSpellingCorrection:" target="Ady-hI-5gd" id="2lM-Qi-WAP"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Substitutions" id="9ic-FL-obx">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Substitutions" id="FeM-D8-WVr">
|
||||
<items>
|
||||
<menuItem title="Show Substitutions" id="z6F-FW-3nz">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="orderFrontSubstitutionsPanel:" target="Ady-hI-5gd" id="oku-mr-iSq"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="gPx-C9-uUO"/>
|
||||
<menuItem title="Smart Copy/Paste" id="9yt-4B-nSM">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleSmartInsertDelete:" target="Ady-hI-5gd" id="3IJ-Se-DZD"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Smart Quotes" id="hQb-2v-fYv">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticQuoteSubstitution:" target="Ady-hI-5gd" id="ptq-xd-QOA"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Smart Dashes" id="rgM-f4-ycn">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticDashSubstitution:" target="Ady-hI-5gd" id="oCt-pO-9gS"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Smart Links" id="cwL-P1-jid">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticLinkDetection:" target="Ady-hI-5gd" id="Gip-E3-Fov"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Data Detectors" id="tRr-pd-1PS">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticDataDetection:" target="Ady-hI-5gd" id="R1I-Nq-Kbl"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Text Replacement" id="HFQ-gK-NFA">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleAutomaticTextReplacement:" target="Ady-hI-5gd" id="DvP-Fe-Py6"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Transformations" id="2oI-Rn-ZJC">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Transformations" id="c8a-y6-VQd">
|
||||
<items>
|
||||
<menuItem title="Make Upper Case" id="vmV-6d-7jI">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="uppercaseWord:" target="Ady-hI-5gd" id="sPh-Tk-edu"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Make Lower Case" id="d9M-CD-aMd">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="lowercaseWord:" target="Ady-hI-5gd" id="iUZ-b5-hil"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Capitalize" id="UEZ-Bs-lqG">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="capitalizeWord:" target="Ady-hI-5gd" id="26H-TL-nsh"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Speech" id="xrE-MZ-jX0">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Speech" id="3rS-ZA-NoH">
|
||||
<items>
|
||||
<menuItem title="Start Speaking" id="Ynk-f8-cLZ">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="startSpeaking:" target="Ady-hI-5gd" id="654-Ng-kyl"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Stop Speaking" id="Oyz-dy-DGm">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="stopSpeaking:" target="Ady-hI-5gd" id="dX8-6p-jy9"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Format" id="jxT-CU-nIS">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Format" id="GEO-Iw-cKr">
|
||||
<items>
|
||||
<menuItem title="Font" id="Gi5-1S-RQB">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Font" systemMenu="font" id="aXa-aM-Jaq">
|
||||
<items>
|
||||
<menuItem title="Show Fonts" keyEquivalent="t" id="Q5e-8K-NDq"/>
|
||||
<menuItem title="Bold" tag="2" keyEquivalent="b" id="GB9-OM-e27"/>
|
||||
<menuItem title="Italic" tag="1" keyEquivalent="i" id="Vjx-xi-njq"/>
|
||||
<menuItem title="Underline" keyEquivalent="u" id="WRG-CD-K1S">
|
||||
<connections>
|
||||
<action selector="underline:" target="Ady-hI-5gd" id="FYS-2b-JAY"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="5gT-KC-WSO"/>
|
||||
<menuItem title="Bigger" tag="3" keyEquivalent="+" id="Ptp-SP-VEL"/>
|
||||
<menuItem title="Smaller" tag="4" keyEquivalent="-" id="i1d-Er-qST"/>
|
||||
<menuItem isSeparatorItem="YES" id="kx3-Dk-x3B"/>
|
||||
<menuItem title="Kern" id="jBQ-r6-VK2">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Kern" id="tlD-Oa-oAM">
|
||||
<items>
|
||||
<menuItem title="Use Default" id="GUa-eO-cwY">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="useStandardKerning:" target="Ady-hI-5gd" id="6dk-9l-Ckg"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Use None" id="cDB-IK-hbR">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="turnOffKerning:" target="Ady-hI-5gd" id="U8a-gz-Maa"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Tighten" id="46P-cB-AYj">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="tightenKerning:" target="Ady-hI-5gd" id="hr7-Nz-8ro"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Loosen" id="ogc-rX-tC1">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="loosenKerning:" target="Ady-hI-5gd" id="8i4-f9-FKE"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Ligatures" id="o6e-r0-MWq">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Ligatures" id="w0m-vy-SC9">
|
||||
<items>
|
||||
<menuItem title="Use Default" id="agt-UL-0e3">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="useStandardLigatures:" target="Ady-hI-5gd" id="7uR-wd-Dx6"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Use None" id="J7y-lM-qPV">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="turnOffLigatures:" target="Ady-hI-5gd" id="iX2-gA-Ilz"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Use All" id="xQD-1f-W4t">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="useAllLigatures:" target="Ady-hI-5gd" id="KcB-kA-TuK"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Baseline" id="OaQ-X3-Vso">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Baseline" id="ijk-EB-dga">
|
||||
<items>
|
||||
<menuItem title="Use Default" id="3Om-Ey-2VK">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="unscript:" target="Ady-hI-5gd" id="0vZ-95-Ywn"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Superscript" id="Rqc-34-cIF">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="superscript:" target="Ady-hI-5gd" id="3qV-fo-wpU"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Subscript" id="I0S-gh-46l">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="subscript:" target="Ady-hI-5gd" id="Q6W-4W-IGz"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Raise" id="2h7-ER-AoG">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="raiseBaseline:" target="Ady-hI-5gd" id="4sk-31-7Q9"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Lower" id="1tx-W0-xDw">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="lowerBaseline:" target="Ady-hI-5gd" id="OF1-bc-KW4"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="Ndw-q3-faq"/>
|
||||
<menuItem title="Show Colors" keyEquivalent="C" id="bgn-CT-cEk">
|
||||
<connections>
|
||||
<action selector="orderFrontColorPanel:" target="Ady-hI-5gd" id="mSX-Xz-DV3"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="iMs-zA-UFJ"/>
|
||||
<menuItem title="Copy Style" keyEquivalent="c" id="5Vv-lz-BsD">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="copyFont:" target="Ady-hI-5gd" id="GJO-xA-L4q"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Paste Style" keyEquivalent="v" id="vKC-jM-MkH">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="pasteFont:" target="Ady-hI-5gd" id="JfD-CL-leO"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Text" id="Fal-I4-PZk">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Text" id="d9c-me-L2H">
|
||||
<items>
|
||||
<menuItem title="Align Left" keyEquivalent="{" id="ZM1-6Q-yy1">
|
||||
<connections>
|
||||
<action selector="alignLeft:" target="Ady-hI-5gd" id="zUv-R1-uAa"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Center" keyEquivalent="|" id="VIY-Ag-zcb">
|
||||
<connections>
|
||||
<action selector="alignCenter:" target="Ady-hI-5gd" id="spX-mk-kcS"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Justify" id="J5U-5w-g23">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="alignJustified:" target="Ady-hI-5gd" id="ljL-7U-jND"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Align Right" keyEquivalent="}" id="wb2-vD-lq4">
|
||||
<connections>
|
||||
<action selector="alignRight:" target="Ady-hI-5gd" id="r48-bG-YeY"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="4s2-GY-VfK"/>
|
||||
<menuItem title="Writing Direction" id="H1b-Si-o9J">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Writing Direction" id="8mr-sm-Yjd">
|
||||
<items>
|
||||
<menuItem title="Paragraph" enabled="NO" id="ZvO-Gk-QUH">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
</menuItem>
|
||||
<menuItem id="YGs-j5-SAR">
|
||||
<string key="title"> Default</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeBaseWritingDirectionNatural:" target="Ady-hI-5gd" id="qtV-5e-UBP"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem id="Lbh-J2-qVU">
|
||||
<string key="title"> Left to Right</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeBaseWritingDirectionLeftToRight:" target="Ady-hI-5gd" id="S0X-9S-QSf"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem id="jFq-tB-4Kx">
|
||||
<string key="title"> Right to Left</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeBaseWritingDirectionRightToLeft:" target="Ady-hI-5gd" id="5fk-qB-AqJ"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="swp-gr-a21"/>
|
||||
<menuItem title="Selection" enabled="NO" id="cqv-fj-IhA">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
</menuItem>
|
||||
<menuItem id="Nop-cj-93Q">
|
||||
<string key="title"> Default</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeTextWritingDirectionNatural:" target="Ady-hI-5gd" id="lPI-Se-ZHp"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem id="BgM-ve-c93">
|
||||
<string key="title"> Left to Right</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeTextWritingDirectionLeftToRight:" target="Ady-hI-5gd" id="caW-Bv-w94"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem id="RB4-Sm-HuC">
|
||||
<string key="title"> Right to Left</string>
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="makeTextWritingDirectionRightToLeft:" target="Ady-hI-5gd" id="EXD-6r-ZUu"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="fKy-g9-1gm"/>
|
||||
<menuItem title="Show Ruler" id="vLm-3I-IUL">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="toggleRuler:" target="Ady-hI-5gd" id="FOx-HJ-KwY"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Copy Ruler" keyEquivalent="c" id="MkV-Pr-PK5">
|
||||
<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="copyRuler:" target="Ady-hI-5gd" id="71i-fW-3W2"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Paste Ruler" keyEquivalent="v" id="LVM-kO-fVI">
|
||||
<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="pasteRuler:" target="Ady-hI-5gd" id="cSh-wd-qM2"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="View" id="H8h-7b-M4v">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="View" id="HyV-fh-RgO">
|
||||
<items>
|
||||
<menuItem title="Show Toolbar" keyEquivalent="t" id="snW-S8-Cw5">
|
||||
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
|
||||
<connections>
|
||||
<action selector="toggleToolbarShown:" target="Ady-hI-5gd" id="BXY-wc-z0C"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Customize Toolbar…" id="1UK-8n-QPP">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="runToolbarCustomizationPalette:" target="Ady-hI-5gd" id="pQI-g3-MTW"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Window" id="aUF-d1-5bR">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Window" systemMenu="window" id="Td7-aD-5lo">
|
||||
<items>
|
||||
<menuItem title="Minimize" keyEquivalent="m" id="OY7-WF-poV">
|
||||
<connections>
|
||||
<action selector="performMiniaturize:" target="Ady-hI-5gd" id="VwT-WD-YPe"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Zoom" id="R4o-n2-Eq4">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="performZoom:" target="Ady-hI-5gd" id="DIl-cC-cCs"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem isSeparatorItem="YES" id="eu3-7i-yIM"/>
|
||||
<menuItem title="Bring All to Front" id="LE2-aR-0XJ">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="arrangeInFront:" target="Ady-hI-5gd" id="DRN-fu-gQh"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
<menuItem title="Help" id="wpr-3q-Mcd">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
|
||||
<items>
|
||||
<menuItem title="TSKitOSXTestApp Help" keyEquivalent="?" id="FKE-Sm-Kum">
|
||||
<connections>
|
||||
<action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
</menuItem>
|
||||
</items>
|
||||
</menu>
|
||||
<connections>
|
||||
<outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
|
||||
</connections>
|
||||
</application>
|
||||
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModuleProvider=""/>
|
||||
<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="75" y="0.0"/>
|
||||
</scene>
|
||||
<!--Window Controller - Window-->
|
||||
<scene sceneID="R2V-B0-nI4">
|
||||
<objects>
|
||||
<windowController id="B8D-0N-5wS" sceneMemberID="viewController">
|
||||
<window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
|
||||
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
|
||||
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
|
||||
<rect key="contentRect" x="196" y="240" width="480" height="270"/>
|
||||
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
|
||||
</window>
|
||||
<connections>
|
||||
<segue destination="XfG-lQ-9wD" kind="relationship" relationship="window.shadowedContentViewController" id="cq2-FE-JQM"/>
|
||||
</connections>
|
||||
</windowController>
|
||||
<customObject id="Oky-zY-oP4" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="75" y="250"/>
|
||||
</scene>
|
||||
<!--View Controller-->
|
||||
<scene sceneID="hIz-AP-VOD">
|
||||
<objects>
|
||||
<viewController id="XfG-lQ-9wD" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
|
||||
<view key="view" id="m2S-Jp-Qdl">
|
||||
<rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
</view>
|
||||
</viewController>
|
||||
<customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="75" y="655"/>
|
||||
</scene>
|
||||
</scenes>
|
||||
</document>
|
||||
@ -0,0 +1,34 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string></string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>Copyright © 2015 Open Whisper Systems. All rights reserved.</string>
|
||||
<key>NSMainStoryboardFile</key>
|
||||
<string>Main</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string>NSApplication</string>
|
||||
</dict>
|
||||
</plist>
|
||||
@ -0,0 +1,15 @@
|
||||
//
|
||||
// ViewController.h
|
||||
// TSKitOSXTestApp
|
||||
//
|
||||
// Created by Frederic Jacobs on 06/12/15.
|
||||
// Copyright © 2015 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
||||
@interface ViewController : NSViewController
|
||||
|
||||
|
||||
@end
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
//
|
||||
// ViewController.m
|
||||
// TSKitOSXTestApp
|
||||
//
|
||||
// Created by Frederic Jacobs on 06/12/15.
|
||||
// Copyright © 2015 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "ViewController.h"
|
||||
|
||||
@implementation ViewController
|
||||
|
||||
- (void)viewDidLoad {
|
||||
[super viewDidLoad];
|
||||
|
||||
// Do any additional setup after loading the view.
|
||||
}
|
||||
|
||||
- (void)setRepresentedObject:(id)representedObject {
|
||||
[super setRepresentedObject:representedObject];
|
||||
|
||||
// Update the view, if already loaded.
|
||||
}
|
||||
|
||||
@end
|
||||
@ -0,0 +1,13 @@
|
||||
//
|
||||
// main.m
|
||||
// TSKitOSXTestApp
|
||||
//
|
||||
// Created by Frederic Jacobs on 06/12/15.
|
||||
// Copyright © 2015 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
||||
int main(int argc, const char * argv[]) {
|
||||
return NSApplicationMain(argc, argv);
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>BNDL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
</dict>
|
||||
</plist>
|
||||
@ -0,0 +1,39 @@
|
||||
//
|
||||
// TSKitOSXTestAppTests.m
|
||||
// TSKitOSXTestAppTests
|
||||
//
|
||||
// Created by Frederic Jacobs on 06/12/15.
|
||||
// Copyright © 2015 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <XCTest/XCTest.h>
|
||||
|
||||
@interface TSKitOSXTestAppTests : XCTestCase
|
||||
|
||||
@end
|
||||
|
||||
@implementation TSKitOSXTestAppTests
|
||||
|
||||
- (void)setUp {
|
||||
[super setUp];
|
||||
// Put setup code here. This method is called before the invocation of each test method in the class.
|
||||
}
|
||||
|
||||
- (void)tearDown {
|
||||
// Put teardown code here. This method is called after the invocation of each test method in the class.
|
||||
[super tearDown];
|
||||
}
|
||||
|
||||
- (void)testExample {
|
||||
// This is an example of a functional test case.
|
||||
// Use XCTAssert and related functions to verify your tests produce the correct results.
|
||||
}
|
||||
|
||||
- (void)testPerformanceExample {
|
||||
// This is an example of a performance test case.
|
||||
[self measureBlock:^{
|
||||
// Put the code you want to measure the time of here.
|
||||
}];
|
||||
}
|
||||
|
||||
@end
|
||||
@ -0,0 +1,29 @@
|
||||
platform :ios, '8.0'
|
||||
source 'https://github.com/CocoaPods/Specs.git'
|
||||
|
||||
target 'TSKitiOSTestApp' do
|
||||
pod 'SocketRocket', git: 'https://github.com/facebook/SocketRocket.git'
|
||||
pod 'AxolotlKit', git: 'https://github.com/WhisperSystems/SignalProtocolKit.git'
|
||||
pod 'SignalServiceKit', :path => '../../SignalServiceKit.podspec'
|
||||
|
||||
target 'TSKitiOSTestAppTests' do
|
||||
inherit! :search_paths
|
||||
end
|
||||
end
|
||||
|
||||
post_install do |installer|
|
||||
installer.pods_project.targets.each do |target|
|
||||
if target.to_s == "SignalServiceKit"
|
||||
puts "--[!] Disabling singleton enforcement for SSK."
|
||||
target.build_configurations.each do |config|
|
||||
existing_definitions = config.build_settings['GCC_PREPROCESSOR_DEFINITIONS']
|
||||
if existing_definitions == nil || existing.length == 0
|
||||
existing_definitions = "$(inheritied)"
|
||||
end
|
||||
|
||||
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = "#{existing_definitions} SSK_BUILDING_FOR_TESTS=1"
|
||||
config.build_settings['OTHER_SWIFT_FLAGS'] = ['$(inherited)', '-DSSK_BUILDING_FOR_TESTS']
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,145 @@
|
||||
PODS:
|
||||
- 25519 (2.0.2)
|
||||
- AFNetworking (3.1.0):
|
||||
- AFNetworking/NSURLSession (= 3.1.0)
|
||||
- AFNetworking/Reachability (= 3.1.0)
|
||||
- AFNetworking/Security (= 3.1.0)
|
||||
- AFNetworking/Serialization (= 3.1.0)
|
||||
- AFNetworking/UIKit (= 3.1.0)
|
||||
- AFNetworking/NSURLSession (3.1.0):
|
||||
- AFNetworking/Reachability
|
||||
- AFNetworking/Security
|
||||
- AFNetworking/Serialization
|
||||
- AFNetworking/Reachability (3.1.0)
|
||||
- AFNetworking/Security (3.1.0)
|
||||
- AFNetworking/Serialization (3.1.0)
|
||||
- AFNetworking/UIKit (3.1.0):
|
||||
- AFNetworking/NSURLSession
|
||||
- AxolotlKit (0.8.1):
|
||||
- 25519 (~> 2.0.1)
|
||||
- CocoaLumberjack
|
||||
- HKDFKit (~> 0.0.3)
|
||||
- ProtocolBuffers (~> 1.9.8)
|
||||
- CocoaLumberjack (2.4.0):
|
||||
- CocoaLumberjack/Default (= 2.4.0)
|
||||
- CocoaLumberjack/Extensions (= 2.4.0)
|
||||
- CocoaLumberjack/Core (2.4.0)
|
||||
- CocoaLumberjack/Default (2.4.0):
|
||||
- CocoaLumberjack/Core
|
||||
- CocoaLumberjack/Extensions (2.4.0):
|
||||
- CocoaLumberjack/Default
|
||||
- HKDFKit (0.0.3)
|
||||
- libPhoneNumber-iOS (0.9.10)
|
||||
- Mantle (2.1.0):
|
||||
- Mantle/extobjc (= 2.1.0)
|
||||
- Mantle/extobjc (2.1.0)
|
||||
- ProtocolBuffers (1.9.11)
|
||||
- SAMKeychain (1.5.2)
|
||||
- SignalServiceKit (0.9.0):
|
||||
- '25519'
|
||||
- AFNetworking
|
||||
- AxolotlKit
|
||||
- CocoaLumberjack
|
||||
- libPhoneNumber-iOS
|
||||
- Mantle
|
||||
- SAMKeychain
|
||||
- SocketRocket
|
||||
- TwistedOakCollapsingFutures
|
||||
- YapDatabase/SQLCipher (~> 2.9.3)
|
||||
- SocketRocket (0.5.1)
|
||||
- SQLCipher/common (3.4.1)
|
||||
- SQLCipher/fts (3.4.1):
|
||||
- SQLCipher/common
|
||||
- TwistedOakCollapsingFutures (1.0.0):
|
||||
- UnionFind (~> 1.0)
|
||||
- UnionFind (1.0.1)
|
||||
- YapDatabase/SQLCipher (2.9.3):
|
||||
- YapDatabase/SQLCipher/Core (= 2.9.3)
|
||||
- YapDatabase/SQLCipher/Extensions (= 2.9.3)
|
||||
- YapDatabase/SQLCipher/Core (2.9.3):
|
||||
- CocoaLumberjack (~> 2)
|
||||
- SQLCipher/fts
|
||||
- YapDatabase/SQLCipher/Extensions (2.9.3):
|
||||
- YapDatabase/SQLCipher/Core
|
||||
- YapDatabase/SQLCipher/Extensions/ActionManager (= 2.9.3)
|
||||
- YapDatabase/SQLCipher/Extensions/CloudKit (= 2.9.3)
|
||||
- YapDatabase/SQLCipher/Extensions/ConnectionProxy (= 2.9.3)
|
||||
- YapDatabase/SQLCipher/Extensions/CrossProcessNotification (= 2.9.3)
|
||||
- YapDatabase/SQLCipher/Extensions/FilteredViews (= 2.9.3)
|
||||
- YapDatabase/SQLCipher/Extensions/FullTextSearch (= 2.9.3)
|
||||
- YapDatabase/SQLCipher/Extensions/Hooks (= 2.9.3)
|
||||
- YapDatabase/SQLCipher/Extensions/Relationships (= 2.9.3)
|
||||
- YapDatabase/SQLCipher/Extensions/RTreeIndex (= 2.9.3)
|
||||
- YapDatabase/SQLCipher/Extensions/SearchResults (= 2.9.3)
|
||||
- YapDatabase/SQLCipher/Extensions/SecondaryIndex (= 2.9.3)
|
||||
- YapDatabase/SQLCipher/Extensions/Views (= 2.9.3)
|
||||
- YapDatabase/SQLCipher/Extensions/ActionManager (2.9.3):
|
||||
- YapDatabase/SQLCipher/Core
|
||||
- YapDatabase/SQLCipher/Extensions/Views
|
||||
- YapDatabase/SQLCipher/Extensions/CloudKit (2.9.3):
|
||||
- YapDatabase/SQLCipher/Core
|
||||
- YapDatabase/SQLCipher/Extensions/ConnectionProxy (2.9.3):
|
||||
- YapDatabase/SQLCipher/Core
|
||||
- YapDatabase/SQLCipher/Extensions/CrossProcessNotification (2.9.3):
|
||||
- YapDatabase/SQLCipher/Core
|
||||
- YapDatabase/SQLCipher/Extensions/FilteredViews (2.9.3):
|
||||
- YapDatabase/SQLCipher/Core
|
||||
- YapDatabase/SQLCipher/Extensions/Views
|
||||
- YapDatabase/SQLCipher/Extensions/FullTextSearch (2.9.3):
|
||||
- YapDatabase/SQLCipher/Core
|
||||
- YapDatabase/SQLCipher/Extensions/Hooks (2.9.3):
|
||||
- YapDatabase/SQLCipher/Core
|
||||
- YapDatabase/SQLCipher/Extensions/Relationships (2.9.3):
|
||||
- YapDatabase/SQLCipher/Core
|
||||
- YapDatabase/SQLCipher/Extensions/RTreeIndex (2.9.3):
|
||||
- YapDatabase/SQLCipher/Core
|
||||
- YapDatabase/SQLCipher/Extensions/SearchResults (2.9.3):
|
||||
- YapDatabase/SQLCipher/Core
|
||||
- YapDatabase/SQLCipher/Extensions/FullTextSearch
|
||||
- YapDatabase/SQLCipher/Extensions/Views
|
||||
- YapDatabase/SQLCipher/Extensions/SecondaryIndex (2.9.3):
|
||||
- YapDatabase/SQLCipher/Core
|
||||
- YapDatabase/SQLCipher/Extensions/Views (2.9.3):
|
||||
- YapDatabase/SQLCipher/Core
|
||||
|
||||
DEPENDENCIES:
|
||||
- AxolotlKit (from `https://github.com/WhisperSystems/SignalProtocolKit.git`)
|
||||
- SignalServiceKit (from `../../SignalServiceKit.podspec`)
|
||||
- SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
|
||||
|
||||
EXTERNAL SOURCES:
|
||||
AxolotlKit:
|
||||
:git: https://github.com/WhisperSystems/SignalProtocolKit.git
|
||||
SignalServiceKit:
|
||||
:path: ../../SignalServiceKit.podspec
|
||||
SocketRocket:
|
||||
:git: https://github.com/facebook/SocketRocket.git
|
||||
|
||||
CHECKOUT OPTIONS:
|
||||
AxolotlKit:
|
||||
:commit: 28afe5c1dbcfdea73d147e464c53d191d1e3ea50
|
||||
:git: https://github.com/WhisperSystems/SignalProtocolKit.git
|
||||
SocketRocket:
|
||||
:commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf
|
||||
:git: https://github.com/facebook/SocketRocket.git
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
'25519': dc4bad7e2dbcbf1efa121068a705a44cd98c80fc
|
||||
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
|
||||
AxolotlKit: a9530d6835baae0f204b1f6b9dd79b7901176f0d
|
||||
CocoaLumberjack: aa9dcab71bdf9eaf2a63bbd9ddc87863efe45457
|
||||
HKDFKit: c058305d6f64b84f28c50bd7aa89574625bcb62a
|
||||
libPhoneNumber-iOS: f721ae4d5854bce60934f9fb9b0b28e8e68913cb
|
||||
Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b
|
||||
ProtocolBuffers: d509225eb2ea43d9582a59e94348fcf86e2abd65
|
||||
SAMKeychain: 1865333198217411f35327e8da61b43de79b635b
|
||||
SignalServiceKit: 2ad8d86da055e24ac3ea0354ec1d4b13251af28f
|
||||
SocketRocket: dbb1554b8fc288ef8ef370d6285aeca7361be31e
|
||||
SQLCipher: 43d12c0eb9c57fb438749618fc3ce0065509a559
|
||||
TwistedOakCollapsingFutures: f359b90f203e9ab13dfb92c9ff41842a7fe1cd0c
|
||||
UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
|
||||
YapDatabase: cd911121580ff16675f65ad742a9eb0ab4d9e266
|
||||
|
||||
PODFILE CHECKSUM: a0f4507b6b4e6f9da3250901b06187a67236e083
|
||||
|
||||
COCOAPODS: 1.2.1
|
||||
@ -0,0 +1,795 @@
|
||||
// !$*UTF8*$!
|
||||
{
|
||||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 46;
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
308D7DFA789594CEA62740D9 /* libPods-TSKitiOSTestAppTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C0DC1A83C39CBC09FB2405A3 /* libPods-TSKitiOSTestAppTests.a */; };
|
||||
45046FE01D95A6130015EFF2 /* TSMessagesManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45046FDF1D95A6130015EFF2 /* TSMessagesManagerTest.m */; };
|
||||
450E3C9A1D96DD2600BF4EB6 /* OWSDisappearingMessagesJobTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 450E3C991D96DD2600BF4EB6 /* OWSDisappearingMessagesJobTest.m */; };
|
||||
4516E3E81DD153CC00DC4206 /* TSGroupThreadTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4516E3E71DD153CC00DC4206 /* TSGroupThreadTest.m */; };
|
||||
4516E3EA1DD1542300DC4206 /* TSContactThreadTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4516E3E91DD1542300DC4206 /* TSContactThreadTest.m */; };
|
||||
452137231E8D6D2F0048FD10 /* OWSFakeMessageSender.m in Sources */ = {isa = PBXBuildFile; fileRef = 452137221E8D6D2F0048FD10 /* OWSFakeMessageSender.m */; };
|
||||
452EE6CF1D4A754C00E934BA /* TSThreadTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 452EE6CE1D4A754C00E934BA /* TSThreadTest.m */; };
|
||||
452EE6D51D4AC43300E934BA /* OWSOrphanedDataCleanerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 452EE6D41D4AC43300E934BA /* OWSOrphanedDataCleanerTest.m */; };
|
||||
453E1FCF1DA8313100DDD7B7 /* OWSMessageSenderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 453E1FCE1DA8313100DDD7B7 /* OWSMessageSenderTest.m */; };
|
||||
453E1FD81DA83E1000DDD7B7 /* OWSFakeContactsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 453E1FD71DA83E1000DDD7B7 /* OWSFakeContactsManager.m */; };
|
||||
453E1FDB1DA83EFB00DDD7B7 /* OWSFakeContactsUpdater.m in Sources */ = {isa = PBXBuildFile; fileRef = 453E1FDA1DA83EFB00DDD7B7 /* OWSFakeContactsUpdater.m */; };
|
||||
454021ED1D960ABF00F2126D /* OWSDisappearingMessageFinderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 454021EC1D960ABF00F2126D /* OWSDisappearingMessageFinderTest.m */; };
|
||||
454092FA1DB7AFDE00579DE1 /* OWSFakeNetworkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 454092F91DB7AFDE00579DE1 /* OWSFakeNetworkManager.m */; };
|
||||
45458B751CC342B600A02153 /* SignedPreKeyDeletionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 45458B6A1CC342B600A02153 /* SignedPreKeyDeletionTests.m */; };
|
||||
45458B771CC342B600A02153 /* TSMessageStorageTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 45458B6E1CC342B600A02153 /* TSMessageStorageTests.m */; };
|
||||
45458B781CC342B600A02153 /* TSStorageIdentityKeyStoreTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 45458B6F1CC342B600A02153 /* TSStorageIdentityKeyStoreTests.m */; };
|
||||
45458B791CC342B600A02153 /* TSStoragePreKeyStoreTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 45458B701CC342B600A02153 /* TSStoragePreKeyStoreTests.m */; };
|
||||
45458B7A1CC342B600A02153 /* TSStorageSignedPreKeyStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 45458B711CC342B600A02153 /* TSStorageSignedPreKeyStore.m */; };
|
||||
45458B7B1CC342B600A02153 /* CryptographyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 45458B731CC342B600A02153 /* CryptographyTests.m */; };
|
||||
45458B7C1CC342B600A02153 /* MessagePaddingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 45458B741CC342B600A02153 /* MessagePaddingTests.m */; };
|
||||
45731A6C1DA87AA1007E22AA /* TSOutgoingMessageTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45731A6B1DA87AA1007E22AA /* TSOutgoingMessageTest.m */; };
|
||||
459850C11D22C6F2006FFEDB /* PhoneNumberTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 459850C01D22C6F2006FFEDB /* PhoneNumberTest.m */; };
|
||||
45A856AC1D220BFF0056CD4D /* TSAttributesTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45A856AB1D220BFF0056CD4D /* TSAttributesTest.m */; };
|
||||
45AE48491E072711004D96C2 /* OWSUnitTestEnvironment.m in Sources */ = {isa = PBXBuildFile; fileRef = 45AE48481E072711004D96C2 /* OWSUnitTestEnvironment.m */; };
|
||||
45AE484C1E072871004D96C2 /* OWSFakeCallMessageHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 45AE484B1E072871004D96C2 /* OWSFakeCallMessageHandler.m */; };
|
||||
45AE484F1E072906004D96C2 /* OWSFakeNotificationsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 45AE484E1E072906004D96C2 /* OWSFakeNotificationsManager.m */; };
|
||||
45B700971D9841E400269FFD /* OWSDisappearingMessagesConfigurationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45B700961D9841E400269FFD /* OWSDisappearingMessagesConfigurationTest.m */; };
|
||||
45B840211D988DA100F9E938 /* OWSReadReceiptTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45B840201D988DA100F9E938 /* OWSReadReceiptTest.m */; };
|
||||
45C6A09A1D2F029B007D8AC0 /* TSMessageTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45C6A0991D2F029B007D8AC0 /* TSMessageTest.m */; };
|
||||
45D7243F1D67899F00E0CA54 /* OWSDeviceProvisionerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45D7243E1D67899F00E0CA54 /* OWSDeviceProvisionerTest.m */; };
|
||||
45E741B61E5D14E800735842 /* OWSIncomingMessageFinderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 45E741B51E5D14E800735842 /* OWSIncomingMessageFinderTest.m */; };
|
||||
51520592F83F2440F2DE4D67 /* libPods-TSKitiOSTestApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B8362AB8E280E0F64352F08A /* libPods-TSKitiOSTestApp.a */; };
|
||||
6323E1F7730289398452E5C5 /* OWSFingerprintTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 6323E02A33682A8838FE3F27 /* OWSFingerprintTest.m */; };
|
||||
6323E339D5B8F4CB77EB3ED4 /* SignalRecipientTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 6323E3E540CF763D71DACB59 /* SignalRecipientTest.m */; };
|
||||
B6273DD61C13A2E500738558 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B6273DD51C13A2E500738558 /* main.m */; };
|
||||
B6273DD91C13A2E500738558 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = B6273DD81C13A2E500738558 /* AppDelegate.m */; };
|
||||
B6273DDC1C13A2E500738558 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6273DDB1C13A2E500738558 /* ViewController.m */; };
|
||||
B6273DDF1C13A2E500738558 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B6273DDD1C13A2E500738558 /* Main.storyboard */; };
|
||||
B6273DE11C13A2E500738558 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B6273DE01C13A2E500738558 /* Assets.xcassets */; };
|
||||
B6273DE41C13A2E500738558 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B6273DE21C13A2E500738558 /* LaunchScreen.storyboard */; };
|
||||
D2AECE731DE8C3360068CE15 /* ContactSortingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D2AECE721DE8C3360068CE15 /* ContactSortingTest.m */; };
|
||||
E95668321E0964F9002418B1 /* PhoneNumberUtilTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E95668311E0964F9002418B1 /* PhoneNumberUtilTest.m */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXContainerItemProxy section */
|
||||
B6273DEB1C13A2E500738558 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = B6273DC91C13A2E500738558 /* Project object */;
|
||||
proxyType = 1;
|
||||
remoteGlobalIDString = B6273DD01C13A2E500738558;
|
||||
remoteInfo = TSKitiOSTestApp;
|
||||
};
|
||||
/* End PBXContainerItemProxy section */
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
1A50A62A8930EE2BC9B8AC11 /* Pods-TSKitiOSTestApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TSKitiOSTestApp.release.xcconfig"; path = "Pods/Target Support Files/Pods-TSKitiOSTestApp/Pods-TSKitiOSTestApp.release.xcconfig"; sourceTree = "<group>"; };
|
||||
31DFDA8F9523F5B15EA2376B /* Pods-TSKitiOSTestApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TSKitiOSTestApp.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TSKitiOSTestApp/Pods-TSKitiOSTestApp.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
36DA6C703F99948D553F4E3F /* Pods-TSKitiOSTestAppTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TSKitiOSTestAppTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TSKitiOSTestAppTests/Pods-TSKitiOSTestAppTests.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
45046FDF1D95A6130015EFF2 /* TSMessagesManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSMessagesManagerTest.m; path = ../../../tests/Messages/TSMessagesManagerTest.m; sourceTree = "<group>"; };
|
||||
450E3C991D96DD2600BF4EB6 /* OWSDisappearingMessagesJobTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSDisappearingMessagesJobTest.m; path = ../../../tests/Messages/OWSDisappearingMessagesJobTest.m; sourceTree = "<group>"; };
|
||||
4516E3E71DD153CC00DC4206 /* TSGroupThreadTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSGroupThreadTest.m; path = ../../../tests/Contacts/TSGroupThreadTest.m; sourceTree = "<group>"; };
|
||||
4516E3E91DD1542300DC4206 /* TSContactThreadTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSContactThreadTest.m; path = ../../../tests/Contacts/TSContactThreadTest.m; sourceTree = "<group>"; };
|
||||
452137211E8D6D2F0048FD10 /* OWSFakeMessageSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSFakeMessageSender.h; path = ../../../tests/TestSupport/Fakes/OWSFakeMessageSender.h; sourceTree = "<group>"; };
|
||||
452137221E8D6D2F0048FD10 /* OWSFakeMessageSender.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSFakeMessageSender.m; path = ../../../tests/TestSupport/Fakes/OWSFakeMessageSender.m; sourceTree = "<group>"; };
|
||||
452EE6CE1D4A754C00E934BA /* TSThreadTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSThreadTest.m; path = ../../../tests/Contacts/TSThreadTest.m; sourceTree = "<group>"; };
|
||||
452EE6D41D4AC43300E934BA /* OWSOrphanedDataCleanerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSOrphanedDataCleanerTest.m; sourceTree = "<group>"; };
|
||||
453E1FCE1DA8313100DDD7B7 /* OWSMessageSenderTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSMessageSenderTest.m; path = ../../../tests/Messages/OWSMessageSenderTest.m; sourceTree = "<group>"; };
|
||||
453E1FD61DA83E1000DDD7B7 /* OWSFakeContactsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSFakeContactsManager.h; path = ../../../tests/TestSupport/Fakes/OWSFakeContactsManager.h; sourceTree = "<group>"; };
|
||||
453E1FD71DA83E1000DDD7B7 /* OWSFakeContactsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSFakeContactsManager.m; path = ../../../tests/TestSupport/Fakes/OWSFakeContactsManager.m; sourceTree = "<group>"; };
|
||||
453E1FD91DA83EFB00DDD7B7 /* OWSFakeContactsUpdater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSFakeContactsUpdater.h; path = ../../../tests/TestSupport/Fakes/OWSFakeContactsUpdater.h; sourceTree = "<group>"; };
|
||||
453E1FDA1DA83EFB00DDD7B7 /* OWSFakeContactsUpdater.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSFakeContactsUpdater.m; path = ../../../tests/TestSupport/Fakes/OWSFakeContactsUpdater.m; sourceTree = "<group>"; };
|
||||
454021EC1D960ABF00F2126D /* OWSDisappearingMessageFinderTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSDisappearingMessageFinderTest.m; path = ../../../tests/Messages/OWSDisappearingMessageFinderTest.m; sourceTree = "<group>"; };
|
||||
454092F81DB7AFDE00579DE1 /* OWSFakeNetworkManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSFakeNetworkManager.h; path = ../../../tests/TestSupport/Fakes/OWSFakeNetworkManager.h; sourceTree = "<group>"; };
|
||||
454092F91DB7AFDE00579DE1 /* OWSFakeNetworkManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSFakeNetworkManager.m; path = ../../../tests/TestSupport/Fakes/OWSFakeNetworkManager.m; sourceTree = "<group>"; };
|
||||
45458B6A1CC342B600A02153 /* SignedPreKeyDeletionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SignedPreKeyDeletionTests.m; sourceTree = "<group>"; };
|
||||
45458B6E1CC342B600A02153 /* TSMessageStorageTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSMessageStorageTests.m; sourceTree = "<group>"; };
|
||||
45458B6F1CC342B600A02153 /* TSStorageIdentityKeyStoreTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSStorageIdentityKeyStoreTests.m; sourceTree = "<group>"; };
|
||||
45458B701CC342B600A02153 /* TSStoragePreKeyStoreTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSStoragePreKeyStoreTests.m; sourceTree = "<group>"; };
|
||||
45458B711CC342B600A02153 /* TSStorageSignedPreKeyStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSStorageSignedPreKeyStore.m; sourceTree = "<group>"; };
|
||||
45458B731CC342B600A02153 /* CryptographyTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CryptographyTests.m; sourceTree = "<group>"; };
|
||||
45458B741CC342B600A02153 /* MessagePaddingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessagePaddingTests.m; sourceTree = "<group>"; };
|
||||
45731A6B1DA87AA1007E22AA /* TSOutgoingMessageTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSOutgoingMessageTest.m; path = ../../../tests/Messages/Interactions/TSOutgoingMessageTest.m; sourceTree = "<group>"; };
|
||||
459850C01D22C6F2006FFEDB /* PhoneNumberTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PhoneNumberTest.m; path = ../../../tests/Contacts/PhoneNumberTest.m; sourceTree = "<group>"; };
|
||||
459FE0DA1D4AD49E00E1071A /* TSKitiOSTestApp-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TSKitiOSTestApp-Prefix.pch"; sourceTree = "<group>"; };
|
||||
45A856AB1D220BFF0056CD4D /* TSAttributesTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSAttributesTest.m; sourceTree = "<group>"; };
|
||||
45AE48471E072711004D96C2 /* OWSUnitTestEnvironment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSUnitTestEnvironment.h; path = ../../../tests/TestSupport/Fakes/OWSUnitTestEnvironment.h; sourceTree = "<group>"; };
|
||||
45AE48481E072711004D96C2 /* OWSUnitTestEnvironment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSUnitTestEnvironment.m; path = ../../../tests/TestSupport/Fakes/OWSUnitTestEnvironment.m; sourceTree = "<group>"; };
|
||||
45AE484A1E072871004D96C2 /* OWSFakeCallMessageHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSFakeCallMessageHandler.h; path = ../../../tests/TestSupport/Fakes/OWSFakeCallMessageHandler.h; sourceTree = "<group>"; };
|
||||
45AE484B1E072871004D96C2 /* OWSFakeCallMessageHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSFakeCallMessageHandler.m; path = ../../../tests/TestSupport/Fakes/OWSFakeCallMessageHandler.m; sourceTree = "<group>"; };
|
||||
45AE484D1E072906004D96C2 /* OWSFakeNotificationsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWSFakeNotificationsManager.h; path = ../../../tests/TestSupport/Fakes/OWSFakeNotificationsManager.h; sourceTree = "<group>"; };
|
||||
45AE484E1E072906004D96C2 /* OWSFakeNotificationsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSFakeNotificationsManager.m; path = ../../../tests/TestSupport/Fakes/OWSFakeNotificationsManager.m; sourceTree = "<group>"; };
|
||||
45B700961D9841E400269FFD /* OWSDisappearingMessagesConfigurationTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSDisappearingMessagesConfigurationTest.m; path = ../../../tests/Contacts/OWSDisappearingMessagesConfigurationTest.m; sourceTree = "<group>"; };
|
||||
45B840201D988DA100F9E938 /* OWSReadReceiptTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSReadReceiptTest.m; path = ../../../tests/Devices/OWSReadReceiptTest.m; sourceTree = "<group>"; };
|
||||
45C6A0991D2F029B007D8AC0 /* TSMessageTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TSMessageTest.m; path = ../../../tests/Messages/Interactions/TSMessageTest.m; sourceTree = "<group>"; };
|
||||
45D7243E1D67899F00E0CA54 /* OWSDeviceProvisionerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSDeviceProvisionerTest.m; path = ../../../tests/Devices/OWSDeviceProvisionerTest.m; sourceTree = "<group>"; };
|
||||
45E741B51E5D14E800735842 /* OWSIncomingMessageFinderTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSIncomingMessageFinderTest.m; path = ../../../tests/Messages/OWSIncomingMessageFinderTest.m; sourceTree = "<group>"; };
|
||||
6323E02A33682A8838FE3F27 /* OWSFingerprintTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWSFingerprintTest.m; path = ../../../tests/Security/OWSFingerprintTest.m; sourceTree = "<group>"; };
|
||||
6323E3E540CF763D71DACB59 /* SignalRecipientTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignalRecipientTest.m; path = ../../tests/Contacts/SignalRecipientTest.m; sourceTree = "<group>"; };
|
||||
B6273DD11C13A2E500738558 /* TSKitiOSTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TSKitiOSTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
B6273DD51C13A2E500738558 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
|
||||
B6273DD71C13A2E500738558 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
|
||||
B6273DD81C13A2E500738558 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
|
||||
B6273DDA1C13A2E500738558 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
|
||||
B6273DDB1C13A2E500738558 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
|
||||
B6273DDE1C13A2E500738558 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
|
||||
B6273DE01C13A2E500738558 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
||||
B6273DE31C13A2E500738558 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
||||
B6273DE51C13A2E500738558 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
B6273DEA1C13A2E500738558 /* TSKitiOSTestAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TSKitiOSTestAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
B6273DF01C13A2E500738558 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
B8362AB8E280E0F64352F08A /* libPods-TSKitiOSTestApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-TSKitiOSTestApp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
C0DC1A83C39CBC09FB2405A3 /* libPods-TSKitiOSTestAppTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-TSKitiOSTestAppTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
D2AECE721DE8C3360068CE15 /* ContactSortingTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ContactSortingTest.m; path = ../../../tests/Contacts/ContactSortingTest.m; sourceTree = "<group>"; };
|
||||
D3737F7A041D7147015C02C2 /* Pods-TSKitiOSTestAppTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TSKitiOSTestAppTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-TSKitiOSTestAppTests/Pods-TSKitiOSTestAppTests.release.xcconfig"; sourceTree = "<group>"; };
|
||||
E95668311E0964F9002418B1 /* PhoneNumberUtilTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PhoneNumberUtilTest.m; path = ../../../tests/Contacts/PhoneNumberUtilTest.m; sourceTree = "<group>"; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
B6273DCE1C13A2E500738558 /* Frameworks */ = {
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
51520592F83F2440F2DE4D67 /* libPods-TSKitiOSTestApp.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
B6273DE71C13A2E500738558 /* Frameworks */ = {
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
308D7DFA789594CEA62740D9 /* libPods-TSKitiOSTestAppTests.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXFrameworksBuildPhase section */
|
||||
|
||||
/* Begin PBXGroup section */
|
||||
453E1FD41DA83DD500DDD7B7 /* TestSupport */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
453E1FD51DA83DDC00DDD7B7 /* Fakes */,
|
||||
);
|
||||
name = TestSupport;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
453E1FD51DA83DDC00DDD7B7 /* Fakes */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
453E1FD61DA83E1000DDD7B7 /* OWSFakeContactsManager.h */,
|
||||
453E1FD71DA83E1000DDD7B7 /* OWSFakeContactsManager.m */,
|
||||
453E1FD91DA83EFB00DDD7B7 /* OWSFakeContactsUpdater.h */,
|
||||
453E1FDA1DA83EFB00DDD7B7 /* OWSFakeContactsUpdater.m */,
|
||||
454092F81DB7AFDE00579DE1 /* OWSFakeNetworkManager.h */,
|
||||
454092F91DB7AFDE00579DE1 /* OWSFakeNetworkManager.m */,
|
||||
45AE48471E072711004D96C2 /* OWSUnitTestEnvironment.h */,
|
||||
45AE48481E072711004D96C2 /* OWSUnitTestEnvironment.m */,
|
||||
45AE484A1E072871004D96C2 /* OWSFakeCallMessageHandler.h */,
|
||||
45AE484B1E072871004D96C2 /* OWSFakeCallMessageHandler.m */,
|
||||
45AE484D1E072906004D96C2 /* OWSFakeNotificationsManager.h */,
|
||||
45AE484E1E072906004D96C2 /* OWSFakeNotificationsManager.m */,
|
||||
452137211E8D6D2F0048FD10 /* OWSFakeMessageSender.h */,
|
||||
452137221E8D6D2F0048FD10 /* OWSFakeMessageSender.m */,
|
||||
);
|
||||
name = Fakes;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
45458B691CC342B600A02153 /* Account */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
45458B6A1CC342B600A02153 /* SignedPreKeyDeletionTests.m */,
|
||||
45A856AB1D220BFF0056CD4D /* TSAttributesTest.m */,
|
||||
);
|
||||
name = Account;
|
||||
path = ../../../tests/Account;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
45458B6D1CC342B600A02153 /* Storage */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
45458B6E1CC342B600A02153 /* TSMessageStorageTests.m */,
|
||||
45458B6F1CC342B600A02153 /* TSStorageIdentityKeyStoreTests.m */,
|
||||
45458B701CC342B600A02153 /* TSStoragePreKeyStoreTests.m */,
|
||||
45458B711CC342B600A02153 /* TSStorageSignedPreKeyStore.m */,
|
||||
452EE6D41D4AC43300E934BA /* OWSOrphanedDataCleanerTest.m */,
|
||||
);
|
||||
name = Storage;
|
||||
path = ../../../tests/Storage;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
45458B721CC342B600A02153 /* Util */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
45458B731CC342B600A02153 /* CryptographyTests.m */,
|
||||
45458B741CC342B600A02153 /* MessagePaddingTests.m */,
|
||||
);
|
||||
name = Util;
|
||||
path = ../../../tests/Util;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
454AB2261D89CC6E006325C9 /* Security */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
6323E02A33682A8838FE3F27 /* OWSFingerprintTest.m */,
|
||||
);
|
||||
name = Security;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
459850BF1D22C6C4006FFEDB /* Contacts */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
D2AECE721DE8C3360068CE15 /* ContactSortingTest.m */,
|
||||
45B700961D9841E400269FFD /* OWSDisappearingMessagesConfigurationTest.m */,
|
||||
459850C01D22C6F2006FFEDB /* PhoneNumberTest.m */,
|
||||
E95668311E0964F9002418B1 /* PhoneNumberUtilTest.m */,
|
||||
452EE6CE1D4A754C00E934BA /* TSThreadTest.m */,
|
||||
4516E3E71DD153CC00DC4206 /* TSGroupThreadTest.m */,
|
||||
4516E3E91DD1542300DC4206 /* TSContactThreadTest.m */,
|
||||
);
|
||||
name = Contacts;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
45C6A0971D2F0254007D8AC0 /* Messages */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
450E3C991D96DD2600BF4EB6 /* OWSDisappearingMessagesJobTest.m */,
|
||||
45C6A0981D2F0264007D8AC0 /* Interactions */,
|
||||
45046FDF1D95A6130015EFF2 /* TSMessagesManagerTest.m */,
|
||||
454021EC1D960ABF00F2126D /* OWSDisappearingMessageFinderTest.m */,
|
||||
453E1FCE1DA8313100DDD7B7 /* OWSMessageSenderTest.m */,
|
||||
45E741B51E5D14E800735842 /* OWSIncomingMessageFinderTest.m */,
|
||||
);
|
||||
name = Messages;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
45C6A0981D2F0264007D8AC0 /* Interactions */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
45C6A0991D2F029B007D8AC0 /* TSMessageTest.m */,
|
||||
45731A6B1DA87AA1007E22AA /* TSOutgoingMessageTest.m */,
|
||||
);
|
||||
name = Interactions;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
45D7243D1D67894100E0CA54 /* Devices */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
45D7243E1D67899F00E0CA54 /* OWSDeviceProvisionerTest.m */,
|
||||
45B840201D988DA100F9E938 /* OWSReadReceiptTest.m */,
|
||||
);
|
||||
name = Devices;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
5183572EFCE99F6F1791272A /* Pods */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
31DFDA8F9523F5B15EA2376B /* Pods-TSKitiOSTestApp.debug.xcconfig */,
|
||||
1A50A62A8930EE2BC9B8AC11 /* Pods-TSKitiOSTestApp.release.xcconfig */,
|
||||
36DA6C703F99948D553F4E3F /* Pods-TSKitiOSTestAppTests.debug.xcconfig */,
|
||||
D3737F7A041D7147015C02C2 /* Pods-TSKitiOSTestAppTests.release.xcconfig */,
|
||||
);
|
||||
name = Pods;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
AD6EE8912464E5C2A7FF5BA1 /* Frameworks */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
B8362AB8E280E0F64352F08A /* libPods-TSKitiOSTestApp.a */,
|
||||
C0DC1A83C39CBC09FB2405A3 /* libPods-TSKitiOSTestAppTests.a */,
|
||||
);
|
||||
name = Frameworks;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
B6273DC81C13A2E500738558 = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
B6273DD31C13A2E500738558 /* TSKitiOSTestApp */,
|
||||
B6273DED1C13A2E500738558 /* TSKitiOSTestAppTests */,
|
||||
B6273DD21C13A2E500738558 /* Products */,
|
||||
5183572EFCE99F6F1791272A /* Pods */,
|
||||
AD6EE8912464E5C2A7FF5BA1 /* Frameworks */,
|
||||
6323E3E540CF763D71DACB59 /* SignalRecipientTest.m */,
|
||||
);
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
B6273DD21C13A2E500738558 /* Products */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
B6273DD11C13A2E500738558 /* TSKitiOSTestApp.app */,
|
||||
B6273DEA1C13A2E500738558 /* TSKitiOSTestAppTests.xctest */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
B6273DD31C13A2E500738558 /* TSKitiOSTestApp */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
B6273DD71C13A2E500738558 /* AppDelegate.h */,
|
||||
B6273DD81C13A2E500738558 /* AppDelegate.m */,
|
||||
B6273DDA1C13A2E500738558 /* ViewController.h */,
|
||||
B6273DDB1C13A2E500738558 /* ViewController.m */,
|
||||
B6273DDD1C13A2E500738558 /* Main.storyboard */,
|
||||
B6273DE01C13A2E500738558 /* Assets.xcassets */,
|
||||
B6273DE21C13A2E500738558 /* LaunchScreen.storyboard */,
|
||||
B6273DE51C13A2E500738558 /* Info.plist */,
|
||||
B6273DD41C13A2E500738558 /* Supporting Files */,
|
||||
459FE0DA1D4AD49E00E1071A /* TSKitiOSTestApp-Prefix.pch */,
|
||||
);
|
||||
path = TSKitiOSTestApp;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
B6273DD41C13A2E500738558 /* Supporting Files */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
B6273DD51C13A2E500738558 /* main.m */,
|
||||
);
|
||||
name = "Supporting Files";
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
B6273DED1C13A2E500738558 /* TSKitiOSTestAppTests */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
453E1FD41DA83DD500DDD7B7 /* TestSupport */,
|
||||
45458B691CC342B600A02153 /* Account */,
|
||||
459850BF1D22C6C4006FFEDB /* Contacts */,
|
||||
45D7243D1D67894100E0CA54 /* Devices */,
|
||||
45C6A0971D2F0254007D8AC0 /* Messages */,
|
||||
454AB2261D89CC6E006325C9 /* Security */,
|
||||
45458B6D1CC342B600A02153 /* Storage */,
|
||||
45458B721CC342B600A02153 /* Util */,
|
||||
B6273DF01C13A2E500738558 /* Info.plist */,
|
||||
);
|
||||
path = TSKitiOSTestAppTests;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* End PBXGroup section */
|
||||
|
||||
/* Begin PBXNativeTarget section */
|
||||
B6273DD01C13A2E500738558 /* TSKitiOSTestApp */ = {
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = B6273DF31C13A2E500738558 /* Build configuration list for PBXNativeTarget "TSKitiOSTestApp" */;
|
||||
buildPhases = (
|
||||
017ACCC36CB4DFE28280A303 /* [CP] Check Pods Manifest.lock */,
|
||||
B6273DCD1C13A2E500738558 /* Sources */,
|
||||
B6273DCE1C13A2E500738558 /* Frameworks */,
|
||||
B6273DCF1C13A2E500738558 /* Resources */,
|
||||
7240F1DFEB8F39F882DA4F72 /* [CP] Embed Pods Frameworks */,
|
||||
79F90B25B480501ADACC3092 /* [CP] Copy Pods Resources */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
dependencies = (
|
||||
);
|
||||
name = TSKitiOSTestApp;
|
||||
productName = TSKitiOSTestApp;
|
||||
productReference = B6273DD11C13A2E500738558 /* TSKitiOSTestApp.app */;
|
||||
productType = "com.apple.product-type.application";
|
||||
};
|
||||
B6273DE91C13A2E500738558 /* TSKitiOSTestAppTests */ = {
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = B6273DF61C13A2E500738558 /* Build configuration list for PBXNativeTarget "TSKitiOSTestAppTests" */;
|
||||
buildPhases = (
|
||||
B8404FA1C41E385E21870729 /* [CP] Check Pods Manifest.lock */,
|
||||
B6273DE61C13A2E500738558 /* Sources */,
|
||||
B6273DE71C13A2E500738558 /* Frameworks */,
|
||||
B6273DE81C13A2E500738558 /* Resources */,
|
||||
7543E717C58488BBB892DDCC /* [CP] Embed Pods Frameworks */,
|
||||
276B029791E679B0E87877B7 /* [CP] Copy Pods Resources */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
dependencies = (
|
||||
B6273DEC1C13A2E500738558 /* PBXTargetDependency */,
|
||||
);
|
||||
name = TSKitiOSTestAppTests;
|
||||
productName = TSKitiOSTestAppTests;
|
||||
productReference = B6273DEA1C13A2E500738558 /* TSKitiOSTestAppTests.xctest */;
|
||||
productType = "com.apple.product-type.bundle.unit-test";
|
||||
};
|
||||
/* End PBXNativeTarget section */
|
||||
|
||||
/* Begin PBXProject section */
|
||||
B6273DC91C13A2E500738558 /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
attributes = {
|
||||
LastUpgradeCheck = 0710;
|
||||
ORGANIZATIONNAME = "Open Whisper Systems";
|
||||
TargetAttributes = {
|
||||
B6273DD01C13A2E500738558 = {
|
||||
CreatedOnToolsVersion = 7.1.1;
|
||||
DevelopmentTeam = U68MSDN6DR;
|
||||
};
|
||||
B6273DE91C13A2E500738558 = {
|
||||
CreatedOnToolsVersion = 7.1.1;
|
||||
DevelopmentTeam = U68MSDN6DR;
|
||||
TestTargetID = B6273DD01C13A2E500738558;
|
||||
};
|
||||
};
|
||||
};
|
||||
buildConfigurationList = B6273DCC1C13A2E500738558 /* Build configuration list for PBXProject "TSKitiOSTestApp" */;
|
||||
compatibilityVersion = "Xcode 3.2";
|
||||
developmentRegion = English;
|
||||
hasScannedForEncodings = 0;
|
||||
knownRegions = (
|
||||
en,
|
||||
Base,
|
||||
);
|
||||
mainGroup = B6273DC81C13A2E500738558;
|
||||
productRefGroup = B6273DD21C13A2E500738558 /* Products */;
|
||||
projectDirPath = "";
|
||||
projectRoot = "";
|
||||
targets = (
|
||||
B6273DD01C13A2E500738558 /* TSKitiOSTestApp */,
|
||||
B6273DE91C13A2E500738558 /* TSKitiOSTestAppTests */,
|
||||
);
|
||||
};
|
||||
/* End PBXProject section */
|
||||
|
||||
/* Begin PBXResourcesBuildPhase section */
|
||||
B6273DCF1C13A2E500738558 /* Resources */ = {
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
B6273DE41C13A2E500738558 /* LaunchScreen.storyboard in Resources */,
|
||||
B6273DE11C13A2E500738558 /* Assets.xcassets in Resources */,
|
||||
B6273DDF1C13A2E500738558 /* Main.storyboard in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
B6273DE81C13A2E500738558 /* Resources */ = {
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXResourcesBuildPhase section */
|
||||
|
||||
/* Begin PBXShellScriptBuildPhase section */
|
||||
017ACCC36CB4DFE28280A303 /* [CP] Check Pods Manifest.lock */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "[CP] Check Pods Manifest.lock";
|
||||
outputPaths = (
|
||||
);
|
||||
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";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
276B029791E679B0E87877B7 /* [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-TSKitiOSTestAppTests/Pods-TSKitiOSTestAppTests-resources.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
7240F1DFEB8F39F882DA4F72 /* [CP] Embed Pods Frameworks */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "[CP] Embed Pods Frameworks";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TSKitiOSTestApp/Pods-TSKitiOSTestApp-frameworks.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
7543E717C58488BBB892DDCC /* [CP] Embed Pods Frameworks */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "[CP] Embed Pods Frameworks";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TSKitiOSTestAppTests/Pods-TSKitiOSTestAppTests-frameworks.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
79F90B25B480501ADACC3092 /* [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-TSKitiOSTestApp/Pods-TSKitiOSTestApp-resources.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
B8404FA1C41E385E21870729 /* [CP] Check Pods Manifest.lock */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "[CP] Check Pods Manifest.lock";
|
||||
outputPaths = (
|
||||
);
|
||||
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";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
/* End PBXShellScriptBuildPhase section */
|
||||
|
||||
/* Begin PBXSourcesBuildPhase section */
|
||||
B6273DCD1C13A2E500738558 /* Sources */ = {
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
B6273DDC1C13A2E500738558 /* ViewController.m in Sources */,
|
||||
B6273DD91C13A2E500738558 /* AppDelegate.m in Sources */,
|
||||
B6273DD61C13A2E500738558 /* main.m in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
B6273DE61C13A2E500738558 /* Sources */ = {
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
45B840211D988DA100F9E938 /* OWSReadReceiptTest.m in Sources */,
|
||||
45458B781CC342B600A02153 /* TSStorageIdentityKeyStoreTests.m in Sources */,
|
||||
45B700971D9841E400269FFD /* OWSDisappearingMessagesConfigurationTest.m in Sources */,
|
||||
45458B751CC342B600A02153 /* SignedPreKeyDeletionTests.m in Sources */,
|
||||
45458B7B1CC342B600A02153 /* CryptographyTests.m in Sources */,
|
||||
45D7243F1D67899F00E0CA54 /* OWSDeviceProvisionerTest.m in Sources */,
|
||||
4516E3E81DD153CC00DC4206 /* TSGroupThreadTest.m in Sources */,
|
||||
45458B791CC342B600A02153 /* TSStoragePreKeyStoreTests.m in Sources */,
|
||||
45E741B61E5D14E800735842 /* OWSIncomingMessageFinderTest.m in Sources */,
|
||||
452EE6D51D4AC43300E934BA /* OWSOrphanedDataCleanerTest.m in Sources */,
|
||||
450E3C9A1D96DD2600BF4EB6 /* OWSDisappearingMessagesJobTest.m in Sources */,
|
||||
452EE6CF1D4A754C00E934BA /* TSThreadTest.m in Sources */,
|
||||
45C6A09A1D2F029B007D8AC0 /* TSMessageTest.m in Sources */,
|
||||
453E1FCF1DA8313100DDD7B7 /* OWSMessageSenderTest.m in Sources */,
|
||||
45AE484C1E072871004D96C2 /* OWSFakeCallMessageHandler.m in Sources */,
|
||||
45AE48491E072711004D96C2 /* OWSUnitTestEnvironment.m in Sources */,
|
||||
459850C11D22C6F2006FFEDB /* PhoneNumberTest.m in Sources */,
|
||||
45458B7A1CC342B600A02153 /* TSStorageSignedPreKeyStore.m in Sources */,
|
||||
453E1FDB1DA83EFB00DDD7B7 /* OWSFakeContactsUpdater.m in Sources */,
|
||||
452137231E8D6D2F0048FD10 /* OWSFakeMessageSender.m in Sources */,
|
||||
D2AECE731DE8C3360068CE15 /* ContactSortingTest.m in Sources */,
|
||||
453E1FD81DA83E1000DDD7B7 /* OWSFakeContactsManager.m in Sources */,
|
||||
454021ED1D960ABF00F2126D /* OWSDisappearingMessageFinderTest.m in Sources */,
|
||||
4516E3EA1DD1542300DC4206 /* TSContactThreadTest.m in Sources */,
|
||||
45458B771CC342B600A02153 /* TSMessageStorageTests.m in Sources */,
|
||||
45046FE01D95A6130015EFF2 /* TSMessagesManagerTest.m in Sources */,
|
||||
E95668321E0964F9002418B1 /* PhoneNumberUtilTest.m in Sources */,
|
||||
45458B7C1CC342B600A02153 /* MessagePaddingTests.m in Sources */,
|
||||
45A856AC1D220BFF0056CD4D /* TSAttributesTest.m in Sources */,
|
||||
45731A6C1DA87AA1007E22AA /* TSOutgoingMessageTest.m in Sources */,
|
||||
6323E339D5B8F4CB77EB3ED4 /* SignalRecipientTest.m in Sources */,
|
||||
45AE484F1E072906004D96C2 /* OWSFakeNotificationsManager.m in Sources */,
|
||||
6323E1F7730289398452E5C5 /* OWSFingerprintTest.m in Sources */,
|
||||
454092FA1DB7AFDE00579DE1 /* OWSFakeNetworkManager.m in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXSourcesBuildPhase section */
|
||||
|
||||
/* Begin PBXTargetDependency section */
|
||||
B6273DEC1C13A2E500738558 /* PBXTargetDependency */ = {
|
||||
isa = PBXTargetDependency;
|
||||
target = B6273DD01C13A2E500738558 /* TSKitiOSTestApp */;
|
||||
targetProxy = B6273DEB1C13A2E500738558 /* PBXContainerItemProxy */;
|
||||
};
|
||||
/* End PBXTargetDependency section */
|
||||
|
||||
/* Begin PBXVariantGroup section */
|
||||
B6273DDD1C13A2E500738558 /* Main.storyboard */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
B6273DDE1C13A2E500738558 /* Base */,
|
||||
);
|
||||
name = Main.storyboard;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
B6273DE21C13A2E500738558 /* LaunchScreen.storyboard */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
B6273DE31C13A2E500738558 /* Base */,
|
||||
);
|
||||
name = LaunchScreen.storyboard;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* End PBXVariantGroup section */
|
||||
|
||||
/* Begin XCBuildConfiguration section */
|
||||
B6273DF11C13A2E500738558 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
||||
CLANG_CXX_LIBRARY = "libc++";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_ENUM_CONVERSION = YES;
|
||||
CLANG_WARN_INT_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEBUG_INFORMATION_FORMAT = dwarf;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"DEBUG=1",
|
||||
"$(inherited)",
|
||||
);
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
|
||||
MTL_ENABLE_DEBUG_INFO = YES;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SDKROOT = iphoneos;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
B6273DF21C13A2E500738558 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
||||
CLANG_CXX_LIBRARY = "libc++";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_ENUM_CONVERSION = YES;
|
||||
CLANG_WARN_INT_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
ENABLE_NS_ASSERTIONS = NO;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
SDKROOT = iphoneos;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
VALIDATE_PRODUCT = YES;
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
B6273DF41C13A2E500738558 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 31DFDA8F9523F5B15EA2376B /* Pods-TSKitiOSTestApp.debug.xcconfig */;
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
DEVELOPMENT_TEAM = U68MSDN6DR;
|
||||
INFOPLIST_FILE = TSKitiOSTestApp/Info.plist;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.TSKitiOSTestApp;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
B6273DF51C13A2E500738558 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 1A50A62A8930EE2BC9B8AC11 /* Pods-TSKitiOSTestApp.release.xcconfig */;
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
DEVELOPMENT_TEAM = U68MSDN6DR;
|
||||
INFOPLIST_FILE = TSKitiOSTestApp/Info.plist;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.TSKitiOSTestApp;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
B6273DF71C13A2E500738558 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 36DA6C703F99948D553F4E3F /* Pods-TSKitiOSTestAppTests.debug.xcconfig */;
|
||||
buildSettings = {
|
||||
BUNDLE_LOADER = "$(TEST_HOST)";
|
||||
DEVELOPMENT_TEAM = U68MSDN6DR;
|
||||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
||||
GCC_PREFIX_HEADER = "$(SRCROOT)/$(PROJECT_NAME)/TSKitiOSTestApp-Prefix.pch";
|
||||
INFOPLIST_FILE = TSKitiOSTestAppTests/Info.plist;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.TSKitiOSTestAppTests;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TSKitiOSTestApp.app/TSKitiOSTestApp";
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
B6273DF81C13A2E500738558 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = D3737F7A041D7147015C02C2 /* Pods-TSKitiOSTestAppTests.release.xcconfig */;
|
||||
buildSettings = {
|
||||
BUNDLE_LOADER = "$(TEST_HOST)";
|
||||
DEVELOPMENT_TEAM = U68MSDN6DR;
|
||||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
||||
GCC_PREFIX_HEADER = "$(SRCROOT)/$(PROJECT_NAME)/TSKitiOSTestApp-Prefix.pch";
|
||||
INFOPLIST_FILE = TSKitiOSTestAppTests/Info.plist;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = org.whispersystems.TSKitiOSTestAppTests;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TSKitiOSTestApp.app/TSKitiOSTestApp";
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
/* End XCBuildConfiguration section */
|
||||
|
||||
/* Begin XCConfigurationList section */
|
||||
B6273DCC1C13A2E500738558 /* Build configuration list for PBXProject "TSKitiOSTestApp" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
B6273DF11C13A2E500738558 /* Debug */,
|
||||
B6273DF21C13A2E500738558 /* Release */,
|
||||
);
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
B6273DF31C13A2E500738558 /* Build configuration list for PBXNativeTarget "TSKitiOSTestApp" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
B6273DF41C13A2E500738558 /* Debug */,
|
||||
B6273DF51C13A2E500738558 /* Release */,
|
||||
);
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
B6273DF61C13A2E500738558 /* Build configuration list for PBXNativeTarget "TSKitiOSTestAppTests" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
B6273DF71C13A2E500738558 /* Debug */,
|
||||
B6273DF81C13A2E500738558 /* Release */,
|
||||
);
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
/* End XCConfigurationList section */
|
||||
};
|
||||
rootObject = B6273DC91C13A2E500738558 /* Project object */;
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Workspace
|
||||
version = "1.0">
|
||||
<FileRef
|
||||
location = "self:TSKitiOSTestApp.xcodeproj">
|
||||
</FileRef>
|
||||
</Workspace>
|
||||
@ -0,0 +1,115 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0730"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "B6273DD01C13A2E500738558"
|
||||
BuildableName = "TSKitiOSTestApp.app"
|
||||
BlueprintName = "TSKitiOSTestApp"
|
||||
ReferencedContainer = "container:TSKitiOSTestApp.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "FF3F51F81980908EDE1836B76AA3A1EC"
|
||||
BuildableName = "libSignalServiceKit.a"
|
||||
BlueprintName = "SignalServiceKit"
|
||||
ReferencedContainer = "container:Pods/Pods.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
buildConfiguration = "Debug"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES">
|
||||
<Testables>
|
||||
<TestableReference
|
||||
skipped = "NO">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "B6273DE91C13A2E500738558"
|
||||
BuildableName = "TSKitiOSTestAppTests.xctest"
|
||||
BlueprintName = "TSKitiOSTestAppTests"
|
||||
ReferencedContainer = "container:TSKitiOSTestApp.xcodeproj">
|
||||
</BuildableReference>
|
||||
</TestableReference>
|
||||
</Testables>
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "B6273DD01C13A2E500738558"
|
||||
BuildableName = "TSKitiOSTestApp.app"
|
||||
BlueprintName = "TSKitiOSTestApp"
|
||||
ReferencedContainer = "container:TSKitiOSTestApp.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
buildConfiguration = "Debug"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
debugServiceExtension = "internal"
|
||||
allowLocationSimulation = "YES">
|
||||
<BuildableProductRunnable
|
||||
runnableDebuggingMode = "0">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "B6273DD01C13A2E500738558"
|
||||
BuildableName = "TSKitiOSTestApp.app"
|
||||
BlueprintName = "TSKitiOSTestApp"
|
||||
ReferencedContainer = "container:TSKitiOSTestApp.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildableProductRunnable>
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
buildConfiguration = "Release"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
debugDocumentVersioning = "YES">
|
||||
<BuildableProductRunnable
|
||||
runnableDebuggingMode = "0">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "B6273DD01C13A2E500738558"
|
||||
BuildableName = "TSKitiOSTestApp.app"
|
||||
BlueprintName = "TSKitiOSTestApp"
|
||||
ReferencedContainer = "container:TSKitiOSTestApp.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildableProductRunnable>
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Workspace
|
||||
version = "1.0">
|
||||
<FileRef
|
||||
location = "group:TSKitiOSTestApp.xcodeproj">
|
||||
</FileRef>
|
||||
<FileRef
|
||||
location = "group:Pods/Pods.xcodeproj">
|
||||
</FileRef>
|
||||
</Workspace>
|
||||
@ -0,0 +1,17 @@
|
||||
//
|
||||
// AppDelegate.h
|
||||
// TSKitiOSTestApp
|
||||
//
|
||||
// Created by Frederic Jacobs on 05/12/15.
|
||||
// Copyright © 2015 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
@interface AppDelegate : UIResponder <UIApplicationDelegate>
|
||||
|
||||
@property (strong, nonatomic) UIWindow *window;
|
||||
|
||||
|
||||
@end
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
//
|
||||
// AppDelegate.m
|
||||
// TSKitiOSTestApp
|
||||
//
|
||||
// Created by Frederic Jacobs on 05/12/15.
|
||||
// Copyright © 2015 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "AppDelegate.h"
|
||||
|
||||
@interface AppDelegate ()
|
||||
|
||||
@end
|
||||
|
||||
@implementation AppDelegate
|
||||
|
||||
|
||||
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
|
||||
// Override point for customization after application launch.
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (void)applicationWillResignActive:(UIApplication *)application {
|
||||
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
|
||||
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
|
||||
}
|
||||
|
||||
- (void)applicationDidEnterBackground:(UIApplication *)application {
|
||||
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
|
||||
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
|
||||
}
|
||||
|
||||
- (void)applicationWillEnterForeground:(UIApplication *)application {
|
||||
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
|
||||
}
|
||||
|
||||
- (void)applicationDidBecomeActive:(UIApplication *)application {
|
||||
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
|
||||
}
|
||||
|
||||
- (void)applicationWillTerminate:(UIApplication *)application {
|
||||
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
|
||||
}
|
||||
|
||||
@end
|
||||
@ -0,0 +1,68 @@
|
||||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "iphone",
|
||||
"size" : "29x29",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "iphone",
|
||||
"size" : "29x29",
|
||||
"scale" : "3x"
|
||||
},
|
||||
{
|
||||
"idiom" : "iphone",
|
||||
"size" : "40x40",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "iphone",
|
||||
"size" : "40x40",
|
||||
"scale" : "3x"
|
||||
},
|
||||
{
|
||||
"idiom" : "iphone",
|
||||
"size" : "60x60",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "iphone",
|
||||
"size" : "60x60",
|
||||
"scale" : "3x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "29x29",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "29x29",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "40x40",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "40x40",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "76x76",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "ipad",
|
||||
"size" : "76x76",
|
||||
"scale" : "2x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
|
||||
<dependencies>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
|
||||
</dependencies>
|
||||
<scenes>
|
||||
<!--View Controller-->
|
||||
<scene sceneID="EHf-IW-A2E">
|
||||
<objects>
|
||||
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
|
||||
<layoutGuides>
|
||||
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
|
||||
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
|
||||
</layoutGuides>
|
||||
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
|
||||
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<animations/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
|
||||
</view>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="53" y="375"/>
|
||||
</scene>
|
||||
</scenes>
|
||||
</document>
|
||||
@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
|
||||
<dependencies>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
|
||||
</dependencies>
|
||||
<scenes>
|
||||
<!--View Controller-->
|
||||
<scene sceneID="tne-QT-ifu">
|
||||
<objects>
|
||||
<viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
|
||||
<layoutGuides>
|
||||
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
|
||||
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
|
||||
</layoutGuides>
|
||||
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
|
||||
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
|
||||
</view>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
</scene>
|
||||
</scenes>
|
||||
</document>
|
||||
@ -0,0 +1,47 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
<key>LSRequiresIPhoneOS</key>
|
||||
<true/>
|
||||
<key>UILaunchStoryboardName</key>
|
||||
<string>LaunchScreen</string>
|
||||
<key>UIMainStoryboardFile</key>
|
||||
<string>Main</string>
|
||||
<key>UIRequiredDeviceCapabilities</key>
|
||||
<array>
|
||||
<string>armv7</string>
|
||||
</array>
|
||||
<key>UISupportedInterfaceOrientations</key>
|
||||
<array>
|
||||
<string>UIInterfaceOrientationPortrait</string>
|
||||
<string>UIInterfaceOrientationLandscapeLeft</string>
|
||||
<string>UIInterfaceOrientationLandscapeRight</string>
|
||||
</array>
|
||||
<key>UISupportedInterfaceOrientations~ipad</key>
|
||||
<array>
|
||||
<string>UIInterfaceOrientationPortrait</string>
|
||||
<string>UIInterfaceOrientationPortraitUpsideDown</string>
|
||||
<string>UIInterfaceOrientationLandscapeLeft</string>
|
||||
<string>UIInterfaceOrientationLandscapeRight</string>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
@ -0,0 +1,8 @@
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
#ifndef TSKitiOSTestApp_Prefix_pch
|
||||
#define TSKitiOSTestApp_Prefix_pch
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
#endif /* TSKitiOSTestApp_Prefix_pch */
|
||||
@ -0,0 +1,15 @@
|
||||
//
|
||||
// ViewController.h
|
||||
// TSKitiOSTestApp
|
||||
//
|
||||
// Created by Frederic Jacobs on 05/12/15.
|
||||
// Copyright © 2015 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
@interface ViewController : UIViewController
|
||||
|
||||
|
||||
@end
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
//
|
||||
// ViewController.m
|
||||
// TSKitiOSTestApp
|
||||
//
|
||||
// Created by Frederic Jacobs on 05/12/15.
|
||||
// Copyright © 2015 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "ViewController.h"
|
||||
|
||||
@interface ViewController ()
|
||||
|
||||
@end
|
||||
|
||||
@implementation ViewController
|
||||
|
||||
- (void)viewDidLoad {
|
||||
[super viewDidLoad];
|
||||
// Do any additional setup after loading the view, typically from a nib.
|
||||
}
|
||||
|
||||
- (void)didReceiveMemoryWarning {
|
||||
[super didReceiveMemoryWarning];
|
||||
// Dispose of any resources that can be recreated.
|
||||
}
|
||||
|
||||
@end
|
||||
@ -0,0 +1,16 @@
|
||||
//
|
||||
// main.m
|
||||
// TSKitiOSTestApp
|
||||
//
|
||||
// Created by Frederic Jacobs on 05/12/15.
|
||||
// Copyright © 2015 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
#import "AppDelegate.h"
|
||||
|
||||
int main(int argc, char * argv[]) {
|
||||
@autoreleasepool {
|
||||
return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>BNDL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
</dict>
|
||||
</plist>
|
||||
@ -0,0 +1,5 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'fastlane'
|
||||
gem 'cocoapods'
|
||||
|
||||
@ -0,0 +1,189 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
CFPropertyList (2.3.5)
|
||||
activesupport (4.2.9)
|
||||
i18n (~> 0.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
tzinfo (~> 1.1)
|
||||
addressable (2.5.1)
|
||||
public_suffix (~> 2.0, >= 2.0.2)
|
||||
babosa (1.0.2)
|
||||
claide (1.0.2)
|
||||
cocoapods (1.2.1)
|
||||
activesupport (>= 4.0.2, < 5)
|
||||
claide (>= 1.0.1, < 2.0)
|
||||
cocoapods-core (= 1.2.1)
|
||||
cocoapods-deintegrate (>= 1.0.1, < 2.0)
|
||||
cocoapods-downloader (>= 1.1.3, < 2.0)
|
||||
cocoapods-plugins (>= 1.0.0, < 2.0)
|
||||
cocoapods-search (>= 1.0.0, < 2.0)
|
||||
cocoapods-stats (>= 1.0.0, < 2.0)
|
||||
cocoapods-trunk (>= 1.2.0, < 2.0)
|
||||
cocoapods-try (>= 1.1.0, < 2.0)
|
||||
colored2 (~> 3.1)
|
||||
escape (~> 0.0.4)
|
||||
fourflusher (~> 2.0.1)
|
||||
gh_inspector (~> 1.0)
|
||||
molinillo (~> 0.5.7)
|
||||
nap (~> 1.0)
|
||||
ruby-macho (~> 1.1)
|
||||
xcodeproj (>= 1.4.4, < 2.0)
|
||||
cocoapods-core (1.2.1)
|
||||
activesupport (>= 4.0.2, < 5)
|
||||
fuzzy_match (~> 2.0.4)
|
||||
nap (~> 1.0)
|
||||
cocoapods-deintegrate (1.0.1)
|
||||
cocoapods-downloader (1.1.3)
|
||||
cocoapods-plugins (1.0.0)
|
||||
nap
|
||||
cocoapods-search (1.0.0)
|
||||
cocoapods-stats (1.0.0)
|
||||
cocoapods-trunk (1.2.0)
|
||||
nap (>= 0.8, < 2.0)
|
||||
netrc (= 0.7.8)
|
||||
cocoapods-try (1.1.0)
|
||||
colored (1.2)
|
||||
colored2 (3.1.2)
|
||||
commander-fastlane (4.4.5)
|
||||
highline (~> 1.7.2)
|
||||
declarative (0.0.9)
|
||||
declarative-option (0.1.0)
|
||||
domain_name (0.5.20170404)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
dotenv (2.2.1)
|
||||
escape (0.0.4)
|
||||
excon (0.57.1)
|
||||
faraday (0.12.1)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday-cookie_jar (0.0.6)
|
||||
faraday (>= 0.7.4)
|
||||
http-cookie (~> 1.0.0)
|
||||
faraday_middleware (0.11.0.1)
|
||||
faraday (>= 0.7.4, < 1.0)
|
||||
fastimage (2.1.0)
|
||||
fastlane (2.46.0)
|
||||
CFPropertyList (>= 2.3, < 3.0.0)
|
||||
addressable (>= 2.3, < 3.0.0)
|
||||
babosa (>= 1.0.2, < 2.0.0)
|
||||
bundler (>= 1.12.0, < 2.0.0)
|
||||
colored
|
||||
commander-fastlane (>= 4.4.5, < 5.0.0)
|
||||
dotenv (>= 2.1.1, < 3.0.0)
|
||||
excon (>= 0.45.0, < 1.0.0)
|
||||
faraday (~> 0.9)
|
||||
faraday-cookie_jar (~> 0.0.6)
|
||||
faraday_middleware (~> 0.9)
|
||||
fastimage (>= 2.1.0, < 3.0.0)
|
||||
gh_inspector (>= 1.0.1, < 2.0.0)
|
||||
google-api-client (>= 0.12.0, < 0.13.0)
|
||||
highline (>= 1.7.2, < 2.0.0)
|
||||
json (< 3.0.0)
|
||||
mini_magick (~> 4.5.1)
|
||||
multi_json
|
||||
multi_xml (~> 0.5)
|
||||
multipart-post (~> 2.0.0)
|
||||
plist (>= 3.1.0, < 4.0.0)
|
||||
rubyzip (>= 1.1.0, < 2.0.0)
|
||||
security (= 0.1.3)
|
||||
slack-notifier (>= 1.3, < 2.0.0)
|
||||
terminal-notifier (>= 1.6.2, < 2.0.0)
|
||||
terminal-table (>= 1.4.5, < 2.0.0)
|
||||
tty-screen (~> 0.5.0)
|
||||
word_wrap (~> 1.0.0)
|
||||
xcodeproj (>= 1.4.4, < 2.0.0)
|
||||
xcpretty (>= 0.2.4, < 1.0.0)
|
||||
xcpretty-travis-formatter (>= 0.0.3)
|
||||
fourflusher (2.0.1)
|
||||
fuzzy_match (2.0.4)
|
||||
gh_inspector (1.0.3)
|
||||
google-api-client (0.12.0)
|
||||
addressable (~> 2.5, >= 2.5.1)
|
||||
googleauth (~> 0.5)
|
||||
httpclient (>= 2.8.1, < 3.0)
|
||||
mime-types (~> 3.0)
|
||||
representable (~> 3.0)
|
||||
retriable (>= 2.0, < 4.0)
|
||||
googleauth (0.5.1)
|
||||
faraday (~> 0.9)
|
||||
jwt (~> 1.4)
|
||||
logging (~> 2.0)
|
||||
memoist (~> 0.12)
|
||||
multi_json (~> 1.11)
|
||||
os (~> 0.9)
|
||||
signet (~> 0.7)
|
||||
highline (1.7.8)
|
||||
http-cookie (1.0.3)
|
||||
domain_name (~> 0.5)
|
||||
httpclient (2.8.3)
|
||||
i18n (0.8.6)
|
||||
json (2.1.0)
|
||||
jwt (1.5.6)
|
||||
little-plugger (1.1.4)
|
||||
logging (2.2.2)
|
||||
little-plugger (~> 1.1)
|
||||
multi_json (~> 1.10)
|
||||
memoist (0.16.0)
|
||||
mime-types (3.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2016.0521)
|
||||
mini_magick (4.5.1)
|
||||
minitest (5.10.2)
|
||||
molinillo (0.5.7)
|
||||
multi_json (1.12.1)
|
||||
multi_xml (0.6.0)
|
||||
multipart-post (2.0.0)
|
||||
nanaimo (0.2.3)
|
||||
nap (1.1.0)
|
||||
netrc (0.7.8)
|
||||
os (0.9.6)
|
||||
plist (3.3.0)
|
||||
public_suffix (2.0.5)
|
||||
representable (3.0.4)
|
||||
declarative (< 0.1.0)
|
||||
declarative-option (< 0.2.0)
|
||||
uber (< 0.2.0)
|
||||
retriable (3.0.2)
|
||||
rouge (2.0.7)
|
||||
ruby-macho (1.1.0)
|
||||
rubyzip (1.2.1)
|
||||
security (0.1.3)
|
||||
signet (0.7.3)
|
||||
addressable (~> 2.3)
|
||||
faraday (~> 0.9)
|
||||
jwt (~> 1.5)
|
||||
multi_json (~> 1.10)
|
||||
slack-notifier (1.5.1)
|
||||
terminal-notifier (1.8.0)
|
||||
terminal-table (1.8.0)
|
||||
unicode-display_width (~> 1.1, >= 1.1.1)
|
||||
thread_safe (0.3.6)
|
||||
tty-screen (0.5.0)
|
||||
tzinfo (1.2.3)
|
||||
thread_safe (~> 0.1)
|
||||
uber (0.1.0)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.4)
|
||||
unicode-display_width (1.3.0)
|
||||
word_wrap (1.0.0)
|
||||
xcodeproj (1.5.0)
|
||||
CFPropertyList (~> 2.3.3)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
colored2 (~> 3.1)
|
||||
nanaimo (~> 0.2.3)
|
||||
xcpretty (0.2.8)
|
||||
rouge (~> 2.0.7)
|
||||
xcpretty-travis-formatter (0.0.4)
|
||||
xcpretty (~> 0.2, >= 0.0.7)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
cocoapods
|
||||
fastlane
|
||||
|
||||
BUNDLED WITH
|
||||
1.14.6
|
||||
@ -0,0 +1,621 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
@ -0,0 +1,48 @@
|
||||
# Make sure we're failing even though we pipe to xcpretty
|
||||
SHELL=/bin/bash -o pipefail -o errexit
|
||||
|
||||
WORKING_DIR = Example/TSKitiOSTestApp
|
||||
SCHEME = TSKitiOSTestApp
|
||||
|
||||
DEVICE_UUID:=$(shell xcrun instruments -s | grep -o "iPhone 6 (9.3) \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$$/\1/")
|
||||
BUILD_DESTINATION = platform=iOS Simulator,id=${DEVICE_UUID}
|
||||
XCODE_BUILD = xcrun xcodebuild -workspace $(SCHEME).xcworkspace -scheme $(SCHEME) -sdk iphonesimulator
|
||||
|
||||
.PHONY: build test retest clean
|
||||
|
||||
default: test
|
||||
|
||||
test: pod_install retest
|
||||
|
||||
scan_test: pod_install scan
|
||||
|
||||
pod_install:
|
||||
cd $(WORKING_DIR) && \
|
||||
bundle exec pod install
|
||||
|
||||
build: pod_install
|
||||
cd $(WORKING_DIR) && \
|
||||
$(XCODE_BUILD) build | xcpretty
|
||||
|
||||
retest: optional_early_start_simulator
|
||||
cd $(WORKING_DIR) && \
|
||||
$(XCODE_BUILD) \
|
||||
-destination '${BUILD_DESTINATION}' \
|
||||
test | xcpretty
|
||||
|
||||
scan:
|
||||
bundle exec fastlane scan
|
||||
|
||||
clean:
|
||||
cd $(WORKING_DIR) && \
|
||||
$(XCODE_BUILD) \
|
||||
clean | xcpretty
|
||||
|
||||
optional_early_start_simulator:
|
||||
ifdef EARLY_START_SIMULATOR
|
||||
echo "Waiting for simulator to start to help with testing timeouts" &&\
|
||||
xcrun instruments -w '${DEVICE_UUID}' || true # xcrun can return irrelevant non-zeroes.
|
||||
else
|
||||
echo "Not waiting for simulator."
|
||||
endif
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
# SignalServiceKit
|
||||
|
||||
SignalServiceKit is an Objective-C library for communicating with the Signal
|
||||
messaging service for iOS & OS X
|
||||
@ -0,0 +1,45 @@
|
||||
#
|
||||
# Be sure to run `pod lib lint SignalServiceKit.podspec' to ensure this is a
|
||||
# valid spec before submitting.
|
||||
#
|
||||
# Any lines starting with a # are optional, but their use is encouraged
|
||||
# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
|
||||
#
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "SignalServiceKit"
|
||||
s.version = "0.9.0"
|
||||
s.summary = "An Objective-C library for communicating with the Signal messaging service."
|
||||
|
||||
s.description = <<-DESC
|
||||
An Objective-C library for communicating with the Signal messaging service.
|
||||
DESC
|
||||
|
||||
s.homepage = "https://github.com/WhisperSystems/SignalServiceKit"
|
||||
s.license = 'GPLv3'
|
||||
s.author = { "Frederic Jacobs" => "github@fredericjacobs.com" }
|
||||
s.source = { :git => "https://github.com/WhisperSystems/SignalServiceKit.git", :tag => s.version.to_s }
|
||||
s.social_media_url = 'https://twitter.com/FredericJacobs'
|
||||
|
||||
s.platform = :ios, '8.0'
|
||||
#s.ios.deployment_target = '8.0'
|
||||
#s.osx.deployment_target = '10.9'
|
||||
s.requires_arc = true
|
||||
s.source_files = 'src/**/*.{h,m,mm}'
|
||||
|
||||
s.resources = ['src/Security/PinningCertificate/textsecure.cer',
|
||||
'src/Security/PinningCertificate/GIAG2.crt']
|
||||
s.prefix_header_file = 'src/TSPrefix.h'
|
||||
s.xcconfig = { 'OTHER_CFLAGS' => '$(inherited) -DSQLITE_HAS_CODEC' }
|
||||
|
||||
s.dependency '25519'
|
||||
s.dependency 'CocoaLumberjack'
|
||||
s.dependency 'AFNetworking'
|
||||
s.dependency 'AxolotlKit'
|
||||
s.dependency 'Mantle'
|
||||
s.dependency 'YapDatabase/SQLCipher', '~> 2.9.3'
|
||||
s.dependency 'SocketRocket'
|
||||
s.dependency 'libPhoneNumber-iOS'
|
||||
s.dependency 'SAMKeychain'
|
||||
s.dependency 'TwistedOakCollapsingFutures'
|
||||
end
|
||||
@ -0,0 +1,12 @@
|
||||
#!/bin/bash
|
||||
|
||||
git log -1 HEAD | grep -i FREEBIE > /dev/null
|
||||
|
||||
if [[ $? -ne 0 ]]
|
||||
then
|
||||
cat <<EOM
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
!! You forgot to include FREEBIE in your commit message. !!
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
EOM
|
||||
fi
|
||||
@ -0,0 +1,141 @@
|
||||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import os
|
||||
import sys
|
||||
import subprocess
|
||||
import datetime
|
||||
import argparse
|
||||
import commands
|
||||
|
||||
|
||||
git_repo_path = os.path.abspath(subprocess.check_output(['git', 'rev-parse', '--show-toplevel']).strip())
|
||||
|
||||
|
||||
def splitall(path):
|
||||
allparts = []
|
||||
while 1:
|
||||
parts = os.path.split(path)
|
||||
if parts[0] == path: # sentinel for absolute paths
|
||||
allparts.insert(0, parts[0])
|
||||
break
|
||||
elif parts[1] == path: # sentinel for relative paths
|
||||
allparts.insert(0, parts[1])
|
||||
break
|
||||
else:
|
||||
path = parts[0]
|
||||
allparts.insert(0, parts[1])
|
||||
return allparts
|
||||
|
||||
|
||||
def process(filepath):
|
||||
|
||||
short_filepath = filepath[len(git_repo_path):]
|
||||
if short_filepath.startswith(os.sep):
|
||||
short_filepath = short_filepath[len(os.sep):]
|
||||
|
||||
filename = os.path.basename(filepath)
|
||||
if filename.startswith('.'):
|
||||
return
|
||||
file_ext = os.path.splitext(filename)[1]
|
||||
if file_ext in ('.swift'):
|
||||
env_copy = os.environ.copy()
|
||||
env_copy["SCRIPT_INPUT_FILE_COUNT"] = "1"
|
||||
env_copy["SCRIPT_INPUT_FILE_0"] = '%s' % ( short_filepath, )
|
||||
lint_output = subprocess.check_output(['swiftlint', 'autocorrect', '--use-script-input-files'], env=env_copy)
|
||||
print lint_output
|
||||
try:
|
||||
lint_output = subprocess.check_output(['swiftlint', 'lint', '--use-script-input-files'], env=env_copy)
|
||||
except subprocess.CalledProcessError, e:
|
||||
lint_output = e.output
|
||||
print lint_output
|
||||
|
||||
with open(filepath, 'rt') as f:
|
||||
text = f.read()
|
||||
original_text = text
|
||||
|
||||
lines = text.split('\n')
|
||||
while lines and lines[0].startswith('//'):
|
||||
lines = lines[1:]
|
||||
text = '\n'.join(lines)
|
||||
text = text.strip()
|
||||
|
||||
header = '''//
|
||||
// Copyright (c) %s Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
''' % (
|
||||
datetime.datetime.now().year,
|
||||
)
|
||||
text = header + text + '\n'
|
||||
|
||||
if original_text == text:
|
||||
return
|
||||
|
||||
print 'Updating:', short_filepath
|
||||
|
||||
with open(filepath, 'wt') as f:
|
||||
f.write(text)
|
||||
|
||||
|
||||
def should_ignore_path(path):
|
||||
ignore_paths = [
|
||||
os.path.join(git_repo_path, '.git')
|
||||
]
|
||||
for ignore_path in ignore_paths:
|
||||
if path.startswith(ignore_path):
|
||||
return True
|
||||
for component in splitall(path):
|
||||
if component.startswith('.'):
|
||||
return True
|
||||
if component.endswith('.framework'):
|
||||
return True
|
||||
if component in ('Pods', 'ThirdParty', 'Carthage',):
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
|
||||
def process_if_appropriate(filepath):
|
||||
filename = os.path.basename(filepath)
|
||||
if filename.startswith('.'):
|
||||
return
|
||||
file_ext = os.path.splitext(filename)[1]
|
||||
if file_ext not in ('.h', '.hpp', '.cpp', '.m', '.mm', '.pch', '.swift'):
|
||||
return
|
||||
if should_ignore_path(filepath):
|
||||
return
|
||||
process(filepath)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
parser = argparse.ArgumentParser(description='Precommit script.')
|
||||
parser.add_argument('--all', action='store_true', help='process all files in or below current dir')
|
||||
args = parser.parse_args()
|
||||
|
||||
if args.all:
|
||||
for rootdir, dirnames, filenames in os.walk(git_repo_path):
|
||||
for filename in filenames:
|
||||
file_path = os.path.abspath(os.path.join(rootdir, filename))
|
||||
process_if_appropriate(file_path)
|
||||
else:
|
||||
filepaths = []
|
||||
|
||||
# Staging
|
||||
output = commands.getoutput('git diff --cached --name-only --diff-filter=ACMR')
|
||||
filepaths.extend([line.strip() for line in output.split('\n')])
|
||||
|
||||
# Working
|
||||
output = commands.getoutput('git diff --name-only --diff-filter=ACMR')
|
||||
filepaths.extend([line.strip() for line in output.split('\n')])
|
||||
|
||||
# Only process each path once.
|
||||
filepaths = sorted(set(filepaths))
|
||||
|
||||
for filepath in filepaths:
|
||||
filepath = os.path.abspath(os.path.join(git_repo_path, filepath))
|
||||
process_if_appropriate(filepath)
|
||||
|
||||
print 'git clang-format...'
|
||||
print commands.getoutput('git clang-format')
|
||||
@ -0,0 +1 @@
|
||||
test_output
|
||||
@ -0,0 +1,8 @@
|
||||
# For more information about this configuration visit
|
||||
# https://github.com/fastlane/fastlane/tree/master/scan#scanfile
|
||||
|
||||
workspace "Example/TSKitiOSTestApp/TSKitiOSTestApp.xcworkspace"
|
||||
scheme "TSKitiOSTestApp"
|
||||
|
||||
devices ["iPhone SE"]
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
# See README.md in this dir for prerequisite setup.
|
||||
|
||||
PROTOC=protoc \
|
||||
--plugin=/usr/local/bin/protoc-gen-objc \
|
||||
--proto_path="${HOME}/src/WhisperSystems/protobuf-objc/src/compiler/" \
|
||||
--proto_path="${HOME}/src/WhisperSystems/protobuf-objc/src/compiler/google/protobuf/" \
|
||||
--proto_path='./'
|
||||
|
||||
all: signal_service_proto provisioning_protos fingerprint_protos
|
||||
|
||||
signal_service_proto: OWSSignalServiceProtos.proto
|
||||
$(PROTOC) --objc_out=../src/Messages/ \
|
||||
OWSSignalServiceProtos.proto
|
||||
|
||||
provisioning_protos: OWSProvisioningProtos.proto
|
||||
$(PROTOC) --objc_out=../src/Devices/ \
|
||||
OWSProvisioningProtos.proto
|
||||
|
||||
fingerprint_protos: OWSFingerprintProtos.proto
|
||||
$(PROTOC) --objc_out=../src/Security/ \
|
||||
OWSFingerprintProtos.proto
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
package textsecure;
|
||||
|
||||
option java_package = "org.whispersystems.libsignal.fingerprint";
|
||||
option java_outer_classname = "FingerprintProtos";
|
||||
|
||||
import "objectivec-descriptor.proto";
|
||||
option (google.protobuf.objectivec_file_options).class_prefix = "OWSFingerprintProtos";
|
||||
|
||||
message LogicalFingerprint {
|
||||
optional bytes identityData = 1;
|
||||
// optional bytes identifier = 2;
|
||||
}
|
||||
|
||||
message LogicalFingerprints {
|
||||
optional uint32 version = 1;
|
||||
optional LogicalFingerprint localFingerprint = 2;
|
||||
optional LogicalFingerprint remoteFingerprint = 3;
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package signalservice;
|
||||
|
||||
option java_package = "org.whispersystems.signalservice.internal.push";
|
||||
option java_outer_classname = "ProvisioningProtos";
|
||||
|
||||
import "objectivec-descriptor.proto";
|
||||
option (google.protobuf.objectivec_file_options).class_prefix = "OWSProvisioningProtos";
|
||||
|
||||
message ProvisionEnvelope {
|
||||
optional bytes publicKey = 1;
|
||||
optional bytes body = 2; // Encrypted ProvisionMessage
|
||||
}
|
||||
|
||||
message ProvisionMessage {
|
||||
optional bytes identityKeyPublic = 1;
|
||||
optional bytes identityKeyPrivate = 2;
|
||||
optional string number = 3;
|
||||
optional string provisioningCode = 4;
|
||||
optional string userAgent = 5;
|
||||
}
|
||||
@ -0,0 +1,209 @@
|
||||
/**
|
||||
* Copyright (C) 2014-2016 Open Whisper Systems
|
||||
*
|
||||
* Licensed according to the LICENSE file in this repository.
|
||||
*/
|
||||
|
||||
package signalservice;
|
||||
|
||||
option java_package = "org.whispersystems.signalservice.internal.push";
|
||||
option java_outer_classname = "SignalServiceProtos";
|
||||
|
||||
import "objectivec-descriptor.proto";
|
||||
option (google.protobuf.objectivec_file_options).class_prefix = "OWSSignalServiceProtos";
|
||||
|
||||
message Envelope {
|
||||
enum Type {
|
||||
UNKNOWN = 0;
|
||||
CIPHERTEXT = 1;
|
||||
KEY_EXCHANGE = 2;
|
||||
PREKEY_BUNDLE = 3;
|
||||
RECEIPT = 5;
|
||||
}
|
||||
|
||||
optional Type type = 1;
|
||||
optional string source = 2;
|
||||
optional uint32 sourceDevice = 7;
|
||||
optional string relay = 3;
|
||||
optional uint64 timestamp = 5;
|
||||
optional bytes legacyMessage = 6; // Contains an encrypted DataMessage
|
||||
optional bytes content = 8; // Contains an encrypted Content
|
||||
}
|
||||
|
||||
message Content {
|
||||
optional DataMessage dataMessage = 1;
|
||||
optional SyncMessage syncMessage = 2;
|
||||
optional CallMessage callMessage = 3;
|
||||
optional NullMessage nullMessage = 4;
|
||||
}
|
||||
|
||||
message NullMessage {
|
||||
optional bytes padding = 1;
|
||||
}
|
||||
|
||||
message Verified {
|
||||
enum State {
|
||||
DEFAULT = 0;
|
||||
VERIFIED = 1;
|
||||
UNVERIFIED = 2;
|
||||
}
|
||||
|
||||
optional string destination = 1;
|
||||
optional bytes identityKey = 2;
|
||||
optional State state = 3;
|
||||
optional bytes nullMessage = 4;
|
||||
}
|
||||
|
||||
message CallMessage {
|
||||
message Offer {
|
||||
optional uint64 id = 1;
|
||||
// We've renamed the description field on iOS to avoid
|
||||
// conflicts with [NSObject description].
|
||||
optional string sessionDescription = 2;
|
||||
}
|
||||
|
||||
message Answer {
|
||||
optional uint64 id = 1;
|
||||
// We've renamed the description field on iOS to avoid
|
||||
// conflicts with [NSObject description].
|
||||
optional string sessionDescription = 2;
|
||||
}
|
||||
|
||||
message IceUpdate {
|
||||
optional uint64 id = 1;
|
||||
optional string sdpMid = 2;
|
||||
optional uint32 sdpMLineIndex = 3;
|
||||
optional string sdp = 4;
|
||||
}
|
||||
|
||||
message Busy {
|
||||
optional uint64 id = 1;
|
||||
}
|
||||
|
||||
message Hangup {
|
||||
optional uint64 id = 1;
|
||||
}
|
||||
|
||||
|
||||
optional Offer offer = 1;
|
||||
optional Answer answer = 2;
|
||||
repeated IceUpdate iceUpdate = 3;
|
||||
optional Hangup hangup = 4;
|
||||
optional Busy busy = 5;
|
||||
}
|
||||
|
||||
message DataMessage {
|
||||
enum Flags {
|
||||
END_SESSION = 1;
|
||||
EXPIRATION_TIMER_UPDATE = 2;
|
||||
}
|
||||
|
||||
optional string body = 1;
|
||||
repeated AttachmentPointer attachments = 2;
|
||||
optional GroupContext group = 3;
|
||||
optional uint32 flags = 4;
|
||||
optional uint32 expireTimer = 5;
|
||||
}
|
||||
|
||||
message SyncMessage {
|
||||
message Sent {
|
||||
optional string destination = 1;
|
||||
optional uint64 timestamp = 2;
|
||||
optional DataMessage message = 3;
|
||||
optional uint64 expirationStartTimestamp = 4;
|
||||
}
|
||||
|
||||
message Contacts {
|
||||
optional AttachmentPointer blob = 1;
|
||||
optional bool isComplete = 2 [default = false];
|
||||
}
|
||||
|
||||
message Groups {
|
||||
optional AttachmentPointer blob = 1;
|
||||
}
|
||||
|
||||
message Blocked {
|
||||
repeated string numbers = 1;
|
||||
}
|
||||
|
||||
message Request {
|
||||
enum Type {
|
||||
UNKNOWN = 0;
|
||||
CONTACTS = 1;
|
||||
GROUPS = 2;
|
||||
BLOCKED = 3;
|
||||
}
|
||||
|
||||
optional Type type = 1;
|
||||
}
|
||||
|
||||
message Read {
|
||||
optional string sender = 1;
|
||||
optional uint64 timestamp = 2;
|
||||
}
|
||||
|
||||
optional Sent sent = 1;
|
||||
optional Contacts contacts = 2;
|
||||
optional Groups groups = 3;
|
||||
optional Request request = 4;
|
||||
repeated Read read = 5;
|
||||
optional Blocked blocked = 6;
|
||||
optional Verified verified = 7;
|
||||
optional bytes padding = 8;
|
||||
}
|
||||
|
||||
message AttachmentPointer {
|
||||
enum Flags {
|
||||
VOICE_MESSAGE = 1;
|
||||
}
|
||||
|
||||
optional fixed64 id = 1;
|
||||
optional string contentType = 2;
|
||||
optional bytes key = 3;
|
||||
optional uint32 size = 4;
|
||||
optional bytes thumbnail = 5;
|
||||
optional bytes digest = 6;
|
||||
optional string fileName = 7;
|
||||
optional uint32 flags = 8;
|
||||
}
|
||||
|
||||
message GroupContext {
|
||||
enum Type {
|
||||
UNKNOWN = 0;
|
||||
UPDATE = 1;
|
||||
DELIVER = 2;
|
||||
QUIT = 3;
|
||||
REQUEST_INFO = 4;
|
||||
}
|
||||
optional bytes id = 1;
|
||||
optional Type type = 2;
|
||||
optional string name = 3;
|
||||
repeated string members = 4;
|
||||
optional AttachmentPointer avatar = 5;
|
||||
}
|
||||
|
||||
message ContactDetails {
|
||||
message Avatar {
|
||||
optional string contentType = 1;
|
||||
optional uint32 length = 2;
|
||||
}
|
||||
|
||||
optional string number = 1;
|
||||
optional string name = 2;
|
||||
optional Avatar avatar = 3;
|
||||
optional string color = 4;
|
||||
optional Verified verified = 5;
|
||||
}
|
||||
|
||||
message GroupDetails {
|
||||
message Avatar {
|
||||
optional string contentType = 1;
|
||||
optional uint32 length = 2;
|
||||
}
|
||||
|
||||
optional bytes id = 1;
|
||||
optional string name = 2;
|
||||
repeated string members = 3;
|
||||
optional Avatar avatar = 4;
|
||||
optional bool active = 5 [default = true];
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
# SignalServiceKit Protobufs
|
||||
|
||||
These protobuf definitions are copied from Signal-Android, but modified
|
||||
to include a conventional ObjC classnames.
|
||||
|
||||
e.g.
|
||||
|
||||
import "objectivec-descriptor.proto";
|
||||
option (google.protobuf.objectivec_file_options).class_prefix = "OWSFingerprintProtos";
|
||||
|
||||
## Prequisites
|
||||
|
||||
Install protobuf 2.6, the objc plugin doesn't currently work with
|
||||
protobuf 3.0
|
||||
|
||||
brew install protobuf@2.6
|
||||
# Beware if you are depending on protobuf 3.0 elsewhere
|
||||
brew link --force protobuf@2.6
|
||||
|
||||
Install the objc plugin to $SignalServiceKitRoot/..
|
||||
|
||||
e.g. I have SignalServiceKit installed to ~/src/WhisperSystems/SignalServiceKit
|
||||
|
||||
So I run
|
||||
|
||||
cd ~/src/WhisperSystems
|
||||
git clone https://github.com/alexeyxo/protobuf-objc
|
||||
|
||||
Follow the install instructions at https://github.com/alexeyxo/protobuf-objc
|
||||
|
||||
## Building Protobuf
|
||||
|
||||
After changes are made to any proto, generate the ObjC classes by
|
||||
running:
|
||||
|
||||
cd ~/src/WhisperSystems/SignalServiceKit/protobuf
|
||||
make
|
||||
|
||||
@ -0,0 +1,89 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "TSConstants.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
extern NSString *const TSRegistrationErrorDomain;
|
||||
extern NSString *const TSRegistrationErrorUserInfoHTTPStatus;
|
||||
extern NSString *const kNSNotificationName_RegistrationStateDidChange;
|
||||
extern NSString *const kNSNotificationName_LocalNumberDidChange;
|
||||
|
||||
@class TSNetworkManager;
|
||||
@class TSStorageManager;
|
||||
|
||||
@interface TSAccountManager : NSObject
|
||||
|
||||
#pragma mark - Initializers
|
||||
|
||||
- (instancetype)init NS_UNAVAILABLE;
|
||||
|
||||
- (instancetype)initWithNetworkManager:(TSNetworkManager *)networkManager
|
||||
storageManager:(TSStorageManager *)storageManager;
|
||||
|
||||
+ (instancetype)sharedInstance;
|
||||
|
||||
@property (nonatomic, strong, readonly) TSNetworkManager *networkManager;
|
||||
|
||||
/**
|
||||
* Returns if a user is registered or not
|
||||
*
|
||||
* @return registered or not
|
||||
*/
|
||||
+ (BOOL)isRegistered;
|
||||
|
||||
- (void)ifRegistered:(BOOL)isRegistered runAsync:(void (^)())block;
|
||||
|
||||
/**
|
||||
* Returns current phone number for this device, which may not yet have been registered.
|
||||
*
|
||||
* @return E164 formatted phone number
|
||||
*/
|
||||
+ (nullable NSString *)localNumber;
|
||||
|
||||
/**
|
||||
* The registration ID is unique to an installation of TextSecure, it allows to know if the app was reinstalled
|
||||
*
|
||||
* @return registrationID;
|
||||
*/
|
||||
|
||||
+ (uint32_t)getOrGenerateRegistrationId;
|
||||
|
||||
#pragma mark - Register with phone number
|
||||
|
||||
+ (void)registerWithPhoneNumber:(NSString *)phoneNumber
|
||||
success:(void (^)())successBlock
|
||||
failure:(void (^)(NSError *error))failureBlock
|
||||
smsVerification:(BOOL)isSMS;
|
||||
|
||||
+ (void)rerequestSMSWithSuccess:(void (^)())successBlock failure:(void (^)(NSError *error))failureBlock;
|
||||
|
||||
+ (void)rerequestVoiceWithSuccess:(void (^)())successBlock failure:(void (^)(NSError *error))failureBlock;
|
||||
|
||||
- (void)verifyAccountWithCode:(NSString *)verificationCode
|
||||
success:(void (^)())successBlock
|
||||
failure:(void (^)(NSError *error))failureBlock;
|
||||
|
||||
#if TARGET_OS_IPHONE
|
||||
|
||||
/**
|
||||
* Register's the device's push notification token with the server
|
||||
*
|
||||
* @param pushToken Apple's Push Token
|
||||
*/
|
||||
- (void)registerForPushNotificationsWithPushToken:(NSString *)pushToken
|
||||
voipToken:(NSString *)voipToken
|
||||
success:(void (^)())successHandler
|
||||
failure:(void (^)(NSError *error))failureHandler
|
||||
NS_SWIFT_NAME(registerForPushNotifications(pushToken:voipToken:success:failure:));
|
||||
|
||||
#endif
|
||||
|
||||
+ (void)unregisterTextSecureWithSuccess:(void (^)())success failure:(void (^)(NSError *error))failureBlock;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,335 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "TSAccountManager.h"
|
||||
#import "NSData+Base64.h"
|
||||
#import "NSData+hexString.h"
|
||||
#import "NSURLSessionDataTask+StatusCode.h"
|
||||
#import "OWSError.h"
|
||||
#import "SecurityUtils.h"
|
||||
#import "TSNetworkManager.h"
|
||||
#import "TSPreKeyManager.h"
|
||||
#import "TSSocketManager.h"
|
||||
#import "TSStorageManager+keyingMaterial.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
NSString *const TSRegistrationErrorDomain = @"TSRegistrationErrorDomain";
|
||||
NSString *const TSRegistrationErrorUserInfoHTTPStatus = @"TSHTTPStatus";
|
||||
NSString *const kNSNotificationName_RegistrationStateDidChange = @"kNSNotificationName_RegistrationStateDidChange";
|
||||
NSString *const kNSNotificationName_LocalNumberDidChange = @"kNSNotificationName_LocalNumberDidChange";
|
||||
|
||||
@interface TSAccountManager ()
|
||||
|
||||
@property (nonatomic, nullable) NSString *phoneNumberAwaitingVerification;
|
||||
@property (nonatomic, readonly) TSStorageManager *storageManager;
|
||||
|
||||
@end
|
||||
|
||||
#pragma mark -
|
||||
|
||||
@implementation TSAccountManager
|
||||
|
||||
- (instancetype)initWithNetworkManager:(TSNetworkManager *)networkManager
|
||||
storageManager:(TSStorageManager *)storageManager
|
||||
{
|
||||
self = [super init];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
_networkManager = networkManager;
|
||||
_storageManager = storageManager;
|
||||
|
||||
OWSSingletonAssert();
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
+ (instancetype)sharedInstance
|
||||
{
|
||||
static dispatch_once_t onceToken;
|
||||
static id sharedInstance = nil;
|
||||
dispatch_once(&onceToken, ^{
|
||||
sharedInstance = [[self alloc] initWithNetworkManager:[TSNetworkManager sharedManager]
|
||||
storageManager:[TSStorageManager sharedManager]];
|
||||
});
|
||||
|
||||
return sharedInstance;
|
||||
}
|
||||
|
||||
- (void)setPhoneNumberAwaitingVerification:(NSString *_Nullable)phoneNumberAwaitingVerification
|
||||
{
|
||||
_phoneNumberAwaitingVerification = phoneNumberAwaitingVerification;
|
||||
|
||||
[[NSNotificationCenter defaultCenter] postNotificationName:kNSNotificationName_LocalNumberDidChange
|
||||
object:nil
|
||||
userInfo:nil];
|
||||
}
|
||||
|
||||
+ (BOOL)isRegistered {
|
||||
return [TSStorageManager localNumber] ? YES : NO;
|
||||
}
|
||||
|
||||
- (void)ifRegistered:(BOOL)isRegistered runAsync:(void (^)())block
|
||||
{
|
||||
[self.storageManager ifLocalNumberPresent:isRegistered runAsync:block];
|
||||
}
|
||||
|
||||
- (void)didRegister
|
||||
{
|
||||
DDLogInfo(@"%@ didRegister", self.tag);
|
||||
NSString *phoneNumber = self.phoneNumberAwaitingVerification;
|
||||
|
||||
if (!phoneNumber) {
|
||||
@throw [NSException exceptionWithName:@"RegistrationFail" reason:@"Internal Corrupted State" userInfo:nil];
|
||||
}
|
||||
|
||||
[self.storageManager storePhoneNumber:phoneNumber];
|
||||
|
||||
[[NSNotificationCenter defaultCenter] postNotificationName:kNSNotificationName_RegistrationStateDidChange
|
||||
object:nil
|
||||
userInfo:nil];
|
||||
}
|
||||
|
||||
+ (nullable NSString *)localNumber
|
||||
{
|
||||
TSAccountManager *sharedManager = [self sharedInstance];
|
||||
NSString *awaitingVerif = sharedManager.phoneNumberAwaitingVerification;
|
||||
if (awaitingVerif) {
|
||||
return awaitingVerif;
|
||||
}
|
||||
|
||||
return [TSStorageManager localNumber];
|
||||
}
|
||||
|
||||
+ (uint32_t)getOrGenerateRegistrationId {
|
||||
YapDatabaseConnection *dbConn = [[TSStorageManager sharedManager] newDatabaseConnection];
|
||||
__block uint32_t registrationID = 0;
|
||||
|
||||
[dbConn readWithBlock:^(YapDatabaseReadTransaction *transaction) {
|
||||
registrationID = [[transaction objectForKey:TSStorageLocalRegistrationId
|
||||
inCollection:TSStorageUserAccountCollection] unsignedIntValue];
|
||||
}];
|
||||
|
||||
if (registrationID == 0) {
|
||||
registrationID = (uint32_t)arc4random_uniform(16380) + 1;
|
||||
|
||||
[dbConn readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
|
||||
[transaction setObject:[NSNumber numberWithUnsignedInteger:registrationID]
|
||||
forKey:TSStorageLocalRegistrationId
|
||||
inCollection:TSStorageUserAccountCollection];
|
||||
}];
|
||||
}
|
||||
|
||||
return registrationID;
|
||||
}
|
||||
|
||||
- (void)registerForPushNotificationsWithPushToken:(NSString *)pushToken
|
||||
voipToken:(NSString *)voipToken
|
||||
success:(void (^)())successHandler
|
||||
failure:(void (^)(NSError *))failureHandler
|
||||
{
|
||||
[self registerForPushNotificationsWithPushToken:pushToken
|
||||
voipToken:voipToken
|
||||
success:successHandler
|
||||
failure:failureHandler
|
||||
remainingRetries:3];
|
||||
}
|
||||
|
||||
- (void)registerForPushNotificationsWithPushToken:(NSString *)pushToken
|
||||
voipToken:(NSString *)voipToken
|
||||
success:(void (^)())successHandler
|
||||
failure:(void (^)(NSError *))failureHandler
|
||||
remainingRetries:(int)remainingRetries
|
||||
{
|
||||
TSRegisterForPushRequest *request =
|
||||
[[TSRegisterForPushRequest alloc] initWithPushIdentifier:pushToken voipIdentifier:voipToken];
|
||||
|
||||
[self.networkManager makeRequest:request
|
||||
success:^(NSURLSessionDataTask *task, id responseObject) {
|
||||
successHandler();
|
||||
}
|
||||
failure:^(NSURLSessionDataTask *task, NSError *error) {
|
||||
if (remainingRetries > 0) {
|
||||
[self registerForPushNotificationsWithPushToken:pushToken
|
||||
voipToken:voipToken
|
||||
success:successHandler
|
||||
failure:failureHandler
|
||||
remainingRetries:remainingRetries - 1];
|
||||
} else {
|
||||
failureHandler(error);
|
||||
}
|
||||
}];
|
||||
}
|
||||
|
||||
+ (void)registerWithPhoneNumber:(NSString *)phoneNumber
|
||||
success:(void (^)())successBlock
|
||||
failure:(void (^)(NSError *error))failureBlock
|
||||
smsVerification:(BOOL)isSMS
|
||||
|
||||
{
|
||||
if ([self isRegistered]) {
|
||||
failureBlock([NSError errorWithDomain:@"tsaccountmanager.verify" code:4000 userInfo:nil]);
|
||||
return;
|
||||
}
|
||||
|
||||
// The country code of TSAccountManager.phoneNumberAwaitingVerification is used to
|
||||
// determine whether or not to use domain fronting, so it needs to be set _before_
|
||||
// we make our verification code request.
|
||||
TSAccountManager *manager = [self sharedInstance];
|
||||
manager.phoneNumberAwaitingVerification = phoneNumber;
|
||||
|
||||
[[TSNetworkManager sharedManager]
|
||||
makeRequest:[[TSRequestVerificationCodeRequest alloc]
|
||||
initWithPhoneNumber:phoneNumber
|
||||
transport:isSMS ? TSVerificationTransportSMS : TSVerificationTransportVoice]
|
||||
success:^(NSURLSessionDataTask *task, id responseObject) {
|
||||
DDLogInfo(@"%@ Successfully requested verification code request for number: %@ method:%@",
|
||||
self.tag,
|
||||
phoneNumber,
|
||||
isSMS ? @"SMS" : @"Voice");
|
||||
successBlock();
|
||||
}
|
||||
failure:^(NSURLSessionDataTask *task, NSError *error) {
|
||||
DDLogError(@"%@ Failed to request verification code request with error:%@", self.tag, error);
|
||||
failureBlock(error);
|
||||
}];
|
||||
}
|
||||
|
||||
+ (void)rerequestSMSWithSuccess:(void (^)())successBlock failure:(void (^)(NSError *error))failureBlock
|
||||
{
|
||||
TSAccountManager *manager = [self sharedInstance];
|
||||
NSString *number = manager.phoneNumberAwaitingVerification;
|
||||
|
||||
assert(number);
|
||||
|
||||
[self registerWithPhoneNumber:number success:successBlock failure:failureBlock smsVerification:YES];
|
||||
}
|
||||
|
||||
+ (void)rerequestVoiceWithSuccess:(void (^)())successBlock failure:(void (^)(NSError *error))failureBlock
|
||||
{
|
||||
TSAccountManager *manager = [self sharedInstance];
|
||||
NSString *number = manager.phoneNumberAwaitingVerification;
|
||||
|
||||
assert(number);
|
||||
|
||||
[self registerWithPhoneNumber:number success:successBlock failure:failureBlock smsVerification:NO];
|
||||
}
|
||||
|
||||
- (void)verifyAccountWithCode:(NSString *)verificationCode
|
||||
success:(void (^)())successBlock
|
||||
failure:(void (^)(NSError *error))failureBlock
|
||||
{
|
||||
NSString *authToken = [[self class] generateNewAccountAuthenticationToken];
|
||||
NSString *signalingKey = [[self class] generateNewSignalingKeyToken];
|
||||
NSString *phoneNumber = self.phoneNumberAwaitingVerification;
|
||||
|
||||
assert(signalingKey);
|
||||
assert(authToken);
|
||||
assert(phoneNumber);
|
||||
|
||||
TSVerifyCodeRequest *request = [[TSVerifyCodeRequest alloc] initWithVerificationCode:verificationCode
|
||||
forNumber:phoneNumber
|
||||
signalingKey:signalingKey
|
||||
authKey:authToken];
|
||||
|
||||
[self.networkManager makeRequest:request
|
||||
success:^(NSURLSessionDataTask *task, id responseObject) {
|
||||
NSHTTPURLResponse *response = (NSHTTPURLResponse *)task.response;
|
||||
long statuscode = response.statusCode;
|
||||
|
||||
switch (statuscode) {
|
||||
case 200:
|
||||
case 204: {
|
||||
[TSStorageManager storeServerToken:authToken signalingKey:signalingKey];
|
||||
[self didRegister];
|
||||
[TSSocketManager requestSocketOpen];
|
||||
[TSPreKeyManager registerPreKeysWithMode:RefreshPreKeysMode_SignedAndOneTime
|
||||
success:successBlock
|
||||
failure:failureBlock];
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
DDLogError(@"%@ Unexpected status while verifying code: %ld", self.tag, statuscode);
|
||||
NSError *error = OWSErrorMakeUnableToProcessServerResponseError();
|
||||
failureBlock(error);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
failure:^(NSURLSessionDataTask *task, NSError *error) {
|
||||
DDLogWarn(@"%@ Error verifying code: %@", self.tag, error.debugDescription);
|
||||
switch (error.code) {
|
||||
case 403: {
|
||||
NSError *userError = OWSErrorWithCodeDescription(OWSErrorCodeUserError,
|
||||
NSLocalizedString(@"REGISTRATION_VERIFICATION_FAILED_WRONG_CODE_DESCRIPTION",
|
||||
"Alert body, during registration"));
|
||||
failureBlock(userError);
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
DDLogError(@"%@ verifying code failed with unhandled error: %@", self.tag, error);
|
||||
failureBlock(error);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}];
|
||||
}
|
||||
|
||||
#pragma mark Server keying material
|
||||
|
||||
+ (NSString *)generateNewAccountAuthenticationToken {
|
||||
NSData *authToken = [SecurityUtils generateRandomBytes:16];
|
||||
NSString *authTokenPrint = [[NSData dataWithData:authToken] hexadecimalString];
|
||||
return authTokenPrint;
|
||||
}
|
||||
|
||||
+ (NSString *)generateNewSignalingKeyToken {
|
||||
/*The signalingKey is 32 bytes of AES material (256bit AES) and 20 bytes of
|
||||
* Hmac key material (HmacSHA1) concatenated into a 52 byte slug that is
|
||||
* base64 encoded. */
|
||||
NSData *signalingKeyToken = [SecurityUtils generateRandomBytes:52];
|
||||
NSString *signalingKeyTokenPrint = [[NSData dataWithData:signalingKeyToken] base64EncodedString];
|
||||
return signalingKeyTokenPrint;
|
||||
}
|
||||
|
||||
+ (void)unregisterTextSecureWithSuccess:(void (^)())success failure:(void (^)(NSError *error))failureBlock
|
||||
{
|
||||
[[TSNetworkManager sharedManager] makeRequest:[[TSUnregisterAccountRequest alloc] init]
|
||||
success:^(NSURLSessionDataTask *task, id responseObject) {
|
||||
DDLogInfo(@"%@ Successfully unregistered", self.tag);
|
||||
success();
|
||||
|
||||
// This is called from `[SettingsTableViewController proceedToUnregistration]` whose
|
||||
// success handler calls `[Environment resetAppData]`.
|
||||
// This method, after calling that success handler, fires
|
||||
// `kNSNotificationName_RegistrationStateDidChange` which is only safe to fire after
|
||||
// the data store is reset.
|
||||
|
||||
[[NSNotificationCenter defaultCenter] postNotificationName:kNSNotificationName_RegistrationStateDidChange
|
||||
object:nil
|
||||
userInfo:nil];
|
||||
}
|
||||
failure:^(NSURLSessionDataTask *task, NSError *error) {
|
||||
DDLogError(@"%@ Failed to unregister with error: %@", self.tag, error);
|
||||
failureBlock(error);
|
||||
}];
|
||||
}
|
||||
|
||||
#pragma mark - Logging
|
||||
|
||||
+ (NSString *)tag
|
||||
{
|
||||
return [NSString stringWithFormat:@"[%@]", self.class];
|
||||
}
|
||||
|
||||
- (NSString *)tag
|
||||
{
|
||||
return self.class.tag;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,18 @@
|
||||
//
|
||||
// TSAttributes.h
|
||||
// Signal
|
||||
//
|
||||
// Created by Frederic Jacobs on 22/08/15.
|
||||
// Copyright (c) 2015 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
@interface TSAttributes : NSObject
|
||||
|
||||
+ (NSDictionary *)attributesFromStorageWithVoiceSupport;
|
||||
|
||||
+ (NSDictionary *)attributesWithSignalingKey:(NSString *)signalingKey
|
||||
serverAuthToken:(NSString *)authToken;
|
||||
|
||||
@end
|
||||
@ -0,0 +1,29 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "TSAttributes.h"
|
||||
|
||||
#import "TSAccountManager.h"
|
||||
#import "TSStorageHeaders.h"
|
||||
|
||||
@implementation TSAttributes
|
||||
|
||||
+ (NSDictionary *)attributesFromStorageWithVoiceSupport {
|
||||
return [self attributesWithSignalingKey:[TSStorageManager signalingKey]
|
||||
serverAuthToken:[TSStorageManager serverAuthToken]];
|
||||
}
|
||||
|
||||
+ (NSDictionary *)attributesWithSignalingKey:(NSString *)signalingKey
|
||||
serverAuthToken:(NSString *)authToken
|
||||
{
|
||||
return @{
|
||||
@"signalingKey" : signalingKey,
|
||||
@"AuthKey" : authToken,
|
||||
@"voice" : @(YES), // all Signal-iOS clients support voice
|
||||
@"video" : @(YES), // all Signal-iOS clients support WebRTC-based voice and video calls.
|
||||
@"registrationId" : [NSString stringWithFormat:@"%i", [TSAccountManager getOrGenerateRegistrationId]]
|
||||
};
|
||||
}
|
||||
|
||||
@end
|
||||
@ -0,0 +1,33 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "TSAccountManager.h"
|
||||
|
||||
typedef NS_ENUM(NSInteger, RefreshPreKeysMode) {
|
||||
// Refresh the signed prekey AND the one-time prekeys.
|
||||
RefreshPreKeysMode_SignedAndOneTime,
|
||||
// Only refresh the signed prekey, which should happen around every 48 hours.
|
||||
//
|
||||
// Most users will refresh their signed prekeys much more often than their
|
||||
// one-time prekeys, so we use a "signed only" mode to avoid updating the
|
||||
// one-time keys in this case.
|
||||
//
|
||||
// We do not need a "one-time only" mode.
|
||||
RefreshPreKeysMode_SignedOnly,
|
||||
};
|
||||
|
||||
@interface TSPreKeyManager : NSObject
|
||||
|
||||
+ (BOOL)isAppLockedDueToPreKeyUpdateFailures;
|
||||
|
||||
+ (void)registerPreKeysWithMode:(RefreshPreKeysMode)mode
|
||||
success:(void (^)())successHandler
|
||||
failure:(void (^)(NSError *error))failureHandler;
|
||||
|
||||
+ (void)checkPreKeys;
|
||||
|
||||
+ (void)checkPreKeysIfNecessary;
|
||||
|
||||
@end
|
||||
@ -0,0 +1,429 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "TSPreKeyManager.h"
|
||||
#import "NSURLSessionDataTask+StatusCode.h"
|
||||
#import "OWSIdentityManager.h"
|
||||
#import "TSNetworkManager.h"
|
||||
#import "TSRegisterSignedPrekeyRequest.h"
|
||||
#import "TSStorageHeaders.h"
|
||||
#import "TSStorageManager+SignedPreKeyStore.h"
|
||||
|
||||
// Time before deletion of signed prekeys (measured in seconds)
|
||||
//
|
||||
// Currently we retain signed prekeys for at least 7 days.
|
||||
static const CGFloat kSignedPreKeysDeletionTime = 7 * 24 * 60 * 60;
|
||||
|
||||
// Time before rotation of signed prekeys (measured in seconds)
|
||||
//
|
||||
// Currently we rotate signed prekeys every 2 days (48 hours).
|
||||
static const CGFloat kSignedPreKeyRotationTime = 2 * 24 * 60 * 60;
|
||||
|
||||
// How often we check prekey state on app activation.
|
||||
//
|
||||
// Currently we check prekey state every 12 hours.
|
||||
static const CGFloat kPreKeyCheckFrequencySeconds = 12 * 60 * 60;
|
||||
|
||||
// We generate 100 one-time prekeys at a time. We should replenish
|
||||
// whenever ~2/3 of them have been consumed.
|
||||
static const NSUInteger kEphemeralPreKeysMinimumCount = 35;
|
||||
|
||||
// This global should only be accessed on prekeyQueue.
|
||||
static NSDate *lastPreKeyCheckTimestamp = nil;
|
||||
|
||||
// Maximum number of failures while updating signed prekeys
|
||||
// before the message sending is disabled.
|
||||
static const NSUInteger kMaxPrekeyUpdateFailureCount = 5;
|
||||
|
||||
// Maximum amount of time that can elapse without updating signed prekeys
|
||||
// before the message sending is disabled.
|
||||
//
|
||||
// Current value is 10 days (240 hours).
|
||||
static const CGFloat kSignedPreKeyUpdateFailureMaxFailureDuration = 10 * 24 * 60 * 60;
|
||||
|
||||
#pragma mark -
|
||||
|
||||
@implementation TSPreKeyManager
|
||||
|
||||
+ (BOOL)isAppLockedDueToPreKeyUpdateFailures
|
||||
{
|
||||
// Only disable message sending if we have failed more than N times
|
||||
// over a period of at least M days.
|
||||
TSStorageManager *storageManager = [TSStorageManager sharedManager];
|
||||
return ([storageManager prekeyUpdateFailureCount] >= kMaxPrekeyUpdateFailureCount &&
|
||||
[storageManager firstPrekeyUpdateFailureDate] != nil
|
||||
&& fabs([[storageManager firstPrekeyUpdateFailureDate] timeIntervalSinceNow])
|
||||
>= kSignedPreKeyUpdateFailureMaxFailureDuration);
|
||||
}
|
||||
|
||||
+ (void)incrementPreKeyUpdateFailureCount
|
||||
{
|
||||
// Record a prekey update failure.
|
||||
TSStorageManager *storageManager = [TSStorageManager sharedManager];
|
||||
int failureCount = [storageManager incrementPrekeyUpdateFailureCount];
|
||||
if (failureCount == 1 || ![storageManager firstPrekeyUpdateFailureDate]) {
|
||||
// If this is the "first" failure, record the timestamp of that
|
||||
// failure.
|
||||
[storageManager setFirstPrekeyUpdateFailureDate:[NSDate new]];
|
||||
}
|
||||
}
|
||||
|
||||
+ (void)clearPreKeyUpdateFailureCount
|
||||
{
|
||||
TSStorageManager *storageManager = [TSStorageManager sharedManager];
|
||||
[storageManager clearFirstPrekeyUpdateFailureDate];
|
||||
[storageManager clearPrekeyUpdateFailureCount];
|
||||
}
|
||||
|
||||
// We should never dispatch sync to this queue.
|
||||
+ (dispatch_queue_t)prekeyQueue
|
||||
{
|
||||
static dispatch_once_t onceToken;
|
||||
static dispatch_queue_t queue;
|
||||
dispatch_once(&onceToken, ^{
|
||||
queue = dispatch_queue_create("org.whispersystems.signal.prekeyQueue", NULL);
|
||||
});
|
||||
return queue;
|
||||
}
|
||||
|
||||
+ (void)checkPreKeysIfNecessary
|
||||
{
|
||||
OWSAssert([UIApplication sharedApplication].applicationState == UIApplicationStateActive);
|
||||
|
||||
// Update the prekey check timestamp.
|
||||
dispatch_async(TSPreKeyManager.prekeyQueue, ^{
|
||||
BOOL shouldCheck = (lastPreKeyCheckTimestamp == nil
|
||||
|| fabs([lastPreKeyCheckTimestamp timeIntervalSinceNow]) >= kPreKeyCheckFrequencySeconds);
|
||||
if (shouldCheck) {
|
||||
// Optimistically mark the prekeys as checked. This
|
||||
// de-bounces prekey checks.
|
||||
//
|
||||
// If the check or key registration fails, the prekeys
|
||||
// will be marked as _NOT_ checked.
|
||||
//
|
||||
// Note: [TSPreKeyManager checkPreKeys] will also
|
||||
// optimistically mark them as checked. This
|
||||
// redundancy is fine and precludes a race
|
||||
// condition.
|
||||
lastPreKeyCheckTimestamp = [NSDate date];
|
||||
|
||||
[[TSAccountManager sharedInstance] ifRegistered:YES
|
||||
runAsync:^{
|
||||
[TSPreKeyManager checkPreKeys];
|
||||
}];
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
+ (void)registerPreKeysWithMode:(RefreshPreKeysMode)mode
|
||||
success:(void (^)())successHandler
|
||||
failure:(void (^)(NSError *error))failureHandler
|
||||
{
|
||||
// We use prekeyQueue to serialize this logic and ensure that only
|
||||
// one thread is "registering" or "clearing" prekeys at a time.
|
||||
dispatch_async(TSPreKeyManager.prekeyQueue, ^{
|
||||
// Mark the prekeys as checked every time we try to register prekeys.
|
||||
lastPreKeyCheckTimestamp = [NSDate date];
|
||||
|
||||
RefreshPreKeysMode modeCopy = mode;
|
||||
TSStorageManager *storageManager = [TSStorageManager sharedManager];
|
||||
ECKeyPair *identityKeyPair = [[OWSIdentityManager sharedManager] identityKeyPair];
|
||||
|
||||
if (!identityKeyPair) {
|
||||
[[OWSIdentityManager sharedManager] generateNewIdentityKey];
|
||||
identityKeyPair = [[OWSIdentityManager sharedManager] identityKeyPair];
|
||||
|
||||
// Switch modes if necessary.
|
||||
modeCopy = RefreshPreKeysMode_SignedAndOneTime;
|
||||
}
|
||||
|
||||
SignedPreKeyRecord *signedPreKey = [storageManager generateRandomSignedRecord];
|
||||
// Store the new signed key immediately, before it is sent to the
|
||||
// service to prevent race conditions and other edge cases.
|
||||
[storageManager storeSignedPreKey:signedPreKey.Id signedPreKeyRecord:signedPreKey];
|
||||
|
||||
NSArray *preKeys = nil;
|
||||
TSRequest *request;
|
||||
NSString *description;
|
||||
if (modeCopy == RefreshPreKeysMode_SignedAndOneTime) {
|
||||
description = @"signed and one-time prekeys";
|
||||
PreKeyRecord *lastResortPreKey = [storageManager getOrGenerateLastResortKey];
|
||||
preKeys = [storageManager generatePreKeyRecords];
|
||||
// Store the new one-time keys immediately, before they are sent to the
|
||||
// service to prevent race conditions and other edge cases.
|
||||
[storageManager storePreKeyRecords:preKeys];
|
||||
|
||||
request = [[TSRegisterPrekeysRequest alloc]
|
||||
initWithPrekeyArray:preKeys
|
||||
identityKey:identityKeyPair.publicKey
|
||||
signedPreKeyRecord:signedPreKey
|
||||
preKeyLastResort:lastResortPreKey];
|
||||
} else {
|
||||
description = @"just signed prekey";
|
||||
request = [[TSRegisterSignedPrekeyRequest alloc] initWithSignedPreKeyRecord:signedPreKey];
|
||||
}
|
||||
|
||||
[[TSNetworkManager sharedManager] makeRequest:request
|
||||
success:^(NSURLSessionDataTask *task, id responseObject) {
|
||||
DDLogInfo(@"%@ Successfully registered %@.", self.tag, description);
|
||||
|
||||
// Mark signed prekey as accepted by service.
|
||||
[signedPreKey markAsAcceptedByService];
|
||||
[storageManager storeSignedPreKey:signedPreKey.Id signedPreKeyRecord:signedPreKey];
|
||||
|
||||
// On success, update the "current" signed prekey state.
|
||||
[storageManager setCurrentSignedPrekeyId:signedPreKey.Id];
|
||||
|
||||
successHandler();
|
||||
|
||||
[TSPreKeyManager clearPreKeyUpdateFailureCount];
|
||||
}
|
||||
failure:^(NSURLSessionDataTask *task, NSError *error) {
|
||||
OWSAnalyticsError(@"Prekey update failed (%@): %@", description, error);
|
||||
|
||||
// Mark the prekeys as _NOT_ checked on failure.
|
||||
[self markPreKeysAsNotChecked];
|
||||
|
||||
failureHandler(error);
|
||||
|
||||
NSInteger statusCode = 0;
|
||||
if ([task.response isKindOfClass:[NSHTTPURLResponse class]]) {
|
||||
NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)task.response;
|
||||
statusCode = httpResponse.statusCode;
|
||||
}
|
||||
if (statusCode >= 400 && statusCode <= 599) {
|
||||
// Only treat 4xx and 5xx errors from the service as failures.
|
||||
// Ignore network failures, for example.
|
||||
[TSPreKeyManager incrementPreKeyUpdateFailureCount];
|
||||
}
|
||||
}];
|
||||
});
|
||||
}
|
||||
|
||||
+ (void)checkPreKeys
|
||||
{
|
||||
// Optimistically mark the prekeys as checked. This
|
||||
// de-bounces prekey checks.
|
||||
//
|
||||
// If the check or key registration fails, the prekeys
|
||||
// will be marked as _NOT_ checked.
|
||||
dispatch_async(TSPreKeyManager.prekeyQueue, ^{
|
||||
lastPreKeyCheckTimestamp = [NSDate date];
|
||||
});
|
||||
|
||||
// We want to update prekeys if either the one-time or signed prekeys need an update, so
|
||||
// we check the status of both.
|
||||
//
|
||||
// Most users will refresh their signed prekeys much more often than their
|
||||
// one-time PreKeys, so we use a "signed only" mode to avoid updating the
|
||||
// one-time keys in this case.
|
||||
//
|
||||
// We do not need a "one-time only" mode.
|
||||
TSAvailablePreKeysCountRequest *preKeyCountRequest = [[TSAvailablePreKeysCountRequest alloc] init];
|
||||
[[TSNetworkManager sharedManager] makeRequest:preKeyCountRequest
|
||||
success:^(NSURLSessionDataTask *task, NSDictionary *responseObject) {
|
||||
NSString *preKeyCountKey = @"count";
|
||||
NSNumber *count = [responseObject objectForKey:preKeyCountKey];
|
||||
|
||||
BOOL didUpdatePreKeys = NO;
|
||||
void (^updatePreKeys)(RefreshPreKeysMode) = ^(RefreshPreKeysMode mode) {
|
||||
[self registerPreKeysWithMode:mode
|
||||
success:^{
|
||||
DDLogInfo(@"%@ New prekeys registered with server.", self.tag);
|
||||
|
||||
[self clearSignedPreKeyRecords];
|
||||
}
|
||||
failure:^(NSError *error) {
|
||||
DDLogWarn(@"%@ Failed to update prekeys with the server: %@", self.tag, error);
|
||||
}];
|
||||
};
|
||||
|
||||
BOOL shouldUpdateOneTimePreKeys = count.integerValue <= kEphemeralPreKeysMinimumCount;
|
||||
|
||||
if (shouldUpdateOneTimePreKeys) {
|
||||
DDLogInfo(@"%@ Updating one-time and signed prekeys due to shortage of one-time prekeys.", self.tag);
|
||||
updatePreKeys(RefreshPreKeysMode_SignedAndOneTime);
|
||||
didUpdatePreKeys = YES;
|
||||
} else {
|
||||
TSStorageManager *storageManager = [TSStorageManager sharedManager];
|
||||
NSNumber *currentSignedPrekeyId = [storageManager currentSignedPrekeyId];
|
||||
BOOL shouldUpdateSignedPrekey = NO;
|
||||
if (!currentSignedPrekeyId) {
|
||||
DDLogError(@"%@ %s Couldn't find current signed prekey id", self.tag, __PRETTY_FUNCTION__);
|
||||
shouldUpdateSignedPrekey = YES;
|
||||
} else {
|
||||
SignedPreKeyRecord *currentRecord = [storageManager loadSignedPrekeyOrNil:currentSignedPrekeyId.intValue];
|
||||
if (!currentRecord) {
|
||||
DDLogError(@"%@ %s Couldn't find signed prekey for id: %@", self.tag, __PRETTY_FUNCTION__, currentSignedPrekeyId);
|
||||
OWSAssert(0);
|
||||
shouldUpdateSignedPrekey = YES;
|
||||
} else {
|
||||
shouldUpdateSignedPrekey
|
||||
= fabs([currentRecord.generatedAt timeIntervalSinceNow]) >= kSignedPreKeyRotationTime;
|
||||
}
|
||||
}
|
||||
|
||||
if (shouldUpdateSignedPrekey) {
|
||||
DDLogInfo(@"%@ Updating signed prekey due to rotation period.", self.tag);
|
||||
updatePreKeys(RefreshPreKeysMode_SignedOnly);
|
||||
didUpdatePreKeys = YES;
|
||||
} else {
|
||||
DDLogDebug(@"%@ Not updating prekeys.", self.tag);
|
||||
}
|
||||
}
|
||||
|
||||
if (!didUpdatePreKeys) {
|
||||
// If we didn't update the prekeys, our local "current signed key" state should
|
||||
// agree with the service's "current signed key" state. Let's verify that,
|
||||
// since it's closely related to the issues we saw with the 2.7.0.10 release.
|
||||
TSRequest *currentSignedPreKey = [[TSCurrentSignedPreKeyRequest alloc] init];
|
||||
[[TSNetworkManager sharedManager] makeRequest:currentSignedPreKey
|
||||
success:^(NSURLSessionDataTask *task, NSDictionary *responseObject) {
|
||||
NSString *keyIdDictKey = @"keyId";
|
||||
NSNumber *keyId = [responseObject objectForKey:keyIdDictKey];
|
||||
OWSAssert(keyId);
|
||||
|
||||
TSStorageManager *storageManager = [TSStorageManager sharedManager];
|
||||
NSNumber *currentSignedPrekeyId = [storageManager currentSignedPrekeyId];
|
||||
|
||||
if (!keyId || !currentSignedPrekeyId || ![currentSignedPrekeyId isEqualToNumber:keyId]) {
|
||||
DDLogError(
|
||||
@"%@ Local and service 'current signed prekey ids' did not match. %@ == %@ == %d.",
|
||||
self.tag,
|
||||
keyId,
|
||||
currentSignedPrekeyId,
|
||||
[currentSignedPrekeyId isEqualToNumber:keyId]);
|
||||
}
|
||||
}
|
||||
failure:^(NSURLSessionDataTask *task, NSError *error) {
|
||||
DDLogWarn(@"%@ Could not retrieve current signed key from the service.", self.tag);
|
||||
|
||||
// Mark the prekeys as _NOT_ checked on failure.
|
||||
[self markPreKeysAsNotChecked];
|
||||
}];
|
||||
}
|
||||
}
|
||||
failure:^(NSURLSessionDataTask *task, NSError *error) {
|
||||
DDLogError(@"%@ Failed to retrieve the number of available prekeys.", self.tag);
|
||||
|
||||
// Mark the prekeys as _NOT_ checked on failure.
|
||||
[self markPreKeysAsNotChecked];
|
||||
}];
|
||||
}
|
||||
|
||||
+ (void)markPreKeysAsNotChecked
|
||||
{
|
||||
dispatch_async(TSPreKeyManager.prekeyQueue, ^{
|
||||
lastPreKeyCheckTimestamp = nil;
|
||||
});
|
||||
}
|
||||
|
||||
+ (void)clearSignedPreKeyRecords {
|
||||
TSStorageManager *storageManager = [TSStorageManager sharedManager];
|
||||
NSNumber *currentSignedPrekeyId = [storageManager currentSignedPrekeyId];
|
||||
[self clearSignedPreKeyRecordsWithKeyId:currentSignedPrekeyId success:nil];
|
||||
}
|
||||
|
||||
+ (void)clearSignedPreKeyRecordsWithKeyId:(NSNumber *)keyId success:(void (^_Nullable)())successHandler
|
||||
{
|
||||
if (!keyId) {
|
||||
OWSAssert(NO);
|
||||
DDLogError(@"%@ Ignoring request to clear signed preKeys since no keyId was specified", self.tag);
|
||||
return;
|
||||
}
|
||||
|
||||
// We use prekeyQueue to serialize this logic and ensure that only
|
||||
// one thread is "registering" or "clearing" prekeys at a time.
|
||||
dispatch_async(TSPreKeyManager.prekeyQueue, ^{
|
||||
TSStorageManager *storageManager = [TSStorageManager sharedManager];
|
||||
SignedPreKeyRecord *currentRecord = [storageManager loadSignedPrekeyOrNil:keyId.intValue];
|
||||
if (!currentRecord) {
|
||||
DDLogError(@"%@ %s Couldn't find signed prekey for id: %@", self.tag, __PRETTY_FUNCTION__, keyId);
|
||||
OWSAssert(0);
|
||||
}
|
||||
NSArray *allSignedPrekeys = [storageManager loadSignedPreKeys];
|
||||
NSArray *oldSignedPrekeys
|
||||
= (currentRecord != nil ? [self removeCurrentRecord:currentRecord fromRecords:allSignedPrekeys]
|
||||
: allSignedPrekeys);
|
||||
|
||||
NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
|
||||
dateFormatter.dateStyle = NSDateFormatterMediumStyle;
|
||||
dateFormatter.timeStyle = NSDateFormatterMediumStyle;
|
||||
|
||||
// Sort the signed prekeys in ascending order of generation time.
|
||||
oldSignedPrekeys = [oldSignedPrekeys sortedArrayUsingComparator:^NSComparisonResult(
|
||||
SignedPreKeyRecord *_Nonnull left, SignedPreKeyRecord *_Nonnull right) {
|
||||
return [left.generatedAt compare:right.generatedAt];
|
||||
}];
|
||||
|
||||
NSUInteger oldSignedPreKeyCount = oldSignedPrekeys.count;
|
||||
|
||||
int oldAcceptedSignedPreKeyCount = 0;
|
||||
for (SignedPreKeyRecord *signedPrekey in oldSignedPrekeys) {
|
||||
if (signedPrekey.wasAcceptedByService) {
|
||||
oldAcceptedSignedPreKeyCount++;
|
||||
}
|
||||
}
|
||||
|
||||
// Iterate the signed prekeys in ascending order so that we try to delete older keys first.
|
||||
for (SignedPreKeyRecord *signedPrekey in oldSignedPrekeys) {
|
||||
// Always keep at least 3 keys, accepted or otherwise.
|
||||
if (oldSignedPreKeyCount <= 3) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Never delete signed prekeys until they are N days old.
|
||||
if (fabs([signedPrekey.generatedAt timeIntervalSinceNow]) < kSignedPreKeysDeletionTime) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// We try to keep a minimum of 3 "old, accepted" signed prekeys.
|
||||
if (signedPrekey.wasAcceptedByService) {
|
||||
if (oldAcceptedSignedPreKeyCount <= 3) {
|
||||
continue;
|
||||
} else {
|
||||
oldAcceptedSignedPreKeyCount--;
|
||||
}
|
||||
}
|
||||
|
||||
OWSAnalyticsInfo(@"%@ Deleting old signed prekey: %@, wasAcceptedByService: %d",
|
||||
self.tag,
|
||||
[dateFormatter stringFromDate:signedPrekey.generatedAt],
|
||||
signedPrekey.wasAcceptedByService);
|
||||
|
||||
oldSignedPreKeyCount--;
|
||||
[storageManager removeSignedPreKey:signedPrekey.Id];
|
||||
}
|
||||
|
||||
if (successHandler) {
|
||||
successHandler();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
+ (NSArray *)removeCurrentRecord:(SignedPreKeyRecord *)currentRecord fromRecords:(NSArray *)allRecords {
|
||||
NSMutableArray *oldRecords = [NSMutableArray array];
|
||||
|
||||
for (SignedPreKeyRecord *record in allRecords) {
|
||||
if (currentRecord.Id != record.Id) {
|
||||
[oldRecords addObject:record];
|
||||
}
|
||||
}
|
||||
|
||||
return oldRecords;
|
||||
}
|
||||
|
||||
#pragma mark - Logging
|
||||
|
||||
+ (NSString *)tag
|
||||
{
|
||||
return [NSString stringWithFormat:@"[%@]", self.class];
|
||||
}
|
||||
|
||||
- (NSString *)tag
|
||||
{
|
||||
return self.class.tag;
|
||||
}
|
||||
|
||||
@end
|
||||
@ -0,0 +1,63 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <AddressBook/AddressBook.h>
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/**
|
||||
*
|
||||
* Contact represents relevant information related to a contact from the user's
|
||||
* contact list.
|
||||
*
|
||||
*/
|
||||
|
||||
@class CNContact;
|
||||
@class PhoneNumber;
|
||||
@class UIImage;
|
||||
@class SignalRecipient;
|
||||
@class YapDatabaseReadTransaction;
|
||||
|
||||
@interface Contact : NSObject
|
||||
|
||||
@property (nullable, readonly, nonatomic) NSString *firstName;
|
||||
@property (nullable, readonly, nonatomic) NSString *lastName;
|
||||
@property (readonly, nonatomic) NSString *fullName;
|
||||
@property (readonly, nonatomic) NSString *comparableNameFirstLast;
|
||||
@property (readonly, nonatomic) NSString *comparableNameLastFirst;
|
||||
@property (readonly, nonatomic) NSArray<PhoneNumber *> *parsedPhoneNumbers;
|
||||
@property (readonly, nonatomic) NSArray<NSString *> *userTextPhoneNumbers;
|
||||
@property (readonly, nonatomic) NSArray<NSString *> *emails;
|
||||
@property (readonly, nonatomic) NSString *uniqueId;
|
||||
#if TARGET_OS_IOS
|
||||
@property (nullable, readonly, nonatomic) UIImage *image;
|
||||
@property (readonly, nonatomic) ABRecordID recordID;
|
||||
@property (nullable, nonatomic, readonly) CNContact *cnContact;
|
||||
#endif // TARGET_OS_IOS
|
||||
|
||||
- (BOOL)isSignalContact;
|
||||
- (NSArray<SignalRecipient *> *)signalRecipientsWithTransaction:(YapDatabaseReadTransaction *)transaction;
|
||||
// TODO: Remove this method.
|
||||
- (NSArray<NSString *> *)textSecureIdentifiers;
|
||||
|
||||
#if TARGET_OS_IOS
|
||||
|
||||
- (instancetype)initWithContactWithFirstName:(nullable NSString *)firstName
|
||||
andLastName:(nullable NSString *)lastName
|
||||
andUserTextPhoneNumbers:(NSArray<NSString *> *)phoneNumbers
|
||||
andImage:(nullable UIImage *)image
|
||||
andContactID:(ABRecordID)record;
|
||||
|
||||
- (instancetype)initWithSystemContact:(CNContact *)contact;
|
||||
|
||||
- (NSString *)nameForPhoneNumber:(NSString *)recipientId;
|
||||
|
||||
#endif // TARGET_OS_IOS
|
||||
|
||||
+ (NSComparator)comparatorSortingNamesByFirstThenLast:(BOOL)firstNameOrdering;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,314 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "Contact.h"
|
||||
#import "Cryptography.h"
|
||||
#import "PhoneNumber.h"
|
||||
#import "SignalRecipient.h"
|
||||
#import "TSAccountManager.h"
|
||||
#import "TSStorageManager.h"
|
||||
|
||||
@import Contacts;
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface Contact ()
|
||||
|
||||
@property (readonly, nonatomic) NSMutableDictionary<NSString *, NSString *> *phoneNumberNameMap;
|
||||
|
||||
@end
|
||||
|
||||
#pragma mark -
|
||||
|
||||
@implementation Contact
|
||||
|
||||
@synthesize fullName = _fullName;
|
||||
@synthesize comparableNameFirstLast = _comparableNameFirstLast;
|
||||
@synthesize comparableNameLastFirst = _comparableNameLastFirst;
|
||||
|
||||
#if TARGET_OS_IOS
|
||||
- (instancetype)initWithContactWithFirstName:(nullable NSString *)firstName
|
||||
andLastName:(nullable NSString *)lastName
|
||||
andUserTextPhoneNumbers:(NSArray *)phoneNumbers
|
||||
andImage:(nullable UIImage *)image
|
||||
andContactID:(ABRecordID)record
|
||||
{
|
||||
self = [super init];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
_firstName = [self trimName:firstName];
|
||||
_lastName = [self trimName:lastName];
|
||||
_uniqueId = [self.class uniqueIdFromABRecordId:record];
|
||||
_recordID = record;
|
||||
_userTextPhoneNumbers = phoneNumbers;
|
||||
_phoneNumberNameMap = [NSMutableDictionary new];
|
||||
_parsedPhoneNumbers = [self parsedPhoneNumbersFromUserTextPhoneNumbers:phoneNumbers phoneNumberNameMap:@{}];
|
||||
_image = image;
|
||||
// Not using emails for old AB style contacts.
|
||||
_emails = [NSMutableArray new];
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (instancetype)initWithSystemContact:(CNContact *)contact
|
||||
{
|
||||
self = [super init];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
_cnContact = contact;
|
||||
_firstName = [self trimName:contact.givenName];
|
||||
_lastName = [self trimName:contact.familyName];
|
||||
_uniqueId = contact.identifier;
|
||||
|
||||
NSMutableArray<NSString *> *phoneNumbers = [NSMutableArray new];
|
||||
NSMutableDictionary<NSString *, NSString *> *phoneNumberNameMap = [NSMutableDictionary new];
|
||||
for (CNLabeledValue *phoneNumberField in contact.phoneNumbers) {
|
||||
if ([phoneNumberField.value isKindOfClass:[CNPhoneNumber class]]) {
|
||||
CNPhoneNumber *phoneNumber = (CNPhoneNumber *)phoneNumberField.value;
|
||||
[phoneNumbers addObject:phoneNumber.stringValue];
|
||||
if ([phoneNumberField.label isEqualToString:CNLabelHome]) {
|
||||
phoneNumberNameMap[phoneNumber.stringValue]
|
||||
= NSLocalizedString(@"PHONE_NUMBER_TYPE_HOME", @"Label for 'Home' phone numbers.");
|
||||
} else if ([phoneNumberField.label isEqualToString:CNLabelWork]) {
|
||||
phoneNumberNameMap[phoneNumber.stringValue]
|
||||
= NSLocalizedString(@"PHONE_NUMBER_TYPE_WORK", @"Label for 'Work' phone numbers.");
|
||||
} else if ([phoneNumberField.label isEqualToString:CNLabelPhoneNumberiPhone]) {
|
||||
phoneNumberNameMap[phoneNumber.stringValue]
|
||||
= NSLocalizedString(@"PHONE_NUMBER_TYPE_IPHONE", @"Label for 'IPhone' phone numbers.");
|
||||
;
|
||||
} else if ([phoneNumberField.label isEqualToString:CNLabelPhoneNumberMobile]) {
|
||||
phoneNumberNameMap[phoneNumber.stringValue]
|
||||
= NSLocalizedString(@"PHONE_NUMBER_TYPE_MOBILE", @"Label for 'Mobile' phone numbers.");
|
||||
} else if ([phoneNumberField.label isEqualToString:CNLabelPhoneNumberMain]) {
|
||||
phoneNumberNameMap[phoneNumber.stringValue]
|
||||
= NSLocalizedString(@"PHONE_NUMBER_TYPE_MAIN", @"Label for 'Main' phone numbers.");
|
||||
} else if ([phoneNumberField.label isEqualToString:CNLabelPhoneNumberHomeFax]) {
|
||||
phoneNumberNameMap[phoneNumber.stringValue]
|
||||
= NSLocalizedString(@"PHONE_NUMBER_TYPE_HOME_FAX", @"Label for 'HomeFAX' phone numbers.");
|
||||
} else if ([phoneNumberField.label isEqualToString:CNLabelPhoneNumberWorkFax]) {
|
||||
phoneNumberNameMap[phoneNumber.stringValue]
|
||||
= NSLocalizedString(@"PHONE_NUMBER_TYPE_WORK_FAX", @"Label for 'Work FAX' phone numbers.");
|
||||
} else if ([phoneNumberField.label isEqualToString:CNLabelPhoneNumberOtherFax]) {
|
||||
phoneNumberNameMap[phoneNumber.stringValue]
|
||||
= NSLocalizedString(@"PHONE_NUMBER_TYPE_OTHER_FAX", @"Label for 'Other FAX' phone numbers.");
|
||||
} else if ([phoneNumberField.label isEqualToString:CNLabelPhoneNumberPager]) {
|
||||
phoneNumberNameMap[phoneNumber.stringValue]
|
||||
= NSLocalizedString(@"PHONE_NUMBER_TYPE_PAGER", @"Label for 'Pager' phone numbers.");
|
||||
} else if ([phoneNumberField.label isEqualToString:CNLabelOther]) {
|
||||
phoneNumberNameMap[phoneNumber.stringValue]
|
||||
= NSLocalizedString(@"PHONE_NUMBER_TYPE_OTHER", @"Label for 'Other' phone numbers.");
|
||||
} else if (phoneNumberField.label.length > 0 && ![phoneNumberField.label hasPrefix:@"_$"]) {
|
||||
// We'll reach this case for:
|
||||
//
|
||||
// * User-defined custom labels, which we want to display.
|
||||
// * Labels like "_$!<CompanyMain>!$_", which I'm guessing are synced from other platforms.
|
||||
// We don't want to display these labels. Even some of iOS' default labels (like Radio) show
|
||||
// up this way.
|
||||
phoneNumberNameMap[phoneNumber.stringValue] = phoneNumberField.label;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
_userTextPhoneNumbers = [phoneNumbers copy];
|
||||
_phoneNumberNameMap = [NSMutableDictionary new];
|
||||
_parsedPhoneNumbers =
|
||||
[self parsedPhoneNumbersFromUserTextPhoneNumbers:phoneNumbers phoneNumberNameMap:phoneNumberNameMap];
|
||||
|
||||
NSMutableArray<NSString *> *emailAddresses = [NSMutableArray new];
|
||||
for (CNLabeledValue *emailField in contact.emailAddresses) {
|
||||
if ([emailField.value isKindOfClass:[NSString class]]) {
|
||||
[emailAddresses addObject:(NSString *)emailField.value];
|
||||
}
|
||||
}
|
||||
_emails = [emailAddresses copy];
|
||||
|
||||
if (contact.thumbnailImageData) {
|
||||
_image = [UIImage imageWithData:contact.thumbnailImageData];
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (NSString *)trimName:(NSString *)name
|
||||
{
|
||||
return [name stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
|
||||
}
|
||||
|
||||
+ (NSString *)uniqueIdFromABRecordId:(ABRecordID)recordId
|
||||
{
|
||||
return [NSString stringWithFormat:@"ABRecordId:%d", recordId];
|
||||
}
|
||||
|
||||
#endif // TARGET_OS_IOS
|
||||
|
||||
- (NSArray<PhoneNumber *> *)parsedPhoneNumbersFromUserTextPhoneNumbers:(NSArray<NSString *> *)userTextPhoneNumbers
|
||||
phoneNumberNameMap:(nullable NSDictionary<NSString *, NSString *> *)
|
||||
phoneNumberNameMap
|
||||
{
|
||||
OWSAssert(self.phoneNumberNameMap);
|
||||
|
||||
NSMutableDictionary<NSString *, PhoneNumber *> *parsedPhoneNumberMap = [NSMutableDictionary new];
|
||||
NSMutableArray<PhoneNumber *> *parsedPhoneNumbers = [NSMutableArray new];
|
||||
for (NSString *phoneNumberString in userTextPhoneNumbers) {
|
||||
for (PhoneNumber *phoneNumber in
|
||||
[PhoneNumber tryParsePhoneNumbersFromsUserSpecifiedText:phoneNumberString
|
||||
clientPhoneNumber:[TSAccountManager localNumber]]) {
|
||||
[parsedPhoneNumbers addObject:phoneNumber];
|
||||
parsedPhoneNumberMap[phoneNumber.toE164] = phoneNumber;
|
||||
NSString *phoneNumberName = phoneNumberNameMap[phoneNumberString];
|
||||
if (phoneNumberName) {
|
||||
self.phoneNumberNameMap[phoneNumber.toE164] = phoneNumberName;
|
||||
}
|
||||
}
|
||||
}
|
||||
return [parsedPhoneNumbers sortedArrayUsingSelector:@selector(compare:)];
|
||||
}
|
||||
|
||||
- (NSString *)fullName {
|
||||
if (_fullName == nil) {
|
||||
if (ABPersonGetCompositeNameFormat() == kABPersonCompositeNameFormatFirstNameFirst) {
|
||||
_fullName = [self combineLeftName:_firstName withRightName:_lastName usingSeparator:@" "];
|
||||
} else {
|
||||
_fullName = [self combineLeftName:_lastName withRightName:_firstName usingSeparator:@" "];
|
||||
}
|
||||
}
|
||||
|
||||
return _fullName;
|
||||
}
|
||||
|
||||
- (NSString *)comparableNameFirstLast {
|
||||
if (_comparableNameFirstLast == nil) {
|
||||
// Combine the two names with a tab separator, which has a lower ascii code than space, so that first names
|
||||
// that contain a space ("Mary Jo\tCatlett") will sort after those that do not ("Mary\tOliver")
|
||||
_comparableNameFirstLast = [self combineLeftName:_firstName withRightName:_lastName usingSeparator:@"\t"];
|
||||
}
|
||||
|
||||
return _comparableNameFirstLast;
|
||||
}
|
||||
|
||||
- (NSString *)comparableNameLastFirst {
|
||||
if (_comparableNameLastFirst == nil) {
|
||||
// Combine the two names with a tab separator, which has a lower ascii code than space, so that last names
|
||||
// that contain a space ("Van Der Beek\tJames") will sort after those that do not ("Van\tJames")
|
||||
_comparableNameLastFirst = [self combineLeftName:_lastName withRightName:_firstName usingSeparator:@"\t"];
|
||||
}
|
||||
|
||||
return _comparableNameLastFirst;
|
||||
}
|
||||
|
||||
- (NSString *)combineLeftName:(NSString *)leftName withRightName:(NSString *)rightName usingSeparator:(NSString *)separator {
|
||||
const BOOL leftNameNonEmpty = (leftName.length > 0);
|
||||
const BOOL rightNameNonEmpty = (rightName.length > 0);
|
||||
|
||||
if (leftNameNonEmpty && rightNameNonEmpty) {
|
||||
return [NSString stringWithFormat:@"%@%@%@", leftName, separator, rightName];
|
||||
} else if (leftNameNonEmpty) {
|
||||
return [leftName copy];
|
||||
} else if (rightNameNonEmpty) {
|
||||
return [rightName copy];
|
||||
} else {
|
||||
return @"";
|
||||
}
|
||||
}
|
||||
|
||||
- (NSString *)description {
|
||||
return [NSString stringWithFormat:@"%@: %@", self.fullName, self.userTextPhoneNumbers];
|
||||
}
|
||||
|
||||
- (BOOL)isSignalContact {
|
||||
NSArray *identifiers = [self textSecureIdentifiers];
|
||||
|
||||
return [identifiers count] > 0;
|
||||
}
|
||||
|
||||
- (NSArray<SignalRecipient *> *)signalRecipientsWithTransaction:(YapDatabaseReadTransaction *)transaction
|
||||
{
|
||||
__block NSMutableArray *result = [NSMutableArray array];
|
||||
|
||||
for (PhoneNumber *number in [self.parsedPhoneNumbers sortedArrayUsingSelector:@selector(compare:)]) {
|
||||
SignalRecipient *signalRecipient =
|
||||
[SignalRecipient recipientWithTextSecureIdentifier:number.toE164 withTransaction:transaction];
|
||||
if (signalRecipient) {
|
||||
[result addObject:signalRecipient];
|
||||
}
|
||||
}
|
||||
|
||||
return [result copy];
|
||||
}
|
||||
|
||||
- (NSArray<NSString *> *)textSecureIdentifiers {
|
||||
__block NSMutableArray *identifiers = [NSMutableArray array];
|
||||
|
||||
[[TSStorageManager sharedManager].dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
|
||||
for (PhoneNumber *number in self.parsedPhoneNumbers) {
|
||||
if ([SignalRecipient recipientWithTextSecureIdentifier:number.toE164 withTransaction:transaction]) {
|
||||
[identifiers addObject:number.toE164];
|
||||
}
|
||||
}
|
||||
}];
|
||||
return [identifiers copy];
|
||||
}
|
||||
|
||||
+ (NSComparator)comparatorSortingNamesByFirstThenLast:(BOOL)firstNameOrdering {
|
||||
return ^NSComparisonResult(id obj1, id obj2) {
|
||||
Contact *contact1 = (Contact *)obj1;
|
||||
Contact *contact2 = (Contact *)obj2;
|
||||
|
||||
if (firstNameOrdering) {
|
||||
return [contact1.comparableNameFirstLast caseInsensitiveCompare:contact2.comparableNameFirstLast];
|
||||
} else {
|
||||
return [contact1.comparableNameLastFirst caseInsensitiveCompare:contact2.comparableNameLastFirst];
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
- (NSString *)nameForPhoneNumber:(NSString *)recipientId
|
||||
{
|
||||
OWSAssert(recipientId.length > 0);
|
||||
OWSAssert([self.textSecureIdentifiers containsObject:recipientId]);
|
||||
|
||||
NSString *value = self.phoneNumberNameMap[recipientId];
|
||||
OWSAssert(value);
|
||||
if (!value) {
|
||||
return NSLocalizedString(@"PHONE_NUMBER_TYPE_UNKNOWN",
|
||||
@"Label used when we don't what kind of phone number it is (e.g. mobile/work/home).");
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
- (NSUInteger)hash
|
||||
{
|
||||
// base hash is some arbitrary number
|
||||
NSUInteger hash = 1825038313;
|
||||
|
||||
hash = hash ^ self.fullName.hash;
|
||||
|
||||
// base thumbnailHash is some arbitrary number
|
||||
NSUInteger thumbnailHash = 389201946;
|
||||
if (self.cnContact.thumbnailImageData) {
|
||||
NSData *thumbnailHashData =
|
||||
[Cryptography computeSHA256Digest:self.cnContact.thumbnailImageData truncatedToBytes:sizeof(thumbnailHash)];
|
||||
[thumbnailHashData getBytes:&thumbnailHash length:sizeof(thumbnailHash)];
|
||||
}
|
||||
|
||||
hash = hash ^ thumbnailHash;
|
||||
|
||||
for (PhoneNumber *phoneNumber in self.parsedPhoneNumbers) {
|
||||
hash = hash ^ phoneNumber.toE164.hash;
|
||||
}
|
||||
|
||||
for (NSString *email in self.emails) {
|
||||
hash = hash ^ email.hash;
|
||||
}
|
||||
|
||||
return hash;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,42 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "SignalRecipient.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class Contact;
|
||||
|
||||
@interface ContactsUpdater : NSObject
|
||||
|
||||
+ (instancetype)sharedUpdater;
|
||||
|
||||
- (nullable SignalRecipient *)synchronousLookup:(NSString *)identifier error:(NSError **)error;
|
||||
|
||||
// This asynchronously tries to verify whether or not a contact id
|
||||
// corresponds to a service account.
|
||||
//
|
||||
// The failure callback is invoked if the lookup fails _or_ if the
|
||||
// contact id doesn't correspond to an account.
|
||||
- (void)lookupIdentifier:(NSString *)identifier
|
||||
success:(void (^)(SignalRecipient *recipient))success
|
||||
failure:(void (^)(NSError *error))failure;
|
||||
|
||||
// This asynchronously tries to verify whether or not a group of possible
|
||||
// contact ids correspond to service accounts.
|
||||
//
|
||||
// The failure callback is only invoked if the lookup fails. Otherwise,
|
||||
// the success callback is invoked with the (possibly empty) set of contacts
|
||||
// that were found.
|
||||
- (void)lookupIdentifiers:(NSArray<NSString *> *)identifiers
|
||||
success:(void (^)(NSArray<SignalRecipient *> *recipients))success
|
||||
failure:(void (^)(NSError *error))failure;
|
||||
|
||||
- (void)updateSignalContactIntersectionWithABContacts:(NSArray<Contact *> *)abContacts
|
||||
success:(void (^)())success
|
||||
failure:(void (^)(NSError *error))failure;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,233 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "ContactsUpdater.h"
|
||||
|
||||
#import "Contact.h"
|
||||
#import "Cryptography.h"
|
||||
#import "PhoneNumber.h"
|
||||
#import "OWSError.h"
|
||||
#import "TSContactsIntersectionRequest.h"
|
||||
#import "TSNetworkManager.h"
|
||||
#import "TSStorageManager.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@implementation ContactsUpdater
|
||||
|
||||
+ (instancetype)sharedUpdater {
|
||||
static dispatch_once_t onceToken;
|
||||
static id sharedInstance = nil;
|
||||
dispatch_once(&onceToken, ^{
|
||||
sharedInstance = [self new];
|
||||
});
|
||||
return sharedInstance;
|
||||
}
|
||||
|
||||
|
||||
- (instancetype)init
|
||||
{
|
||||
self = [super init];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
OWSSingletonAssert();
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (nullable SignalRecipient *)synchronousLookup:(NSString *)identifier error:(NSError **)error
|
||||
{
|
||||
dispatch_semaphore_t sema = dispatch_semaphore_create(0);
|
||||
|
||||
__block SignalRecipient *recipient;
|
||||
|
||||
// Assigning to a pointer parameter within the block is not preventing the referenced error from being dealloc
|
||||
// Instead, we avoid ambiguity in ownership by assigning to a local __block variable ensuring the error will be
|
||||
// retained until our error parameter can take ownership.
|
||||
__block NSError *retainedError;
|
||||
[self lookupIdentifier:identifier
|
||||
success:^(SignalRecipient *fetchedRecipient) {
|
||||
recipient = fetchedRecipient;
|
||||
dispatch_semaphore_signal(sema);
|
||||
}
|
||||
failure:^(NSError *lookupError) {
|
||||
retainedError = lookupError;
|
||||
dispatch_semaphore_signal(sema);
|
||||
}];
|
||||
|
||||
dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
|
||||
*error = retainedError;
|
||||
return recipient;
|
||||
}
|
||||
|
||||
- (void)lookupIdentifier:(NSString *)identifier
|
||||
success:(void (^)(SignalRecipient *recipient))success
|
||||
failure:(void (^)(NSError *error))failure
|
||||
{
|
||||
// This should never happen according to nullability annotations... but IIRC it does. =/
|
||||
if (!identifier) {
|
||||
OWSAssert(NO);
|
||||
failure(OWSErrorWithCodeDescription(OWSErrorCodeInvalidMethodParameters, @"Cannot lookup nil identifier"));
|
||||
return;
|
||||
}
|
||||
|
||||
[self contactIntersectionWithSet:[NSSet setWithObject:identifier]
|
||||
success:^(NSSet<NSString *> *_Nonnull matchedIds) {
|
||||
if (matchedIds.count == 1) {
|
||||
success([SignalRecipient recipientWithTextSecureIdentifier:identifier]);
|
||||
} else {
|
||||
failure(OWSErrorMakeNoSuchSignalRecipientError());
|
||||
}
|
||||
}
|
||||
failure:failure];
|
||||
}
|
||||
|
||||
- (void)lookupIdentifiers:(NSArray<NSString *> *)identifiers
|
||||
success:(void (^)(NSArray<SignalRecipient *> *recipients))success
|
||||
failure:(void (^)(NSError *error))failure
|
||||
{
|
||||
if (identifiers.count < 1) {
|
||||
OWSAssert(NO);
|
||||
failure(OWSErrorWithCodeDescription(OWSErrorCodeInvalidMethodParameters, @"Cannot lookup zero identifiers"));
|
||||
return;
|
||||
}
|
||||
|
||||
[self contactIntersectionWithSet:[NSSet setWithArray:identifiers]
|
||||
success:^(NSSet<NSString *> *_Nonnull matchedIds) {
|
||||
if (matchedIds.count > 0) {
|
||||
NSMutableArray<SignalRecipient *> *recipients = [NSMutableArray new];
|
||||
for (NSString *identifier in matchedIds) {
|
||||
[recipients addObject:[SignalRecipient recipientWithTextSecureIdentifier:identifier]];
|
||||
}
|
||||
success([recipients copy]);
|
||||
} else {
|
||||
failure(OWSErrorMakeNoSuchSignalRecipientError());
|
||||
}
|
||||
}
|
||||
failure:failure];
|
||||
}
|
||||
|
||||
- (void)updateSignalContactIntersectionWithABContacts:(NSArray<Contact *> *)abContacts
|
||||
success:(void (^)())success
|
||||
failure:(void (^)(NSError *error))failure {
|
||||
NSMutableSet<NSString *> *abPhoneNumbers = [NSMutableSet set];
|
||||
|
||||
for (Contact *contact in abContacts) {
|
||||
for (PhoneNumber *phoneNumber in contact.parsedPhoneNumbers) {
|
||||
[abPhoneNumbers addObject:phoneNumber.toE164];
|
||||
}
|
||||
}
|
||||
|
||||
NSMutableSet *recipientIds = [NSMutableSet set];
|
||||
[[TSStorageManager sharedManager].dbReadConnection
|
||||
readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
|
||||
NSArray *allRecipientKeys = [transaction allKeysInCollection:[SignalRecipient collection]];
|
||||
[recipientIds addObjectsFromArray:allRecipientKeys];
|
||||
}];
|
||||
|
||||
NSMutableSet<NSString *> *allContacts = [[abPhoneNumbers setByAddingObjectsFromSet:recipientIds] mutableCopy];
|
||||
|
||||
[self contactIntersectionWithSet:allContacts
|
||||
success:^(NSSet<NSString *> *matchedIds) {
|
||||
[recipientIds minusSet:matchedIds];
|
||||
|
||||
// Cleaning up unregistered identifiers
|
||||
[[TSStorageManager sharedManager].dbReadWriteConnection
|
||||
readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
|
||||
for (NSString *identifier in recipientIds) {
|
||||
SignalRecipient *recipient =
|
||||
[SignalRecipient fetchObjectWithUniqueID:identifier
|
||||
transaction:transaction];
|
||||
|
||||
[recipient removeWithTransaction:transaction];
|
||||
}
|
||||
}];
|
||||
|
||||
DDLogInfo(@"%@ successfully intersected contacts.", self.tag);
|
||||
success();
|
||||
}
|
||||
failure:failure];
|
||||
}
|
||||
|
||||
- (void)contactIntersectionWithSet:(NSSet<NSString *> *)idSet
|
||||
success:(void (^)(NSSet<NSString *> *matchedIds))success
|
||||
failure:(void (^)(NSError *error))failure {
|
||||
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
||||
NSMutableDictionary *phoneNumbersByHashes = [NSMutableDictionary dictionary];
|
||||
for (NSString *identifier in idSet) {
|
||||
[phoneNumbersByHashes setObject:identifier
|
||||
forKey:[Cryptography truncatedSHA1Base64EncodedWithoutPadding:identifier]];
|
||||
}
|
||||
NSArray *hashes = [phoneNumbersByHashes allKeys];
|
||||
|
||||
TSRequest *request = [[TSContactsIntersectionRequest alloc] initWithHashesArray:hashes];
|
||||
[[TSNetworkManager sharedManager] makeRequest:request
|
||||
success:^(NSURLSessionDataTask *tsTask, id responseDict) {
|
||||
NSMutableDictionary *attributesForIdentifier = [NSMutableDictionary dictionary];
|
||||
NSArray *contactsArray = [(NSDictionary *)responseDict objectForKey:@"contacts"];
|
||||
|
||||
// Map attributes to phone numbers
|
||||
if (contactsArray) {
|
||||
for (NSDictionary *dict in contactsArray) {
|
||||
NSString *hash = [dict objectForKey:@"token"];
|
||||
NSString *identifier = [phoneNumbersByHashes objectForKey:hash];
|
||||
|
||||
if (!identifier) {
|
||||
DDLogWarn(@"%@ An interesecting hash wasn't found in the mapping.", self.tag);
|
||||
break;
|
||||
}
|
||||
|
||||
[attributesForIdentifier setObject:dict forKey:identifier];
|
||||
}
|
||||
}
|
||||
|
||||
// Insert or update contact attributes
|
||||
[[TSStorageManager sharedManager].dbReadWriteConnection
|
||||
readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
|
||||
for (NSString *identifier in attributesForIdentifier) {
|
||||
SignalRecipient *recipient =
|
||||
[SignalRecipient recipientWithTextSecureIdentifier:identifier withTransaction:transaction];
|
||||
if (!recipient) {
|
||||
recipient = [[SignalRecipient alloc] initWithTextSecureIdentifier:identifier relay:nil];
|
||||
}
|
||||
|
||||
NSDictionary *attributes = [attributesForIdentifier objectForKey:identifier];
|
||||
|
||||
recipient.relay = attributes[@"relay"];
|
||||
|
||||
[recipient saveWithTransaction:transaction];
|
||||
}
|
||||
}];
|
||||
|
||||
success([NSSet setWithArray:attributesForIdentifier.allKeys]);
|
||||
}
|
||||
failure:^(NSURLSessionDataTask *task, NSError *error) {
|
||||
NSHTTPURLResponse *response = (NSHTTPURLResponse *)task.response;
|
||||
if (response.statusCode == 413) {
|
||||
failure(OWSErrorWithCodeDescription(
|
||||
OWSErrorCodeContactsUpdaterRateLimit, OWSSignalServiceKitErrorDomain));
|
||||
} else {
|
||||
failure(error);
|
||||
}
|
||||
}];
|
||||
});
|
||||
}
|
||||
|
||||
#pragma mark - Logging
|
||||
|
||||
+ (NSString *)tag
|
||||
{
|
||||
return [NSString stringWithFormat:@"[%@]", self.class];
|
||||
}
|
||||
|
||||
- (NSString *)tag
|
||||
{
|
||||
return self.class.tag;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,31 @@
|
||||
// Created by Michael Kirk on 9/23/16.
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
#import "TSYapDatabaseObject.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
extern const uint32_t OWSDisappearingMessagesConfigurationDefaultExpirationDuration;
|
||||
|
||||
@interface OWSDisappearingMessagesConfiguration : TSYapDatabaseObject
|
||||
|
||||
- (instancetype)initDefaultWithThreadId:(NSString *)threadId;
|
||||
|
||||
- (instancetype)initWithThreadId:(NSString *)threadId enabled:(BOOL)isEnabled durationSeconds:(uint32_t)seconds;
|
||||
|
||||
@property (nonatomic, getter=isEnabled) BOOL enabled;
|
||||
@property (nonatomic) uint32_t durationSeconds;
|
||||
@property (nonatomic, readonly) NSUInteger durationIndex;
|
||||
@property (nonatomic, readonly) NSString *durationString;
|
||||
@property (nonatomic, readonly) BOOL dictionaryValueDidChange;
|
||||
@property (readonly, getter=isNewRecord) BOOL newRecord;
|
||||
|
||||
+ (instancetype)fetchOrCreateDefaultWithThreadId:(NSString *)threadId;
|
||||
|
||||
+ (NSArray<NSNumber *> *)validDurationsSeconds;
|
||||
|
||||
+ (NSString *)stringForDurationSeconds:(uint32_t)durationSeconds;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,181 @@
|
||||
// Created by Michael Kirk on 9/23/16.
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
#import "OWSDisappearingMessagesConfiguration.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
const uint32_t OWSDisappearingMessagesConfigurationDefaultExpirationDuration = 60 * 60 * 24; // 1 day.
|
||||
|
||||
@interface OWSDisappearingMessagesConfiguration ()
|
||||
|
||||
// Transient record lifecycle attributes.
|
||||
@property (atomic) NSDictionary *originalDictionaryValue;
|
||||
@property (atomic, getter=isNewRecord) BOOL newRecord;
|
||||
|
||||
@end
|
||||
|
||||
@implementation OWSDisappearingMessagesConfiguration
|
||||
|
||||
- (instancetype)initDefaultWithThreadId:(NSString *)threadId
|
||||
{
|
||||
return [self initWithThreadId:threadId
|
||||
enabled:NO
|
||||
durationSeconds:OWSDisappearingMessagesConfigurationDefaultExpirationDuration];
|
||||
}
|
||||
|
||||
- (instancetype)initWithCoder:(NSCoder *)coder
|
||||
{
|
||||
self = [super initWithCoder:coder];
|
||||
|
||||
_originalDictionaryValue = [self dictionaryValue];
|
||||
_newRecord = NO;
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (instancetype)initWithThreadId:(NSString *)threadId enabled:(BOOL)isEnabled durationSeconds:(uint32_t)seconds
|
||||
{
|
||||
self = [super initWithUniqueId:threadId];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
_enabled = isEnabled;
|
||||
_durationSeconds = seconds;
|
||||
_originalDictionaryValue = [NSDictionary new];
|
||||
_newRecord = YES;
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
+ (instancetype)fetchOrCreateDefaultWithThreadId:(NSString *)threadId
|
||||
{
|
||||
OWSDisappearingMessagesConfiguration *savedConfiguration = [self fetchObjectWithUniqueID:threadId];
|
||||
if (savedConfiguration) {
|
||||
return savedConfiguration;
|
||||
} else {
|
||||
return [[self alloc] initDefaultWithThreadId:threadId];
|
||||
}
|
||||
}
|
||||
|
||||
+ (NSString *)stringForDurationSeconds:(uint32_t)durationSeconds
|
||||
{
|
||||
NSString *amountFormat;
|
||||
uint32_t duration;
|
||||
|
||||
uint32_t secondsPerMinute = 60;
|
||||
uint32_t secondsPerHour = secondsPerMinute * 60;
|
||||
uint32_t secondsPerDay = secondsPerHour * 24;
|
||||
uint32_t secondsPerWeek = secondsPerDay * 7;
|
||||
|
||||
if (durationSeconds < secondsPerMinute) { // XX Seconds
|
||||
amountFormat = NSLocalizedString(@"SECONDS_TIME_AMOUNT",
|
||||
@"{{number of seconds}} embedded in strings, e.g. 'Alice updated disappearing messages "
|
||||
@"expiration to {{5 seconds}}'. See other *_TIME_AMOUNT strings");
|
||||
duration = durationSeconds;
|
||||
} else if (durationSeconds < secondsPerMinute * 1.5) { // 1 Minute
|
||||
amountFormat = NSLocalizedString(@"SINGLE_MINUTE_TIME_AMOUNT",
|
||||
@"{{1 minute}} embedded in strings, e.g. 'Alice updated disappearing messages "
|
||||
@"expiration to {{1 minute}}'. See other *_TIME_AMOUNT strings");
|
||||
duration = durationSeconds / secondsPerMinute;
|
||||
} else if (durationSeconds < secondsPerHour) { // Multiple Minutes
|
||||
amountFormat = NSLocalizedString(@"MINUTES_TIME_AMOUNT",
|
||||
@"{{number of minutes}} embedded in strings, e.g. 'Alice updated disappearing messages "
|
||||
@"expiration to {{5 minutes}}'. See other *_TIME_AMOUNT strings");
|
||||
|
||||
duration = durationSeconds / secondsPerMinute;
|
||||
} else if (durationSeconds < secondsPerHour * 1.5) { // 1 Hour
|
||||
amountFormat = NSLocalizedString(@"SINGLE_HOUR_TIME_AMOUNT",
|
||||
@"{{1 hour}} embedded in strings, e.g. 'Alice updated disappearing messages "
|
||||
@"expiration to {{1 hour}}'. See other *_TIME_AMOUNT strings");
|
||||
|
||||
duration = durationSeconds / secondsPerHour;
|
||||
} else if (durationSeconds < secondsPerDay) { // Multiple Hours
|
||||
amountFormat = NSLocalizedString(@"HOURS_TIME_AMOUNT",
|
||||
@"{{number of hours}} embedded in strings, e.g. 'Alice updated disappearing messages "
|
||||
@"expiration to {{5 hours}}'. See other *_TIME_AMOUNT strings");
|
||||
|
||||
duration = durationSeconds / secondsPerHour;
|
||||
} else if (durationSeconds < secondsPerDay * 1.5) { // 1 Day
|
||||
amountFormat = NSLocalizedString(@"SINGLE_DAY_TIME_AMOUNT",
|
||||
@"{{1 day}} embedded in strings, e.g. 'Alice updated disappearing messages "
|
||||
@"expiration to {{1 day}}'. See other *_TIME_AMOUNT strings");
|
||||
|
||||
duration = durationSeconds / secondsPerDay;
|
||||
} else if (durationSeconds < secondsPerWeek) { // Multiple Days
|
||||
amountFormat = NSLocalizedString(@"DAYS_TIME_AMOUNT",
|
||||
@"{{number of days}} embedded in strings, e.g. 'Alice updated disappearing messages "
|
||||
@"expiration to {{5 days}}'. See other *_TIME_AMOUNT strings");
|
||||
|
||||
duration = durationSeconds / secondsPerDay;
|
||||
} else if (durationSeconds < secondsPerWeek * 1.5) { // 1 Week
|
||||
amountFormat = NSLocalizedString(@"SINGLE_WEEK_TIME_AMOUNT",
|
||||
@"{{1 week}} embedded in strings, e.g. 'Alice updated disappearing messages "
|
||||
@"expiration to {{1 week}}'. See other *_TIME_AMOUNT strings");
|
||||
|
||||
duration = durationSeconds / secondsPerWeek;
|
||||
} else { // Multiple weeks
|
||||
amountFormat = NSLocalizedString(@"WEEKS_TIME_AMOUNT",
|
||||
@"{{number of weeks}}, embedded in strings, e.g. 'Alice updated disappearing messages "
|
||||
@"expiration to {{5 weeks}}'. See other *_TIME_AMOUNT strings");
|
||||
|
||||
duration = durationSeconds / secondsPerWeek;
|
||||
}
|
||||
|
||||
return [NSString stringWithFormat:amountFormat, duration];
|
||||
}
|
||||
|
||||
+ (NSArray<NSNumber *> *)validDurationsSeconds
|
||||
{
|
||||
return @[ @(5),
|
||||
@(10),
|
||||
@(30),
|
||||
@(60),
|
||||
@(300),
|
||||
@(1800),
|
||||
@(3600),
|
||||
@(21600),
|
||||
@(43200),
|
||||
@(86400),
|
||||
@(604800) ];
|
||||
}
|
||||
|
||||
- (NSUInteger)durationIndex
|
||||
{
|
||||
return [[self.class validDurationsSeconds] indexOfObject:@(self.durationSeconds)];
|
||||
}
|
||||
|
||||
- (NSString *)durationString
|
||||
{
|
||||
return [self.class stringForDurationSeconds:self.durationSeconds];
|
||||
}
|
||||
|
||||
#pragma mark - Dirty Tracking
|
||||
|
||||
+ (MTLPropertyStorage)storageBehaviorForPropertyWithKey:(NSString *)propertyKey
|
||||
{
|
||||
// Don't persist transient properties
|
||||
if ([propertyKey isEqualToString:@"originalDictionaryValue"]
|
||||
||[propertyKey isEqualToString:@"newRecord"]) {
|
||||
return MTLPropertyStorageNone;
|
||||
} else {
|
||||
return [super storageBehaviorForPropertyWithKey:propertyKey];
|
||||
}
|
||||
}
|
||||
|
||||
- (BOOL)dictionaryValueDidChange
|
||||
{
|
||||
return ![self.originalDictionaryValue isEqual:[self dictionaryValue]];
|
||||
}
|
||||
|
||||
- (void)saveWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
|
||||
{
|
||||
[super saveWithTransaction:transaction];
|
||||
self.originalDictionaryValue = [self dictionaryValue];
|
||||
self.newRecord = NO;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,55 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <libPhoneNumber-iOS/NBPhoneNumberUtil.h>
|
||||
|
||||
#define COUNTRY_CODE_PREFIX @"+"
|
||||
|
||||
/**
|
||||
*
|
||||
* PhoneNumber is used to deal with the nitty details of parsing/canonicalizing phone numbers.
|
||||
* Everything that expects a valid phone number should take a PhoneNumber, not a string, to avoid stringly typing.
|
||||
*
|
||||
*/
|
||||
@interface PhoneNumber : NSObject {
|
||||
@private
|
||||
NBPhoneNumber *phoneNumber;
|
||||
@private
|
||||
NSString *e164;
|
||||
}
|
||||
|
||||
+ (PhoneNumber *)phoneNumberFromText:(NSString *)text andRegion:(NSString *)regionCode;
|
||||
+ (PhoneNumber *)phoneNumberFromUserSpecifiedText:(NSString *)text;
|
||||
+ (PhoneNumber *)phoneNumberFromE164:(NSString *)text;
|
||||
|
||||
+ (PhoneNumber *)tryParsePhoneNumberFromText:(NSString *)text fromRegion:(NSString *)regionCode;
|
||||
+ (PhoneNumber *)tryParsePhoneNumberFromUserSpecifiedText:(NSString *)text;
|
||||
+ (PhoneNumber *)tryParsePhoneNumberFromE164:(NSString *)text;
|
||||
|
||||
// This will try to parse the input text as a phone number using
|
||||
// the default region and the country code for this client's phone
|
||||
// number.
|
||||
//
|
||||
// Order matters; better results will appear first.
|
||||
+ (NSArray<PhoneNumber *> *)tryParsePhoneNumbersFromsUserSpecifiedText:(NSString *)text
|
||||
clientPhoneNumber:(NSString *)clientPhoneNumber;
|
||||
|
||||
+ (NSString *)removeFormattingCharacters:(NSString *)inputString;
|
||||
+ (NSString *)bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:(NSString *)input;
|
||||
+ (NSString *)bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:(NSString *)input
|
||||
withSpecifiedCountryCodeString:(NSString *)countryCodeString;
|
||||
|
||||
+ (NSString *)regionCodeFromCountryCodeString:(NSString *)countryCodeString;
|
||||
|
||||
- (NSURL *)toSystemDialerURL;
|
||||
- (NSString *)toE164;
|
||||
- (NSString *)localizedDescriptionForUser;
|
||||
- (NSNumber *)getCountryCode;
|
||||
- (BOOL)isValid;
|
||||
- (BOOL)resolvesInternationallyTo:(PhoneNumber *)otherPhoneNumber;
|
||||
|
||||
- (NSComparisonResult)compare:(PhoneNumber *)other;
|
||||
|
||||
@end
|
||||
@ -0,0 +1,266 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "NBAsYouTypeFormatter.h"
|
||||
#import "NBPhoneNumber.h"
|
||||
#import "PhoneNumber.h"
|
||||
#import "PhoneNumberUtil.h"
|
||||
|
||||
static NSString *const RPDefaultsKeyPhoneNumberString = @"RPDefaultsKeyPhoneNumberString";
|
||||
static NSString *const RPDefaultsKeyPhoneNumberCanonical = @"RPDefaultsKeyPhoneNumberCanonical";
|
||||
|
||||
@implementation PhoneNumber
|
||||
|
||||
+ (PhoneNumber *)phoneNumberFromText:(NSString *)text andRegion:(NSString *)regionCode {
|
||||
OWSAssert(text != nil);
|
||||
OWSAssert(regionCode != nil);
|
||||
|
||||
PhoneNumberUtil *phoneUtil = [PhoneNumberUtil sharedUtil];
|
||||
|
||||
NSError *parseError = nil;
|
||||
NBPhoneNumber *number = [phoneUtil parse:text defaultRegion:regionCode error:&parseError];
|
||||
|
||||
if (parseError) {
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSError *toE164Error;
|
||||
NSString *e164 = [phoneUtil format:number numberFormat:NBEPhoneNumberFormatE164 error:&toE164Error];
|
||||
if (toE164Error) {
|
||||
DDLogDebug(@"Issue while formatting number: %@", [toE164Error description]);
|
||||
return nil;
|
||||
}
|
||||
|
||||
PhoneNumber *phoneNumber = [PhoneNumber new];
|
||||
phoneNumber->phoneNumber = number;
|
||||
phoneNumber->e164 = e164;
|
||||
return phoneNumber;
|
||||
}
|
||||
|
||||
+ (PhoneNumber *)phoneNumberFromUserSpecifiedText:(NSString *)text {
|
||||
OWSAssert(text != nil);
|
||||
|
||||
return [PhoneNumber phoneNumberFromText:text andRegion:[self defaultRegionCode]];
|
||||
}
|
||||
|
||||
+ (NSString *)defaultRegionCode {
|
||||
NSString *defaultRegion;
|
||||
#if TARGET_OS_IPHONE
|
||||
defaultRegion = [[PhoneNumberUtil sharedUtil].nbPhoneNumberUtil countryCodeByCarrier];
|
||||
|
||||
if ([defaultRegion isEqualToString:@"ZZ"]) {
|
||||
defaultRegion = [[NSLocale currentLocale] objectForKey:NSLocaleCountryCode];
|
||||
}
|
||||
#else
|
||||
defaultRegion = [[NSLocale currentLocale] objectForKey:NSLocaleCountryCode];
|
||||
#endif
|
||||
return defaultRegion;
|
||||
}
|
||||
|
||||
+ (PhoneNumber *)phoneNumberFromE164:(NSString *)text {
|
||||
OWSAssert(text != nil);
|
||||
OWSAssert([text hasPrefix:COUNTRY_CODE_PREFIX]);
|
||||
PhoneNumber *number = [PhoneNumber phoneNumberFromText:text andRegion:@"ZZ"];
|
||||
|
||||
OWSAssert(number != nil);
|
||||
return number;
|
||||
}
|
||||
|
||||
+ (NSString *)bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:(NSString *)input {
|
||||
return [PhoneNumber bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:input
|
||||
withSpecifiedRegionCode:[self defaultRegionCode]];
|
||||
}
|
||||
|
||||
+ (NSString *)bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:(NSString *)input
|
||||
withSpecifiedCountryCodeString:(NSString *)countryCodeString {
|
||||
return [PhoneNumber
|
||||
bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:input
|
||||
withSpecifiedRegionCode:
|
||||
[PhoneNumber regionCodeFromCountryCodeString:countryCodeString]];
|
||||
}
|
||||
|
||||
+ (NSString *)bestEffortFormatPartialUserSpecifiedTextToLookLikeAPhoneNumber:(NSString *)input
|
||||
withSpecifiedRegionCode:(NSString *)regionCode {
|
||||
NBAsYouTypeFormatter *formatter = [[NBAsYouTypeFormatter alloc] initWithRegionCode:regionCode];
|
||||
|
||||
NSString *result = input;
|
||||
for (NSUInteger i = 0; i < input.length; i++) {
|
||||
result = [formatter inputDigit:[input substringWithRange:NSMakeRange(i, 1)]];
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
+ (NSString *)regionCodeFromCountryCodeString:(NSString *)countryCodeString {
|
||||
NBPhoneNumberUtil *phoneUtil = [PhoneNumberUtil sharedUtil].nbPhoneNumberUtil;
|
||||
NSString *regionCode =
|
||||
[phoneUtil getRegionCodeForCountryCode:@([[countryCodeString substringFromIndex:1] integerValue])];
|
||||
return regionCode;
|
||||
}
|
||||
|
||||
|
||||
+ (PhoneNumber *)tryParsePhoneNumberFromText:(NSString *)text fromRegion:(NSString *)regionCode {
|
||||
OWSAssert(text != nil);
|
||||
OWSAssert(regionCode != nil);
|
||||
|
||||
return [self phoneNumberFromText:text andRegion:regionCode];
|
||||
}
|
||||
|
||||
+ (PhoneNumber *)tryParsePhoneNumberFromUserSpecifiedText:(NSString *)text {
|
||||
OWSAssert(text != nil);
|
||||
|
||||
if ([text isEqualToString:@""]) {
|
||||
return nil;
|
||||
}
|
||||
NSString *sanitizedString = [self removeFormattingCharacters:text];
|
||||
|
||||
return [self phoneNumberFromUserSpecifiedText:sanitizedString];
|
||||
}
|
||||
|
||||
+ (NSArray<PhoneNumber *> *)tryParsePhoneNumbersFromsUserSpecifiedText:(NSString *)text
|
||||
clientPhoneNumber:(NSString *)clientPhoneNumber
|
||||
{
|
||||
OWSAssert(text != nil);
|
||||
|
||||
text = [text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
|
||||
if ([text isEqualToString:@""]) {
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSString *sanitizedString = [self removeFormattingCharacters:text];
|
||||
OWSAssert(sanitizedString != nil);
|
||||
|
||||
NSMutableArray *result = [NSMutableArray new];
|
||||
NSMutableSet *phoneNumberSet = [NSMutableSet new];
|
||||
void (^tryParsingWithCountryCode)(NSString *, NSString *) = ^(NSString *text,
|
||||
NSString *countryCode) {
|
||||
PhoneNumber *phoneNumber = [PhoneNumber phoneNumberFromText:text
|
||||
andRegion:countryCode];
|
||||
if (phoneNumber && [phoneNumber toE164] && ![phoneNumberSet containsObject:[phoneNumber toE164]]) {
|
||||
[result addObject:phoneNumber];
|
||||
[phoneNumberSet addObject:[phoneNumber toE164]];
|
||||
}
|
||||
};
|
||||
|
||||
tryParsingWithCountryCode(sanitizedString, [self defaultRegionCode]);
|
||||
|
||||
if ([sanitizedString hasPrefix:@"+"]) {
|
||||
// If the text starts with "+", don't try prepending
|
||||
// anything else.
|
||||
return result;
|
||||
}
|
||||
|
||||
// Try just adding "+" and parsing it.
|
||||
tryParsingWithCountryCode([NSString stringWithFormat:@"+%@", sanitizedString], [self defaultRegionCode]);
|
||||
|
||||
// Order matters; better results should appear first so prefer
|
||||
// matches with the same country code as this client's phone number.
|
||||
OWSAssert(clientPhoneNumber.length > 0);
|
||||
if (clientPhoneNumber.length > 0) {
|
||||
// Note that NBPhoneNumber uses "country code" to refer to what we call a
|
||||
// "calling code" (i.e. 44 in +44123123). Within SSK we use "country code"
|
||||
// (and sometimes "region code") to refer to a country's ISO 2-letter code
|
||||
// (ISO 3166-1 alpha-2).
|
||||
NSNumber *callingCodeForLocalNumber = [[PhoneNumber phoneNumberFromE164:clientPhoneNumber] getCountryCode];
|
||||
if (callingCodeForLocalNumber != nil) {
|
||||
NSString *callingCodePrefix = [NSString stringWithFormat:@"+%@", callingCodeForLocalNumber];
|
||||
|
||||
tryParsingWithCountryCode(
|
||||
[callingCodePrefix stringByAppendingString:sanitizedString], [self defaultRegionCode]);
|
||||
|
||||
// Try to determine what the country code is for the local phone number
|
||||
// and also try parsing the phone number using that country code if it
|
||||
// differs from the device's region code.
|
||||
//
|
||||
// For example, a French person living in Italy might have an
|
||||
// Italian phone number but use French region/language for their
|
||||
// phone. They're likely to have both Italian and French contacts.
|
||||
NSString *localCountryCode =
|
||||
[PhoneNumberUtil.sharedUtil probableCountryCodeForCallingCode:callingCodePrefix];
|
||||
if (localCountryCode && ![localCountryCode isEqualToString:[self defaultRegionCode]]) {
|
||||
tryParsingWithCountryCode(
|
||||
[callingCodePrefix stringByAppendingString:sanitizedString], localCountryCode);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
+ (NSString *)removeFormattingCharacters:(NSString *)inputString {
|
||||
char outputString[inputString.length + 1];
|
||||
|
||||
int outputLength = 0;
|
||||
for (NSUInteger i = 0; i < inputString.length; i++) {
|
||||
unichar c = [inputString characterAtIndex:i];
|
||||
if (c == '+' || (c >= '0' && c <= '9')) {
|
||||
outputString[outputLength++] = (char)c;
|
||||
}
|
||||
}
|
||||
|
||||
outputString[outputLength] = 0;
|
||||
return [NSString stringWithUTF8String:(void *)outputString];
|
||||
}
|
||||
|
||||
+ (PhoneNumber *)tryParsePhoneNumberFromE164:(NSString *)text {
|
||||
OWSAssert(text != nil);
|
||||
|
||||
return [self phoneNumberFromE164:text];
|
||||
}
|
||||
|
||||
- (NSURL *)toSystemDialerURL {
|
||||
NSString *link = [NSString stringWithFormat:@"telprompt://%@", e164];
|
||||
return [NSURL URLWithString:link];
|
||||
}
|
||||
|
||||
- (NSString *)toE164 {
|
||||
return e164;
|
||||
}
|
||||
|
||||
- (NSNumber *)getCountryCode {
|
||||
return phoneNumber.countryCode;
|
||||
}
|
||||
|
||||
- (BOOL)isValid {
|
||||
return [[PhoneNumberUtil sharedUtil].nbPhoneNumberUtil isValidNumber:phoneNumber];
|
||||
}
|
||||
|
||||
- (NSString *)localizedDescriptionForUser {
|
||||
NBPhoneNumberUtil *phoneUtil = [PhoneNumberUtil sharedUtil].nbPhoneNumberUtil;
|
||||
|
||||
NSError *formatError = nil;
|
||||
NSString *pretty = [phoneUtil format:phoneNumber numberFormat:NBEPhoneNumberFormatINTERNATIONAL error:&formatError];
|
||||
|
||||
if (formatError != nil)
|
||||
return e164;
|
||||
return pretty;
|
||||
}
|
||||
|
||||
- (BOOL)resolvesInternationallyTo:(PhoneNumber *)otherPhoneNumber {
|
||||
return [self.toE164 isEqualToString:otherPhoneNumber.toE164];
|
||||
}
|
||||
|
||||
- (NSString *)description {
|
||||
return e164;
|
||||
}
|
||||
|
||||
- (void)encodeWithCoder:(NSCoder *)encoder {
|
||||
[encoder encodeObject:phoneNumber forKey:RPDefaultsKeyPhoneNumberString];
|
||||
[encoder encodeObject:e164 forKey:RPDefaultsKeyPhoneNumberCanonical];
|
||||
}
|
||||
|
||||
- (id)initWithCoder:(NSCoder *)decoder {
|
||||
if ((self = [super init])) {
|
||||
phoneNumber = [decoder decodeObjectForKey:RPDefaultsKeyPhoneNumberString];
|
||||
e164 = [decoder decodeObjectForKey:RPDefaultsKeyPhoneNumberCanonical];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (NSComparisonResult)compare:(PhoneNumber *)other
|
||||
{
|
||||
return [self.toE164 compare:other.toE164];
|
||||
}
|
||||
|
||||
@end
|
||||
@ -0,0 +1,39 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "NBPhoneNumberUtil.h"
|
||||
#import "PhoneNumber.h"
|
||||
|
||||
@interface PhoneNumberUtil : NSObject
|
||||
|
||||
@property (nonatomic, retain) NBPhoneNumberUtil *nbPhoneNumberUtil;
|
||||
|
||||
+ (BOOL)name:(NSString *)nameString matchesQuery:(NSString *)queryString;
|
||||
|
||||
+ (NSString *)callingCodeFromCountryCode:(NSString *)countryCode;
|
||||
+ (NSString *)countryNameFromCountryCode:(NSString *)countryCode;
|
||||
+ (NSArray *)countryCodesForSearchTerm:(NSString *)searchTerm;
|
||||
|
||||
// Returns a list of country codes for a calling code in descending
|
||||
// order of population.
|
||||
- (NSArray *)countryCodesFromCallingCode:(NSString *)callingCode;
|
||||
// Returns the most likely country code for a calling code based on population.
|
||||
- (NSString *)probableCountryCodeForCallingCode:(NSString *)callingCode;
|
||||
|
||||
+ (NSUInteger)translateCursorPosition:(NSUInteger)offset
|
||||
from:(NSString *)source
|
||||
to:(NSString *)target
|
||||
stickingRightward:(bool)preferHigh;
|
||||
|
||||
+ (NSString *)examplePhoneNumberForCountryCode:(NSString *)countryCode;
|
||||
|
||||
+ (instancetype)sharedUtil;
|
||||
|
||||
- (NBPhoneNumber *)parse:(NSString *)numberToParse defaultRegion:(NSString *)defaultRegion error:(NSError **)error;
|
||||
- (NSString *)format:(NBPhoneNumber *)phoneNumber
|
||||
numberFormat:(NBEPhoneNumberFormat)numberFormat
|
||||
error:(NSError **)error;
|
||||
|
||||
@end
|
||||
@ -0,0 +1,601 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "PhoneNumberUtil.h"
|
||||
#import "ContactsManagerProtocol.h"
|
||||
#import "FunctionalUtil.h"
|
||||
#import "Util.h"
|
||||
#import <libPhoneNumber-iOS/NBPhoneNumber.h>
|
||||
|
||||
@interface PhoneNumberUtil ()
|
||||
|
||||
@property (nonatomic, readonly) NSMutableDictionary *countryCodesFromCallingCodeCache;
|
||||
@property (nonatomic, readonly) NSCache *parsedPhoneNumberCache;
|
||||
|
||||
@end
|
||||
|
||||
#pragma mark -
|
||||
|
||||
@implementation PhoneNumberUtil
|
||||
|
||||
+ (instancetype)sharedUtil {
|
||||
static dispatch_once_t onceToken;
|
||||
static id sharedInstance = nil;
|
||||
dispatch_once(&onceToken, ^{
|
||||
sharedInstance = [self.class new];
|
||||
});
|
||||
return sharedInstance;
|
||||
}
|
||||
|
||||
- (instancetype)init {
|
||||
self = [super init];
|
||||
|
||||
if (self) {
|
||||
_nbPhoneNumberUtil = [[NBPhoneNumberUtil alloc] init];
|
||||
_countryCodesFromCallingCodeCache = [NSMutableDictionary new];
|
||||
_parsedPhoneNumberCache = [NSCache new];
|
||||
|
||||
OWSSingletonAssert();
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (nullable NBPhoneNumber *)parse:(NSString *)numberToParse
|
||||
defaultRegion:(NSString *)defaultRegion
|
||||
error:(NSError **)error
|
||||
{
|
||||
NSString *hashKey = [NSString stringWithFormat:@"numberToParse:%@defaultRegion:%@", numberToParse, defaultRegion];
|
||||
|
||||
NBPhoneNumber *result = [self.parsedPhoneNumberCache objectForKey:hashKey];
|
||||
|
||||
if (!result) {
|
||||
result = [self.nbPhoneNumberUtil parse:numberToParse defaultRegion:defaultRegion error:error];
|
||||
if (error && *error) {
|
||||
OWSAssert(!result);
|
||||
return nil;
|
||||
}
|
||||
|
||||
OWSAssert(result);
|
||||
|
||||
if (result) {
|
||||
[self.parsedPhoneNumberCache setObject:result forKey:hashKey];
|
||||
} else {
|
||||
[self.parsedPhoneNumberCache setObject:[NSNull null] forKey:hashKey];
|
||||
}
|
||||
}
|
||||
|
||||
if ([result class] == [NSNull class]) {
|
||||
return nil;
|
||||
} else {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
- (NSString *)format:(NBPhoneNumber *)phoneNumber
|
||||
numberFormat:(NBEPhoneNumberFormat)numberFormat
|
||||
error:(NSError **)error
|
||||
{
|
||||
return [self.nbPhoneNumberUtil format:phoneNumber numberFormat:numberFormat error:error];
|
||||
}
|
||||
|
||||
// country code -> country name
|
||||
+ (NSString *)countryNameFromCountryCode:(NSString *)countryCode {
|
||||
NSDictionary *countryCodeComponent = @{NSLocaleCountryCode : countryCode};
|
||||
NSString *identifier = [NSLocale localeIdentifierFromComponents:countryCodeComponent];
|
||||
NSString *country = [NSLocale.currentLocale displayNameForKey:NSLocaleIdentifier value:identifier];
|
||||
if (country.length < 1) {
|
||||
country = [NSLocale.systemLocale displayNameForKey:NSLocaleIdentifier value:identifier];
|
||||
}
|
||||
return country;
|
||||
}
|
||||
|
||||
// country code -> calling code
|
||||
+ (NSString *)callingCodeFromCountryCode:(NSString *)countryCode
|
||||
{
|
||||
if ([countryCode isEqualToString:@"AQ"]) {
|
||||
// Antarctica
|
||||
return @"+672";
|
||||
} else if ([countryCode isEqualToString:@"BV"]) {
|
||||
// Bouvet Island
|
||||
return @"+55";
|
||||
} else if ([countryCode isEqualToString:@"IC"]) {
|
||||
// Canary Islands
|
||||
return @"+34";
|
||||
} else if ([countryCode isEqualToString:@"EA"]) {
|
||||
// Ceuta & Melilla
|
||||
return @"+34";
|
||||
} else if ([countryCode isEqualToString:@"CP"]) {
|
||||
// Clipperton Island
|
||||
//
|
||||
// This country code should be filtered - it does not appear to have a calling code.
|
||||
return nil;
|
||||
} else if ([countryCode isEqualToString:@"DG"]) {
|
||||
// Diego Garcia
|
||||
return @"+246";
|
||||
} else if ([countryCode isEqualToString:@"TF"]) {
|
||||
// French Southern Territories
|
||||
return @"+262";
|
||||
} else if ([countryCode isEqualToString:@"HM"]) {
|
||||
// Heard & McDonald Islands
|
||||
return @"+672";
|
||||
} else if ([countryCode isEqualToString:@"XK"]) {
|
||||
// Kosovo
|
||||
return @"+383";
|
||||
} else if ([countryCode isEqualToString:@"PN"]) {
|
||||
// Pitcairn Islands
|
||||
return @"+64";
|
||||
} else if ([countryCode isEqualToString:@"GS"]) {
|
||||
// So. Georgia & So. Sandwich Isl.
|
||||
return @"+500";
|
||||
} else if ([countryCode isEqualToString:@"UM"]) {
|
||||
// U.S. Outlying Islands
|
||||
return @"+1";
|
||||
}
|
||||
|
||||
NSString *callingCode = [NSString stringWithFormat:@"%@%@",
|
||||
COUNTRY_CODE_PREFIX,
|
||||
[[[self sharedUtil] nbPhoneNumberUtil] getCountryCodeForRegion:countryCode]];
|
||||
return callingCode;
|
||||
}
|
||||
|
||||
- (NSDictionary<NSString *, NSNumber *> *)countryCodeToPopulationMap
|
||||
{
|
||||
static dispatch_once_t onceToken;
|
||||
static NSDictionary<NSString *, NSNumber *> *instance = nil;
|
||||
dispatch_once(&onceToken, ^{
|
||||
instance = @{
|
||||
@"AD" : @(84000),
|
||||
@"AE" : @(4975593),
|
||||
@"AF" : @(29121286),
|
||||
@"AG" : @(86754),
|
||||
@"AI" : @(13254),
|
||||
@"AL" : @(2986952),
|
||||
@"AM" : @(2968000),
|
||||
@"AN" : @(300000),
|
||||
@"AO" : @(13068161),
|
||||
@"AQ" : @(0),
|
||||
@"AR" : @(41343201),
|
||||
@"AS" : @(57881),
|
||||
@"AT" : @(8205000),
|
||||
@"AU" : @(21515754),
|
||||
@"AW" : @(71566),
|
||||
@"AX" : @(26711),
|
||||
@"AZ" : @(8303512),
|
||||
@"BA" : @(4590000),
|
||||
@"BB" : @(285653),
|
||||
@"BD" : @(156118464),
|
||||
@"BE" : @(10403000),
|
||||
@"BF" : @(16241811),
|
||||
@"BG" : @(7148785),
|
||||
@"BH" : @(738004),
|
||||
@"BI" : @(9863117),
|
||||
@"BJ" : @(9056010),
|
||||
@"BL" : @(8450),
|
||||
@"BM" : @(65365),
|
||||
@"BN" : @(395027),
|
||||
@"BO" : @(9947418),
|
||||
@"BQ" : @(18012),
|
||||
@"BR" : @(201103330),
|
||||
@"BS" : @(301790),
|
||||
@"BT" : @(699847),
|
||||
@"BV" : @(0),
|
||||
@"BW" : @(2029307),
|
||||
@"BY" : @(9685000),
|
||||
@"BZ" : @(314522),
|
||||
@"CA" : @(33679000),
|
||||
@"CC" : @(628),
|
||||
@"CD" : @(70916439),
|
||||
@"CF" : @(4844927),
|
||||
@"CG" : @(3039126),
|
||||
@"CH" : @(7581000),
|
||||
@"CI" : @(21058798),
|
||||
@"CK" : @(21388),
|
||||
@"CL" : @(16746491),
|
||||
@"CM" : @(19294149),
|
||||
@"CN" : @(1330044000),
|
||||
@"CO" : @(47790000),
|
||||
@"CR" : @(4516220),
|
||||
@"CS" : @(10829175),
|
||||
@"CU" : @(11423000),
|
||||
@"CV" : @(508659),
|
||||
@"CW" : @(141766),
|
||||
@"CX" : @(1500),
|
||||
@"CY" : @(1102677),
|
||||
@"CZ" : @(10476000),
|
||||
@"DE" : @(81802257),
|
||||
@"DJ" : @(740528),
|
||||
@"DK" : @(5484000),
|
||||
@"DM" : @(72813),
|
||||
@"DO" : @(9823821),
|
||||
@"DZ" : @(34586184),
|
||||
@"EC" : @(14790608),
|
||||
@"EE" : @(1291170),
|
||||
@"EG" : @(80471869),
|
||||
@"EH" : @(273008),
|
||||
@"ER" : @(5792984),
|
||||
@"ES" : @(46505963),
|
||||
@"ET" : @(88013491),
|
||||
@"FI" : @(5244000),
|
||||
@"FJ" : @(875983),
|
||||
@"FK" : @(2638),
|
||||
@"FM" : @(107708),
|
||||
@"FO" : @(48228),
|
||||
@"FR" : @(64768389),
|
||||
@"GA" : @(1545255),
|
||||
@"GB" : @(62348447),
|
||||
@"GD" : @(107818),
|
||||
@"GE" : @(4630000),
|
||||
@"GF" : @(195506),
|
||||
@"GG" : @(65228),
|
||||
@"GH" : @(24339838),
|
||||
@"GI" : @(27884),
|
||||
@"GL" : @(56375),
|
||||
@"GM" : @(1593256),
|
||||
@"GN" : @(10324025),
|
||||
@"GP" : @(443000),
|
||||
@"GQ" : @(1014999),
|
||||
@"GR" : @(11000000),
|
||||
@"GS" : @(30),
|
||||
@"GT" : @(13550440),
|
||||
@"GU" : @(159358),
|
||||
@"GW" : @(1565126),
|
||||
@"GY" : @(748486),
|
||||
@"HK" : @(6898686),
|
||||
@"HM" : @(0),
|
||||
@"HN" : @(7989415),
|
||||
@"HR" : @(4284889),
|
||||
@"HT" : @(9648924),
|
||||
@"HU" : @(9982000),
|
||||
@"ID" : @(242968342),
|
||||
@"IE" : @(4622917),
|
||||
@"IL" : @(7353985),
|
||||
@"IM" : @(75049),
|
||||
@"IN" : @(1173108018),
|
||||
@"IO" : @(4000),
|
||||
@"IQ" : @(29671605),
|
||||
@"IR" : @(76923300),
|
||||
@"IS" : @(308910),
|
||||
@"IT" : @(60340328),
|
||||
@"JE" : @(90812),
|
||||
@"JM" : @(2847232),
|
||||
@"JO" : @(6407085),
|
||||
@"JP" : @(127288000),
|
||||
@"KE" : @(40046566),
|
||||
@"KG" : @(5776500),
|
||||
@"KH" : @(14453680),
|
||||
@"KI" : @(92533),
|
||||
@"KM" : @(773407),
|
||||
@"KN" : @(51134),
|
||||
@"KP" : @(22912177),
|
||||
@"KR" : @(48422644),
|
||||
@"KW" : @(2789132),
|
||||
@"KY" : @(44270),
|
||||
@"KZ" : @(15340000),
|
||||
@"LA" : @(6368162),
|
||||
@"LB" : @(4125247),
|
||||
@"LC" : @(160922),
|
||||
@"LI" : @(35000),
|
||||
@"LK" : @(21513990),
|
||||
@"LR" : @(3685076),
|
||||
@"LS" : @(1919552),
|
||||
@"LT" : @(2944459),
|
||||
@"LU" : @(497538),
|
||||
@"LV" : @(2217969),
|
||||
@"LY" : @(6461454),
|
||||
@"MA" : @(33848242),
|
||||
@"MC" : @(32965),
|
||||
@"MD" : @(4324000),
|
||||
@"ME" : @(666730),
|
||||
@"MF" : @(35925),
|
||||
@"MG" : @(21281844),
|
||||
@"MH" : @(65859),
|
||||
@"MK" : @(2062294),
|
||||
@"ML" : @(13796354),
|
||||
@"MM" : @(53414374),
|
||||
@"MN" : @(3086918),
|
||||
@"MO" : @(449198),
|
||||
@"MP" : @(53883),
|
||||
@"MQ" : @(432900),
|
||||
@"MR" : @(3205060),
|
||||
@"MS" : @(9341),
|
||||
@"MT" : @(403000),
|
||||
@"MU" : @(1294104),
|
||||
@"MV" : @(395650),
|
||||
@"MW" : @(15447500),
|
||||
@"MX" : @(112468855),
|
||||
@"MY" : @(28274729),
|
||||
@"MZ" : @(22061451),
|
||||
@"NA" : @(2128471),
|
||||
@"NC" : @(216494),
|
||||
@"NE" : @(15878271),
|
||||
@"NF" : @(1828),
|
||||
@"NG" : @(154000000),
|
||||
@"NI" : @(5995928),
|
||||
@"NL" : @(16645000),
|
||||
@"NO" : @(5009150),
|
||||
@"NP" : @(28951852),
|
||||
@"NR" : @(10065),
|
||||
@"NU" : @(2166),
|
||||
@"NZ" : @(4252277),
|
||||
@"OM" : @(2967717),
|
||||
@"PA" : @(3410676),
|
||||
@"PE" : @(29907003),
|
||||
@"PF" : @(270485),
|
||||
@"PG" : @(6064515),
|
||||
@"PH" : @(99900177),
|
||||
@"PK" : @(184404791),
|
||||
@"PL" : @(38500000),
|
||||
@"PM" : @(7012),
|
||||
@"PN" : @(46),
|
||||
@"PR" : @(3916632),
|
||||
@"PS" : @(3800000),
|
||||
@"PT" : @(10676000),
|
||||
@"PW" : @(19907),
|
||||
@"PY" : @(6375830),
|
||||
@"QA" : @(840926),
|
||||
@"RE" : @(776948),
|
||||
@"RO" : @(21959278),
|
||||
@"RS" : @(7344847),
|
||||
@"RU" : @(140702000),
|
||||
@"RW" : @(11055976),
|
||||
@"SA" : @(25731776),
|
||||
@"SB" : @(559198),
|
||||
@"SC" : @(88340),
|
||||
@"SD" : @(35000000),
|
||||
@"SE" : @(9828655),
|
||||
@"SG" : @(4701069),
|
||||
@"SH" : @(7460),
|
||||
@"SI" : @(2007000),
|
||||
@"SJ" : @(2550),
|
||||
@"SK" : @(5455000),
|
||||
@"SL" : @(5245695),
|
||||
@"SM" : @(31477),
|
||||
@"SN" : @(12323252),
|
||||
@"SO" : @(10112453),
|
||||
@"SR" : @(492829),
|
||||
@"SS" : @(8260490),
|
||||
@"ST" : @(175808),
|
||||
@"SV" : @(6052064),
|
||||
@"SX" : @(37429),
|
||||
@"SY" : @(22198110),
|
||||
@"SZ" : @(1354051),
|
||||
@"TC" : @(20556),
|
||||
@"TD" : @(10543464),
|
||||
@"TF" : @(140),
|
||||
@"TG" : @(6587239),
|
||||
@"TH" : @(67089500),
|
||||
@"TJ" : @(7487489),
|
||||
@"TK" : @(1466),
|
||||
@"TL" : @(1154625),
|
||||
@"TM" : @(4940916),
|
||||
@"TN" : @(10589025),
|
||||
@"TO" : @(122580),
|
||||
@"TR" : @(77804122),
|
||||
@"TT" : @(1328019),
|
||||
@"TV" : @(10472),
|
||||
@"TW" : @(22894384),
|
||||
@"TZ" : @(41892895),
|
||||
@"UA" : @(45415596),
|
||||
@"UG" : @(33398682),
|
||||
@"UM" : @(0),
|
||||
@"US" : @(310232863),
|
||||
@"UY" : @(3477000),
|
||||
@"UZ" : @(27865738),
|
||||
@"VA" : @(921),
|
||||
@"VC" : @(104217),
|
||||
@"VE" : @(27223228),
|
||||
@"VG" : @(21730),
|
||||
@"VI" : @(108708),
|
||||
@"VN" : @(89571130),
|
||||
@"VU" : @(221552),
|
||||
@"WF" : @(16025),
|
||||
@"WS" : @(192001),
|
||||
@"XK" : @(1800000),
|
||||
@"YE" : @(23495361),
|
||||
@"YT" : @(159042),
|
||||
@"ZA" : @(49000000),
|
||||
@"ZM" : @(13460305),
|
||||
@"ZW" : @(13061000),
|
||||
};
|
||||
});
|
||||
return instance;
|
||||
}
|
||||
|
||||
- (NSArray<NSString *> *)countryCodesSortedByPopulationDescending
|
||||
{
|
||||
NSDictionary<NSString *, NSNumber *> *countryCodeToPopulationMap = [self countryCodeToPopulationMap];
|
||||
NSArray<NSString *> *result = [NSLocale.ISOCountryCodes
|
||||
sortedArrayUsingComparator:^NSComparisonResult(NSString *_Nonnull left, NSString *_Nonnull right) {
|
||||
int leftPopulation = [countryCodeToPopulationMap[left] intValue];
|
||||
int rightPopulation = [countryCodeToPopulationMap[right] intValue];
|
||||
// Invert the values for a descending sort.
|
||||
return [@(-leftPopulation) compare:@(-rightPopulation)];
|
||||
}];
|
||||
return result;
|
||||
}
|
||||
|
||||
- (NSArray<NSString *> *)countryCodesFromCallingCode:(NSString *)callingCode
|
||||
{
|
||||
@synchronized(self)
|
||||
{
|
||||
OWSAssert(callingCode.length > 0);
|
||||
|
||||
NSArray *result = self.countryCodesFromCallingCodeCache[callingCode];
|
||||
if (!result) {
|
||||
NSMutableArray *countryCodes = [NSMutableArray new];
|
||||
for (NSString *countryCode in [self countryCodesSortedByPopulationDescending]) {
|
||||
NSString *callingCodeForCountryCode = [PhoneNumberUtil callingCodeFromCountryCode:countryCode];
|
||||
if ([callingCode isEqualToString:callingCodeForCountryCode]) {
|
||||
[countryCodes addObject:countryCode];
|
||||
}
|
||||
}
|
||||
result = [countryCodes copy];
|
||||
self.countryCodesFromCallingCodeCache[callingCode] = result;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
- (NSString *)probableCountryCodeForCallingCode:(NSString *)callingCode
|
||||
{
|
||||
OWSAssert(callingCode.length > 0);
|
||||
|
||||
NSArray<NSString *> *countryCodes = [self countryCodesFromCallingCode:callingCode];
|
||||
return (countryCodes.count > 0 ? countryCodes[0] : nil);
|
||||
}
|
||||
|
||||
+ (BOOL)name:(NSString *)nameString matchesQuery:(NSString *)queryString {
|
||||
NSCharacterSet *whitespaceSet = NSCharacterSet.whitespaceCharacterSet;
|
||||
NSArray *queryStrings = [queryString componentsSeparatedByCharactersInSet:whitespaceSet];
|
||||
NSArray *nameStrings = [nameString componentsSeparatedByCharactersInSet:whitespaceSet];
|
||||
|
||||
return [queryStrings all:^int(NSString *query) {
|
||||
if (query.length == 0)
|
||||
return YES;
|
||||
return [nameStrings any:^int(NSString *nameWord) {
|
||||
NSStringCompareOptions searchOpts = NSCaseInsensitiveSearch | NSAnchoredSearch;
|
||||
return [nameWord rangeOfString:query options:searchOpts].location != NSNotFound;
|
||||
}];
|
||||
}];
|
||||
}
|
||||
|
||||
// search term -> country codes
|
||||
+ (NSArray *)countryCodesForSearchTerm:(NSString *)searchTerm {
|
||||
searchTerm = [searchTerm stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
|
||||
|
||||
NSArray *countryCodes = NSLocale.ISOCountryCodes;
|
||||
|
||||
countryCodes = [countryCodes filter:^int(NSString *countryCode) {
|
||||
NSString *countryName = [self countryNameFromCountryCode:countryCode];
|
||||
NSString *callingCode = [self callingCodeFromCountryCode:countryCode];
|
||||
|
||||
if (countryName.length < 1 || callingCode.length < 1 || [callingCode isEqualToString:@"+0"]) {
|
||||
// Filter out countries without a valid calling code.
|
||||
return NO;
|
||||
}
|
||||
|
||||
if (searchTerm.length < 1) {
|
||||
return YES;
|
||||
}
|
||||
|
||||
if ([self name:countryName matchesQuery:searchTerm]) {
|
||||
return YES;
|
||||
}
|
||||
|
||||
if ([self name:countryCode matchesQuery:searchTerm]) {
|
||||
return YES;
|
||||
}
|
||||
|
||||
// We rely on the already internationalized string; as that is what
|
||||
// the user would see entered (i.e. with COUNTRY_CODE_PREFIX).
|
||||
|
||||
if ([callingCode containsString:searchTerm]) {
|
||||
return YES;
|
||||
}
|
||||
|
||||
return NO;
|
||||
}];
|
||||
|
||||
return [self sortedCountryCodesByName:countryCodes];
|
||||
}
|
||||
|
||||
+ (NSArray *)sortedCountryCodesByName:(NSArray *)countryCodesByISOCode {
|
||||
return [countryCodesByISOCode sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2) {
|
||||
return [[self countryNameFromCountryCode:obj1] caseInsensitiveCompare:[self countryNameFromCountryCode:obj2]];
|
||||
}];
|
||||
}
|
||||
|
||||
// black magic
|
||||
+ (NSUInteger)translateCursorPosition:(NSUInteger)offset
|
||||
from:(NSString *)source
|
||||
to:(NSString *)target
|
||||
stickingRightward:(bool)preferHigh {
|
||||
ows_require(source != nil);
|
||||
ows_require(target != nil);
|
||||
ows_require(offset <= source.length);
|
||||
|
||||
NSUInteger n = source.length;
|
||||
NSUInteger m = target.length;
|
||||
|
||||
int moves[n + 1][m + 1];
|
||||
{
|
||||
// Wagner-Fischer algorithm for computing edit distance, with a tweaks:
|
||||
// - Tracks best moves at each location, to allow reconstruction of edit path
|
||||
// - Does not allow substitutions
|
||||
// - Over-values digits relative to other characters, so they're "harder" to delete or insert
|
||||
const int DIGIT_VALUE = 10;
|
||||
NSUInteger scores[n + 1][m + 1];
|
||||
moves[0][0] = 0; // (match) move up and left
|
||||
scores[0][0] = 0;
|
||||
for (NSUInteger i = 1; i <= n; i++) {
|
||||
scores[i][0] = i;
|
||||
moves[i][0] = -1; // (deletion) move left
|
||||
}
|
||||
for (NSUInteger j = 1; j <= m; j++) {
|
||||
scores[0][j] = j;
|
||||
moves[0][j] = +1; // (insertion) move up
|
||||
}
|
||||
|
||||
NSCharacterSet *digits = NSCharacterSet.decimalDigitCharacterSet;
|
||||
for (NSUInteger i = 1; i <= n; i++) {
|
||||
unichar c1 = [source characterAtIndex:i - 1];
|
||||
bool isDigit1 = [digits characterIsMember:c1];
|
||||
for (NSUInteger j = 1; j <= m; j++) {
|
||||
unichar c2 = [target characterAtIndex:j - 1];
|
||||
bool isDigit2 = [digits characterIsMember:c2];
|
||||
if (c1 == c2) {
|
||||
scores[i][j] = scores[i - 1][j - 1];
|
||||
moves[i][j] = 0; // move up-and-left
|
||||
} else {
|
||||
NSUInteger del = scores[i - 1][j] + (isDigit1 ? DIGIT_VALUE : 1);
|
||||
NSUInteger ins = scores[i][j - 1] + (isDigit2 ? DIGIT_VALUE : 1);
|
||||
bool isDel = del < ins;
|
||||
scores[i][j] = isDel ? del : ins;
|
||||
moves[i][j] = isDel ? -1 : +1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Backtrack to find desired corresponding offset
|
||||
for (NSUInteger i = n, j = m;; i -= 1) {
|
||||
if (i == offset && preferHigh)
|
||||
return j; // early exit
|
||||
while (moves[i][j] == +1)
|
||||
j -= 1; // zip upward
|
||||
if (i == offset)
|
||||
return j; // late exit
|
||||
if (moves[i][j] == 0)
|
||||
j -= 1;
|
||||
}
|
||||
}
|
||||
|
||||
+ (NSString *)examplePhoneNumberForCountryCode:(NSString *)countryCode
|
||||
{
|
||||
// Signal users are very likely using mobile devices, so prefer that kind of example.
|
||||
NSError *error;
|
||||
NBPhoneNumber *nbPhoneNumber =
|
||||
[[[self sharedUtil] nbPhoneNumberUtil] getExampleNumberForType:countryCode
|
||||
type:NBEPhoneNumberTypeMOBILE
|
||||
error:&error];
|
||||
OWSAssert(!error);
|
||||
if (!nbPhoneNumber) {
|
||||
// For countries that with similar mobile and land lines, use "line or mobile"
|
||||
// examples.
|
||||
nbPhoneNumber =
|
||||
[[[self sharedUtil] nbPhoneNumberUtil] getExampleNumberForType:countryCode
|
||||
type:NBEPhoneNumberTypeFIXED_LINE_OR_MOBILE
|
||||
error:&error];
|
||||
OWSAssert(!error);
|
||||
}
|
||||
NSString *result = (nbPhoneNumber ? [[[self sharedUtil] nbPhoneNumberUtil] format:nbPhoneNumber
|
||||
numberFormat:NBEPhoneNumberFormatE164
|
||||
error:&error]
|
||||
: nil);
|
||||
OWSAssert(!error);
|
||||
return result;
|
||||
}
|
||||
|
||||
@end
|
||||
@ -0,0 +1,51 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class Contact;
|
||||
@class SignalRecipient;
|
||||
@class YapDatabaseReadTransaction;
|
||||
|
||||
// This class represents a single valid Signal account.
|
||||
//
|
||||
// * Contacts with multiple signal accounts will correspond to
|
||||
// multiple instances of SignalAccount.
|
||||
// * For non-contacts, the contact property will be nil.
|
||||
//
|
||||
// New instances of SignalAccount for active accounts are
|
||||
// created every time we do a contacts intersection (e.g.
|
||||
// in response to a change to the device contacts).
|
||||
@interface SignalAccount : NSObject
|
||||
|
||||
// An E164 value identifying the signal account.
|
||||
//
|
||||
// This is the key property of this class and it
|
||||
// will always be non-null.
|
||||
@property (nonatomic, readonly) NSString *recipientId;
|
||||
|
||||
// This property is optional and will not be set for
|
||||
// non-contact account.
|
||||
@property (nonatomic, nullable) Contact *contact;
|
||||
|
||||
@property (nonatomic) BOOL hasMultipleAccountContact;
|
||||
|
||||
// For contacts with more than one signal account,
|
||||
// this is a label for the account.
|
||||
@property (nonatomic) NSString *multipleAccountLabelText;
|
||||
|
||||
- (instancetype)init NS_UNAVAILABLE;
|
||||
|
||||
- (instancetype)initWithSignalRecipient:(SignalRecipient *)signalRecipient;
|
||||
|
||||
- (instancetype)initWithRecipientId:(NSString *)recipientId;
|
||||
|
||||
// In most cases this should be non-null. This should only
|
||||
// be null in the case where the SignalRecipient was
|
||||
// deleted before this property was accessed.
|
||||
- (nullable SignalRecipient *)signalRecipientWithTransaction:(YapDatabaseReadTransaction *)transaction;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,51 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "SignalAccount.h"
|
||||
#import "SignalRecipient.h"
|
||||
#import "TSStorageManager.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface SignalAccount ()
|
||||
|
||||
@property (nonatomic) NSString *recipientId;
|
||||
|
||||
@end
|
||||
|
||||
#pragma mark -
|
||||
|
||||
@implementation SignalAccount
|
||||
|
||||
- (instancetype)initWithSignalRecipient:(SignalRecipient *)signalRecipient
|
||||
{
|
||||
if (self = [super init]) {
|
||||
OWSAssert(signalRecipient);
|
||||
|
||||
_recipientId = signalRecipient.uniqueId;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (instancetype)initWithRecipientId:(NSString *)recipientId
|
||||
{
|
||||
if (self = [super init]) {
|
||||
OWSAssert(recipientId.length > 0);
|
||||
|
||||
_recipientId = recipientId;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (nullable SignalRecipient *)signalRecipientWithTransaction:(YapDatabaseReadTransaction *)transaction
|
||||
{
|
||||
OWSAssert([NSThread isMainThread]);
|
||||
OWSAssert(transaction);
|
||||
|
||||
return [SignalRecipient recipientWithTextSecureIdentifier:self.recipientId withTransaction:transaction];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,36 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "TSYapDatabaseObject.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface SignalRecipient : TSYapDatabaseObject
|
||||
|
||||
- (instancetype)initWithTextSecureIdentifier:(NSString *)textSecureIdentifier
|
||||
relay:(nullable NSString *)relay;
|
||||
|
||||
+ (instancetype)selfRecipient;
|
||||
+ (nullable instancetype)recipientWithTextSecureIdentifier:(NSString *)textSecureIdentifier;
|
||||
+ (nullable instancetype)recipientWithTextSecureIdentifier:(NSString *)textSecureIdentifier
|
||||
withTransaction:(YapDatabaseReadTransaction *)transaction;
|
||||
|
||||
- (void)addDevices:(NSSet *)set;
|
||||
|
||||
- (void)removeDevices:(NSSet *)set;
|
||||
|
||||
@property (nonatomic, nullable) NSString *relay;
|
||||
@property (nonatomic, retain) NSMutableOrderedSet *devices;
|
||||
|
||||
- (BOOL)supportsVoice;
|
||||
// This property indicates support for both WebRTC audio and video calls.
|
||||
- (BOOL)supportsWebRTC;
|
||||
|
||||
- (NSString *)recipientId;
|
||||
|
||||
- (NSComparisonResult)compare:(SignalRecipient *)other;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,98 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "SignalRecipient.h"
|
||||
#import "OWSIdentityManager.h"
|
||||
#import "TSStorageHeaders.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@implementation SignalRecipient
|
||||
|
||||
+ (NSString *)collection {
|
||||
return @"SignalRecipient";
|
||||
}
|
||||
|
||||
- (instancetype)initWithTextSecureIdentifier:(NSString *)textSecureIdentifier
|
||||
relay:(nullable NSString *)relay
|
||||
{
|
||||
self = [super initWithUniqueId:textSecureIdentifier];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
_devices = [NSMutableOrderedSet orderedSetWithObject:[NSNumber numberWithInt:1]];
|
||||
_relay = [relay isEqualToString:@""] ? nil : relay;
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
+ (nullable instancetype)recipientWithTextSecureIdentifier:(NSString *)textSecureIdentifier
|
||||
withTransaction:(YapDatabaseReadTransaction *)transaction
|
||||
{
|
||||
return [self fetchObjectWithUniqueID:textSecureIdentifier transaction:transaction];
|
||||
}
|
||||
|
||||
+ (nullable instancetype)recipientWithTextSecureIdentifier:(NSString *)textSecureIdentifier
|
||||
{
|
||||
__block SignalRecipient *recipient;
|
||||
[self.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
|
||||
recipient = [self recipientWithTextSecureIdentifier:textSecureIdentifier withTransaction:transaction];
|
||||
}];
|
||||
return recipient;
|
||||
}
|
||||
|
||||
+ (instancetype)selfRecipient
|
||||
{
|
||||
SignalRecipient *myself = [self recipientWithTextSecureIdentifier:[TSStorageManager localNumber]];
|
||||
if (!myself) {
|
||||
myself = [[self alloc] initWithTextSecureIdentifier:[TSStorageManager localNumber]
|
||||
relay:nil];
|
||||
}
|
||||
return myself;
|
||||
}
|
||||
|
||||
- (NSMutableOrderedSet *)devices {
|
||||
return [_devices copy];
|
||||
}
|
||||
|
||||
- (void)addDevices:(NSSet *)set {
|
||||
[self checkDevices];
|
||||
[_devices unionSet:set];
|
||||
}
|
||||
|
||||
- (void)removeDevices:(NSSet *)set {
|
||||
[self checkDevices];
|
||||
[_devices minusSet:set];
|
||||
}
|
||||
|
||||
- (void)checkDevices {
|
||||
if (_devices == nil || ![_devices isKindOfClass:[NSMutableOrderedSet class]]) {
|
||||
_devices = [NSMutableOrderedSet orderedSetWithObject:[NSNumber numberWithInt:1]];
|
||||
}
|
||||
}
|
||||
|
||||
- (BOOL)supportsVoice
|
||||
{
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (BOOL)supportsWebRTC
|
||||
{
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (NSString *)recipientId
|
||||
{
|
||||
return self.uniqueId;
|
||||
}
|
||||
|
||||
- (NSComparisonResult)compare:(SignalRecipient *)other
|
||||
{
|
||||
return [self.recipientId compare:other.recipientId];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,181 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "TSYapDatabaseObject.h"
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class TSInteraction;
|
||||
@class TSInvalidIdentityKeyReceivingErrorMessage;
|
||||
|
||||
/**
|
||||
* TSThread is the superclass of TSContactThread and TSGroupThread
|
||||
*/
|
||||
|
||||
@interface TSThread : TSYapDatabaseObject
|
||||
|
||||
/**
|
||||
* Whether the object is a group thread or not.
|
||||
*
|
||||
* @return YES if is a group thread, NO otherwise.
|
||||
*/
|
||||
- (BOOL)isGroupThread;
|
||||
|
||||
/**
|
||||
* Returns the name of the thread.
|
||||
*
|
||||
* @return The name of the thread.
|
||||
*/
|
||||
- (NSString *)name;
|
||||
|
||||
/**
|
||||
* @returns
|
||||
* Signal Id (e164) of the contact if it's a contact thread.
|
||||
*/
|
||||
- (nullable NSString *)contactIdentifier;
|
||||
|
||||
/**
|
||||
* @returns recipientId for each recipient in the thread
|
||||
*/
|
||||
@property (nonatomic, readonly) NSArray<NSString *> *recipientIdentifiers;
|
||||
|
||||
#if TARGET_OS_IOS
|
||||
|
||||
/**
|
||||
* Returns the image representing the thread. Nil if not available.
|
||||
*
|
||||
* @return UIImage of the thread, or nil.
|
||||
*/
|
||||
- (nullable UIImage *)image;
|
||||
#endif
|
||||
|
||||
#pragma mark Interactions
|
||||
|
||||
/**
|
||||
* @return The number of interactions in this thread.
|
||||
*/
|
||||
- (NSUInteger)numberOfInteractions;
|
||||
|
||||
/**
|
||||
* Get all messages in the thread we weren't able to decrypt
|
||||
*/
|
||||
- (NSArray<TSInvalidIdentityKeyReceivingErrorMessage *> *)receivedMessagesForInvalidKey:(NSData *)key;
|
||||
|
||||
/**
|
||||
* Returns whether or not the thread has unread messages.
|
||||
*
|
||||
* @return YES if it has unread TSIncomingMessages, NO otherwise.
|
||||
*/
|
||||
- (BOOL)hasUnreadMessages;
|
||||
|
||||
- (BOOL)hasSafetyNumbers;
|
||||
|
||||
- (void)markAllAsReadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction;
|
||||
|
||||
/**
|
||||
* Returns the latest date of a message in the thread or the thread creation date if there are no messages in that
|
||||
*thread.
|
||||
*
|
||||
* @return The date of the last message or thread creation date.
|
||||
*/
|
||||
- (NSDate *)lastMessageDate;
|
||||
|
||||
/**
|
||||
* Returns the string that will be displayed typically in a conversations view as a preview of the last message
|
||||
*received in this thread.
|
||||
*
|
||||
* @return Thread preview string.
|
||||
*/
|
||||
- (NSString *)lastMessageLabel;
|
||||
|
||||
/**
|
||||
* Updates the thread's caches of the latest interaction.
|
||||
*
|
||||
* @param lastMessage Latest Interaction to take into consideration.
|
||||
* @param transaction Database transaction.
|
||||
*/
|
||||
- (void)updateWithLastMessage:(TSInteraction *)lastMessage transaction:(YapDatabaseReadWriteTransaction *)transaction;
|
||||
|
||||
#pragma mark Archival
|
||||
|
||||
/**
|
||||
* Returns the last date at which a string was archived or nil if the thread was never archived or brought back to the
|
||||
*inbox.
|
||||
*
|
||||
* @return Last archival date.
|
||||
*/
|
||||
- (nullable NSDate *)archivalDate;
|
||||
|
||||
/**
|
||||
* Archives a thread with the current date.
|
||||
*
|
||||
* @param transaction Database transaction.
|
||||
*/
|
||||
- (void)archiveThreadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction;
|
||||
|
||||
/**
|
||||
* Archives a thread with the reference date. This is currently only used for migrating older data that has already
|
||||
* been archived.
|
||||
*
|
||||
* @param transaction Database transaction.
|
||||
* @param date Date at which the thread was archived.
|
||||
*/
|
||||
- (void)archiveThreadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction referenceDate:(NSDate *)date;
|
||||
|
||||
/**
|
||||
* Unarchives a thread that was archived previously.
|
||||
*
|
||||
* @param transaction Database transaction.
|
||||
*/
|
||||
- (void)unarchiveThreadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction;
|
||||
|
||||
#pragma mark Drafts
|
||||
|
||||
/**
|
||||
* Returns the last known draft for that thread. Always returns a string. Empty string if nil.
|
||||
*
|
||||
* @param transaction Database transaction.
|
||||
*
|
||||
* @return Last known draft for that thread.
|
||||
*/
|
||||
- (NSString *)currentDraftWithTransaction:(YapDatabaseReadTransaction *)transaction;
|
||||
|
||||
/**
|
||||
* Sets the draft of a thread. Typically called when leaving a conversation view.
|
||||
*
|
||||
* @param draftString Draft string to be saved.
|
||||
* @param transaction Database transaction.
|
||||
*/
|
||||
- (void)setDraft:(NSString *)draftString transaction:(YapDatabaseReadWriteTransaction *)transaction;
|
||||
|
||||
@property (atomic, readonly) BOOL isMuted;
|
||||
@property (atomic, readonly, nullable) NSDate *mutedUntilDate;
|
||||
|
||||
// This model may be updated from many threads. We don't want to save
|
||||
// our local copy (this instance) since it may be out of date. Instead, we
|
||||
// use these "updateWith..." methods to:
|
||||
//
|
||||
// a) Update a property of this instance.
|
||||
// b) Load an up-to-date instance of this model from from the data store.
|
||||
// c) Update and save that fresh instance.
|
||||
// d) If this instance hasn't yet been saved, save this local instance.
|
||||
//
|
||||
// After "updateWith...":
|
||||
//
|
||||
// a) An updated copy of this instance will always have been saved in the
|
||||
// data store.
|
||||
// b) The local property on this instance will always have been updated.
|
||||
// c) Other properties on this instance may be out of date.
|
||||
//
|
||||
// All mutable properties of this class have been made read-only to
|
||||
// prevent accidentally modifying them directly.
|
||||
//
|
||||
// This isn't a perfect arrangement, but in practice this will prevent
|
||||
// data loss and will resolve all known issues.
|
||||
- (void)updateWithMutedUntilDate:(NSDate *)mutedUntilDate;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,422 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "TSThread.h"
|
||||
#import "OWSReadTracking.h"
|
||||
#import "TSDatabaseView.h"
|
||||
#import "TSIncomingMessage.h"
|
||||
#import "TSInfoMessage.h"
|
||||
#import "TSInteraction.h"
|
||||
#import "TSInvalidIdentityKeyReceivingErrorMessage.h"
|
||||
#import "TSOutgoingMessage.h"
|
||||
#import "TSStorageManager.h"
|
||||
#import <YapDatabase/YapDatabase.h>
|
||||
#import <YapDatabase/YapDatabaseTransaction.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface TSThread ()
|
||||
|
||||
@property (nonatomic) NSDate *creationDate;
|
||||
@property (nonatomic, copy) NSDate *archivalDate;
|
||||
@property (nonatomic) NSDate *lastMessageDate;
|
||||
@property (nonatomic, copy) NSString *messageDraft;
|
||||
@property (atomic, nullable) NSDate *mutedUntilDate;
|
||||
|
||||
- (TSInteraction *)lastInteraction;
|
||||
|
||||
@end
|
||||
|
||||
@implementation TSThread
|
||||
|
||||
+ (NSString *)collection {
|
||||
return @"TSThread";
|
||||
}
|
||||
|
||||
- (instancetype)initWithUniqueId:(NSString *)uniqueId {
|
||||
self = [super initWithUniqueId:uniqueId];
|
||||
|
||||
if (self) {
|
||||
_archivalDate = nil;
|
||||
_lastMessageDate = nil;
|
||||
_creationDate = [NSDate date];
|
||||
_messageDraft = nil;
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)removeWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
|
||||
{
|
||||
[super removeWithTransaction:transaction];
|
||||
|
||||
__block NSMutableArray<NSString *> *interactionIds = [[NSMutableArray alloc] init];
|
||||
[self enumerateInteractionsWithTransaction:transaction
|
||||
usingBlock:^(TSInteraction *interaction, YapDatabaseReadTransaction *transaction) {
|
||||
[interactionIds addObject:interaction.uniqueId];
|
||||
}];
|
||||
|
||||
for (NSString *interactionId in interactionIds) {
|
||||
// This might seem redundant since we're fetching the interaction twice, once above to get the uniqueIds
|
||||
// and then again here. The issue is we can't remove them within the enumeration (you can't mutate an
|
||||
// enumeration source), but we also want to avoid instantiating an entire threads worth of Interaction objects
|
||||
// at once. This way we only have a threads worth of interactionId's.
|
||||
TSInteraction *interaction = [TSInteraction fetchObjectWithUniqueID:interactionId transaction:transaction];
|
||||
[interaction removeWithTransaction:transaction];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark To be subclassed.
|
||||
|
||||
- (BOOL)isGroupThread {
|
||||
NSAssert(false, @"An abstract method on TSThread was called.");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
// Override in ContactThread
|
||||
- (nullable NSString *)contactIdentifier
|
||||
{
|
||||
return nil;
|
||||
}
|
||||
|
||||
- (NSString *)name {
|
||||
NSAssert(FALSE, @"Should be implemented in subclasses");
|
||||
return nil;
|
||||
}
|
||||
|
||||
- (NSArray<NSString *> *)recipientIdentifiers
|
||||
{
|
||||
NSAssert(FALSE, @"Should be implemented in subclasses");
|
||||
return @[];
|
||||
}
|
||||
|
||||
- (nullable UIImage *)image
|
||||
{
|
||||
return nil;
|
||||
}
|
||||
|
||||
- (BOOL)hasSafetyNumbers
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
#pragma mark Interactions
|
||||
|
||||
/**
|
||||
* Iterate over this thread's interactions
|
||||
*/
|
||||
- (void)enumerateInteractionsWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
|
||||
usingBlock:(void (^)(TSInteraction *interaction,
|
||||
YapDatabaseReadTransaction *transaction))block
|
||||
{
|
||||
void (^interactionBlock)(NSString *, NSString *, id, id, NSUInteger, BOOL *) = ^void(NSString *_Nonnull collection,
|
||||
NSString *_Nonnull key,
|
||||
id _Nonnull object,
|
||||
id _Nonnull metadata,
|
||||
NSUInteger index,
|
||||
BOOL *_Nonnull stop) {
|
||||
|
||||
TSInteraction *interaction = object;
|
||||
block(interaction, transaction);
|
||||
};
|
||||
|
||||
YapDatabaseViewTransaction *interactionsByThread = [transaction ext:TSMessageDatabaseViewExtensionName];
|
||||
[interactionsByThread enumerateRowsInGroup:self.uniqueId usingBlock:interactionBlock];
|
||||
}
|
||||
|
||||
/**
|
||||
* Enumerates all the threads interactions. Note this will explode if you try to create a transaction in the block.
|
||||
* If you need a transaction, use the sister method: `enumerateInteractionsWithTransaction:usingBlock`
|
||||
*/
|
||||
- (void)enumerateInteractionsUsingBlock:(void (^)(TSInteraction *interaction))block
|
||||
{
|
||||
[self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
|
||||
[self enumerateInteractionsWithTransaction:transaction
|
||||
usingBlock:^(
|
||||
TSInteraction *interaction, YapDatabaseReadTransaction *transaction) {
|
||||
|
||||
block(interaction);
|
||||
}];
|
||||
}];
|
||||
}
|
||||
|
||||
/**
|
||||
* Useful for tests and debugging. In production use an enumeration method.
|
||||
*/
|
||||
- (NSArray<TSInteraction *> *)allInteractions
|
||||
{
|
||||
NSMutableArray<TSInteraction *> *interactions = [NSMutableArray new];
|
||||
[self enumerateInteractionsUsingBlock:^(TSInteraction *_Nonnull interaction) {
|
||||
[interactions addObject:interaction];
|
||||
}];
|
||||
|
||||
return [interactions copy];
|
||||
}
|
||||
|
||||
- (NSArray<TSInvalidIdentityKeyReceivingErrorMessage *> *)receivedMessagesForInvalidKey:(NSData *)key
|
||||
{
|
||||
NSMutableArray *errorMessages = [NSMutableArray new];
|
||||
[self enumerateInteractionsUsingBlock:^(TSInteraction *interaction) {
|
||||
if ([interaction isKindOfClass:[TSInvalidIdentityKeyReceivingErrorMessage class]]) {
|
||||
TSInvalidIdentityKeyReceivingErrorMessage *error = (TSInvalidIdentityKeyReceivingErrorMessage *)interaction;
|
||||
if ([[error newIdentityKey] isEqualToData:key]) {
|
||||
[errorMessages addObject:(TSInvalidIdentityKeyReceivingErrorMessage *)interaction];
|
||||
}
|
||||
}
|
||||
}];
|
||||
|
||||
return [errorMessages copy];
|
||||
}
|
||||
|
||||
- (NSUInteger)numberOfInteractions
|
||||
{
|
||||
__block NSUInteger count;
|
||||
[[self dbReadConnection] readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
|
||||
YapDatabaseViewTransaction *interactionsByThread = [transaction ext:TSMessageDatabaseViewExtensionName];
|
||||
count = [interactionsByThread numberOfItemsInGroup:self.uniqueId];
|
||||
}];
|
||||
return count;
|
||||
}
|
||||
|
||||
- (BOOL)hasUnreadMessages {
|
||||
TSInteraction *interaction = self.lastInteraction;
|
||||
BOOL hasUnread = NO;
|
||||
|
||||
if ([interaction isKindOfClass:[TSIncomingMessage class]]) {
|
||||
hasUnread = ![(TSIncomingMessage *)interaction wasRead];
|
||||
}
|
||||
|
||||
return hasUnread;
|
||||
}
|
||||
|
||||
- (NSArray<id<OWSReadTracking>> *)unseenMessagesWithTransaction:(YapDatabaseReadTransaction *)transaction
|
||||
{
|
||||
NSMutableArray<id<OWSReadTracking>> *messages = [NSMutableArray new];
|
||||
[[TSDatabaseView unseenDatabaseViewExtension:transaction]
|
||||
enumerateRowsInGroup:self.uniqueId
|
||||
usingBlock:^(
|
||||
NSString *collection, NSString *key, id object, id metadata, NSUInteger index, BOOL *stop) {
|
||||
|
||||
if (![object conformsToProtocol:@protocol(OWSReadTracking)]) {
|
||||
OWSFail(@"%@ Unexpected object in unseen messages: %@", self.tag, object);
|
||||
return;
|
||||
}
|
||||
[messages addObject:(id<OWSReadTracking>)object];
|
||||
}];
|
||||
|
||||
return [messages copy];
|
||||
}
|
||||
|
||||
- (NSArray<id<OWSReadTracking> > *)unreadMessagesWithTransaction:(YapDatabaseReadTransaction *)transaction
|
||||
{
|
||||
NSMutableArray<id<OWSReadTracking> > *messages = [NSMutableArray new];
|
||||
[[transaction ext:TSUnreadDatabaseViewExtensionName]
|
||||
enumerateRowsInGroup:self.uniqueId
|
||||
usingBlock:^(
|
||||
NSString *collection, NSString *key, id object, id metadata, NSUInteger index, BOOL *stop) {
|
||||
|
||||
if (![object conformsToProtocol:@protocol(OWSReadTracking)]) {
|
||||
DDLogError(@"%@ Unexpected object in unread messages: %@", self.tag, object);
|
||||
}
|
||||
[messages addObject:(id<OWSReadTracking>)object];
|
||||
}];
|
||||
|
||||
return [messages copy];
|
||||
}
|
||||
|
||||
- (void)markAllAsReadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
|
||||
{
|
||||
for (id<OWSReadTracking> message in [self unseenMessagesWithTransaction:transaction]) {
|
||||
[message markAsReadWithTransaction:transaction sendReadReceipt:YES updateExpiration:YES];
|
||||
}
|
||||
|
||||
// Just to be defensive, we'll also check for unread messages.
|
||||
OWSAssert([self unseenMessagesWithTransaction:transaction].count < 1);
|
||||
}
|
||||
|
||||
- (TSInteraction *) lastInteraction {
|
||||
__block TSInteraction *last;
|
||||
[TSStorageManager.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
|
||||
last = [[transaction ext:TSMessageDatabaseViewExtensionName] lastObjectInGroup:self.uniqueId];
|
||||
}];
|
||||
return last;
|
||||
}
|
||||
|
||||
- (TSInteraction *)lastInteractionForInbox
|
||||
{
|
||||
__block TSInteraction *last = nil;
|
||||
[TSStorageManager.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
|
||||
[[transaction ext:TSMessageDatabaseViewExtensionName]
|
||||
enumerateRowsInGroup:self.uniqueId
|
||||
withOptions:NSEnumerationReverse
|
||||
usingBlock:^(
|
||||
NSString *collection, NSString *key, id object, id metadata, NSUInteger index, BOOL *stop) {
|
||||
|
||||
OWSAssert([object isKindOfClass:[TSInteraction class]]);
|
||||
|
||||
TSInteraction *interaction = (TSInteraction *)object;
|
||||
|
||||
if ([TSThread shouldInteractionAppearInInbox:interaction]) {
|
||||
last = interaction;
|
||||
*stop = YES;
|
||||
}
|
||||
}];
|
||||
}];
|
||||
return last;
|
||||
}
|
||||
|
||||
- (NSDate *)lastMessageDate {
|
||||
if (_lastMessageDate) {
|
||||
return _lastMessageDate;
|
||||
} else {
|
||||
return _creationDate;
|
||||
}
|
||||
}
|
||||
|
||||
- (NSString *)lastMessageLabel {
|
||||
TSInteraction *interaction = self.lastInteractionForInbox;
|
||||
if (interaction == nil) {
|
||||
return @"";
|
||||
} else {
|
||||
return interaction.description;
|
||||
}
|
||||
}
|
||||
|
||||
// Returns YES IFF the interaction should show up in the inbox as the last message.
|
||||
+ (BOOL)shouldInteractionAppearInInbox:(TSInteraction *)interaction
|
||||
{
|
||||
OWSAssert(interaction);
|
||||
|
||||
if (interaction.isDynamicInteraction) {
|
||||
return NO;
|
||||
}
|
||||
|
||||
if ([interaction isKindOfClass:[TSErrorMessage class]]) {
|
||||
TSErrorMessage *errorMessage = (TSErrorMessage *)interaction;
|
||||
if (errorMessage.errorType == TSErrorMessageNonBlockingIdentityChange) {
|
||||
// Otherwise all group threads with the recipient will percolate to the top of the inbox, even though
|
||||
// there was no meaningful interaction.
|
||||
return NO;
|
||||
}
|
||||
} else if ([interaction isKindOfClass:[TSInfoMessage class]]) {
|
||||
TSInfoMessage *infoMessage = (TSInfoMessage *)interaction;
|
||||
if (infoMessage.messageType == TSInfoMessageVerificationStateChange) {
|
||||
return NO;
|
||||
}
|
||||
}
|
||||
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (void)updateWithLastMessage:(TSInteraction *)lastMessage transaction:(YapDatabaseReadWriteTransaction *)transaction {
|
||||
OWSAssert(lastMessage);
|
||||
OWSAssert(transaction);
|
||||
|
||||
if (![self.class shouldInteractionAppearInInbox:lastMessage]) {
|
||||
return;
|
||||
}
|
||||
|
||||
NSDate *lastMessageDate = [lastMessage dateForSorting];
|
||||
if (!_lastMessageDate || [lastMessageDate timeIntervalSinceDate:self.lastMessageDate] > 0) {
|
||||
_lastMessageDate = lastMessageDate;
|
||||
|
||||
[self saveWithTransaction:transaction];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark Archival
|
||||
|
||||
- (nullable NSDate *)archivalDate
|
||||
{
|
||||
return _archivalDate;
|
||||
}
|
||||
|
||||
- (void)archiveThreadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction {
|
||||
[self archiveThreadWithTransaction:transaction referenceDate:[NSDate date]];
|
||||
}
|
||||
|
||||
- (void)archiveThreadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction referenceDate:(NSDate *)date {
|
||||
[self markAllAsReadWithTransaction:transaction];
|
||||
_archivalDate = date;
|
||||
|
||||
[self saveWithTransaction:transaction];
|
||||
}
|
||||
|
||||
- (void)unarchiveThreadWithTransaction:(YapDatabaseReadWriteTransaction *)transaction {
|
||||
_archivalDate = nil;
|
||||
[self saveWithTransaction:transaction];
|
||||
}
|
||||
|
||||
#pragma mark Drafts
|
||||
|
||||
- (NSString *)currentDraftWithTransaction:(YapDatabaseReadTransaction *)transaction {
|
||||
TSThread *thread = [TSThread fetchObjectWithUniqueID:self.uniqueId transaction:transaction];
|
||||
if (thread.messageDraft) {
|
||||
return thread.messageDraft;
|
||||
} else {
|
||||
return @"";
|
||||
}
|
||||
}
|
||||
|
||||
- (void)setDraft:(NSString *)draftString transaction:(YapDatabaseReadWriteTransaction *)transaction {
|
||||
TSThread *thread = [TSThread fetchObjectWithUniqueID:self.uniqueId transaction:transaction];
|
||||
thread.messageDraft = draftString;
|
||||
[thread saveWithTransaction:transaction];
|
||||
}
|
||||
|
||||
#pragma mark - Muted
|
||||
|
||||
- (BOOL)isMuted
|
||||
{
|
||||
NSDate *mutedUntilDate = self.mutedUntilDate;
|
||||
NSDate *now = [NSDate date];
|
||||
return (mutedUntilDate != nil &&
|
||||
[mutedUntilDate timeIntervalSinceDate:now] > 0);
|
||||
}
|
||||
|
||||
// This method does the work for the "updateWith..." methods. Please see
|
||||
// the header for a discussion of those methods.
|
||||
- (void)applyChangeToSelfAndLatestThread:(YapDatabaseReadWriteTransaction *)transaction
|
||||
changeBlock:(void (^)(TSThread *))changeBlock
|
||||
{
|
||||
OWSAssert(transaction);
|
||||
|
||||
changeBlock(self);
|
||||
|
||||
NSString *collection = [[self class] collection];
|
||||
TSThread *latestInstance = [transaction objectForKey:self.uniqueId inCollection:collection];
|
||||
if (latestInstance) {
|
||||
changeBlock(latestInstance);
|
||||
[latestInstance saveWithTransaction:transaction];
|
||||
} else {
|
||||
// This message has not yet been saved.
|
||||
[self saveWithTransaction:transaction];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)updateWithMutedUntilDate:(NSDate *)mutedUntilDate
|
||||
{
|
||||
[self.dbReadWriteConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
|
||||
[self applyChangeToSelfAndLatestThread:transaction
|
||||
changeBlock:^(TSThread *thread) {
|
||||
[thread setMutedUntilDate:mutedUntilDate];
|
||||
}];
|
||||
}];
|
||||
}
|
||||
|
||||
#pragma mark - Logging
|
||||
|
||||
+ (NSString *)tag
|
||||
{
|
||||
return [NSString stringWithFormat:@"[%@]", self.class];
|
||||
}
|
||||
|
||||
- (NSString *)tag
|
||||
{
|
||||
return self.class.tag;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,25 @@
|
||||
// Created by Frederic Jacobs on 16/11/14.
|
||||
// Copyright (c) 2014 Open Whisper Systems. All rights reserved.
|
||||
|
||||
#import "TSThread.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface TSContactThread : TSThread
|
||||
|
||||
+ (instancetype)getOrCreateThreadWithContactId:(NSString *)contactId NS_SWIFT_NAME(getOrCreateThread(contactId:));
|
||||
|
||||
+ (instancetype)getOrCreateThreadWithContactId:(NSString *)contactId
|
||||
transaction:(YapDatabaseReadWriteTransaction *)transaction;
|
||||
|
||||
+ (instancetype)getOrCreateThreadWithContactId:(NSString *)contactId
|
||||
transaction:(YapDatabaseReadWriteTransaction *)transaction
|
||||
relay:(nullable NSString *)relay;
|
||||
|
||||
- (NSString *)contactIdentifier;
|
||||
|
||||
+ (NSString *)contactIdFromThreadId:(NSString *)threadId;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,129 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "TSContactThread.h"
|
||||
#import "ContactsManagerProtocol.h"
|
||||
#import "ContactsUpdater.h"
|
||||
#import "NotificationsProtocol.h"
|
||||
#import "OWSIdentityManager.h"
|
||||
#import "TextSecureKitEnv.h"
|
||||
#import <YapDatabase/YapDatabaseConnection.h>
|
||||
#import <YapDatabase/YapDatabaseTransaction.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
#define TSContactThreadPrefix @"c"
|
||||
|
||||
@implementation TSContactThread
|
||||
|
||||
- (instancetype)initWithContactId:(NSString *)contactId {
|
||||
NSString *uniqueIdentifier = [[self class] threadIdFromContactId:contactId];
|
||||
|
||||
OWSAssert(contactId.length > 0);
|
||||
|
||||
self = [super initWithUniqueId:uniqueIdentifier];
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
+ (instancetype)getOrCreateThreadWithContactId:(NSString *)contactId
|
||||
transaction:(YapDatabaseReadWriteTransaction *)transaction
|
||||
relay:(nullable NSString *)relay
|
||||
{
|
||||
OWSAssert(contactId.length > 0);
|
||||
|
||||
SignalRecipient *recipient =
|
||||
[SignalRecipient recipientWithTextSecureIdentifier:contactId withTransaction:transaction];
|
||||
|
||||
if (!recipient) {
|
||||
// If no recipient record exists for that contactId, create an empty record
|
||||
// for immediate use, then ask ContactsUpdater to try to update it async.
|
||||
recipient =
|
||||
[[SignalRecipient alloc] initWithTextSecureIdentifier:contactId
|
||||
relay:relay];
|
||||
[recipient saveWithTransaction:transaction];
|
||||
|
||||
// Update recipient with Server record async.
|
||||
[[ContactsUpdater sharedUpdater] lookupIdentifier:contactId
|
||||
success:^(SignalRecipient *recipient) {
|
||||
}
|
||||
failure:^(NSError *error) {
|
||||
DDLogWarn(@"Failed to lookup contact with error:%@", error);
|
||||
}];
|
||||
}
|
||||
|
||||
return [self getOrCreateThreadWithContactId:contactId transaction:transaction];
|
||||
}
|
||||
|
||||
+ (instancetype)getOrCreateThreadWithContactId:(NSString *)contactId
|
||||
transaction:(YapDatabaseReadWriteTransaction *)transaction {
|
||||
OWSAssert(contactId.length > 0);
|
||||
|
||||
TSContactThread *thread =
|
||||
[self fetchObjectWithUniqueID:[self threadIdFromContactId:contactId] transaction:transaction];
|
||||
|
||||
if (!thread) {
|
||||
thread = [[TSContactThread alloc] initWithContactId:contactId];
|
||||
[thread saveWithTransaction:transaction];
|
||||
}
|
||||
|
||||
return thread;
|
||||
}
|
||||
|
||||
+ (instancetype)getOrCreateThreadWithContactId:(NSString *)contactId
|
||||
{
|
||||
OWSAssert(contactId.length > 0);
|
||||
|
||||
__block TSContactThread *thread;
|
||||
[[self dbReadWriteConnection] readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
|
||||
thread = [self getOrCreateThreadWithContactId:contactId transaction:transaction];
|
||||
}];
|
||||
|
||||
return thread;
|
||||
}
|
||||
|
||||
- (NSString *)contactIdentifier {
|
||||
return [[self class] contactIdFromThreadId:self.uniqueId];
|
||||
}
|
||||
|
||||
- (NSArray<NSString *> *)recipientIdentifiers
|
||||
{
|
||||
return @[self.contactIdentifier];
|
||||
}
|
||||
|
||||
- (BOOL)isGroupThread {
|
||||
return false;
|
||||
}
|
||||
|
||||
- (BOOL)hasSafetyNumbers
|
||||
{
|
||||
return !![[OWSIdentityManager sharedManager] identityKeyForRecipientId:self.contactIdentifier];
|
||||
}
|
||||
|
||||
- (NSString *)name
|
||||
{
|
||||
return [[TextSecureKitEnv sharedEnv].contactsManager displayNameForPhoneIdentifier:self.contactIdentifier];
|
||||
}
|
||||
|
||||
#if TARGET_OS_IPHONE
|
||||
|
||||
- (nullable UIImage *)image
|
||||
{
|
||||
UIImage *image = [[TextSecureKitEnv sharedEnv].contactsManager imageForPhoneIdentifier:self.contactIdentifier];
|
||||
return image;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
+ (NSString *)threadIdFromContactId:(NSString *)contactId {
|
||||
return [TSContactThreadPrefix stringByAppendingString:contactId];
|
||||
}
|
||||
|
||||
+ (NSString *)contactIdFromThreadId:(NSString *)threadId {
|
||||
return [threadId substringWithRange:NSMakeRange(1, threadId.length - 1)];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,33 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "TSGroupModel.h"
|
||||
#import "TSThread.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class TSAttachmentStream;
|
||||
|
||||
@interface TSGroupThread : TSThread
|
||||
|
||||
@property (nonatomic, strong) TSGroupModel *groupModel;
|
||||
|
||||
+ (instancetype)getOrCreateThreadWithGroupModel:(TSGroupModel *)groupModel;
|
||||
+ (instancetype)getOrCreateThreadWithGroupModel:(TSGroupModel *)groupModel
|
||||
transaction:(YapDatabaseReadWriteTransaction *)transaction;
|
||||
|
||||
+ (instancetype)getOrCreateThreadWithGroupIdData:(NSData *)groupId;
|
||||
|
||||
+ (instancetype)threadWithGroupModel:(TSGroupModel *)groupModel transaction:(YapDatabaseReadTransaction *)transaction;
|
||||
|
||||
+ (NSString *)threadIdFromGroupId:(NSData *)groupId;
|
||||
|
||||
// all group threads containing recipient as a member
|
||||
+ (NSArray<TSGroupThread *> *)groupThreadsWithRecipientId:(NSString *)recipientId;
|
||||
|
||||
- (void)updateAvatarWithAttachmentStream:(TSAttachmentStream *)attachmentStream;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,175 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "TSGroupThread.h"
|
||||
#import "NSData+Base64.h"
|
||||
#import "SignalRecipient.h"
|
||||
#import "TSAttachmentStream.h"
|
||||
#import <SignalServiceKit/TSAccountManager.h>
|
||||
#import <YapDatabase/YapDatabaseConnection.h>
|
||||
#import <YapDatabase/YapDatabaseTransaction.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@implementation TSGroupThread
|
||||
|
||||
#define TSGroupThreadPrefix @"g"
|
||||
|
||||
- (instancetype)initWithGroupModel:(TSGroupModel *)groupModel
|
||||
{
|
||||
OWSAssert(groupModel);
|
||||
OWSAssert(groupModel.groupId.length > 0);
|
||||
OWSAssert(groupModel.groupMemberIds.count > 0);
|
||||
for (NSString *recipientId in groupModel.groupMemberIds) {
|
||||
OWSAssert(recipientId.length > 0);
|
||||
}
|
||||
|
||||
NSString *uniqueIdentifier = [[self class] threadIdFromGroupId:groupModel.groupId];
|
||||
self = [super initWithUniqueId:uniqueIdentifier];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
_groupModel = groupModel;
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (instancetype)initWithGroupIdData:(NSData *)groupId
|
||||
{
|
||||
OWSAssert(groupId.length > 0);
|
||||
|
||||
TSGroupModel *groupModel = [[TSGroupModel alloc] initWithTitle:nil memberIds:nil image:nil groupId:groupId];
|
||||
|
||||
self = [self initWithGroupModel:groupModel];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
+ (instancetype)threadWithGroupModel:(TSGroupModel *)groupModel transaction:(YapDatabaseReadTransaction *)transaction
|
||||
{
|
||||
OWSAssert(groupModel);
|
||||
OWSAssert(groupModel.groupId.length > 0);
|
||||
|
||||
return [self fetchObjectWithUniqueID:[self threadIdFromGroupId:groupModel.groupId] transaction:transaction];
|
||||
}
|
||||
|
||||
+ (instancetype)getOrCreateThreadWithGroupIdData:(NSData *)groupId
|
||||
{
|
||||
OWSAssert(groupId.length > 0);
|
||||
|
||||
TSGroupThread *thread = [self fetchObjectWithUniqueID:[self threadIdFromGroupId:groupId]];
|
||||
if (!thread) {
|
||||
thread = [[self alloc] initWithGroupIdData:groupId];
|
||||
[thread save];
|
||||
}
|
||||
return thread;
|
||||
}
|
||||
|
||||
+ (instancetype)getOrCreateThreadWithGroupModel:(TSGroupModel *)groupModel
|
||||
transaction:(YapDatabaseReadWriteTransaction *)transaction {
|
||||
OWSAssert(groupModel);
|
||||
OWSAssert(groupModel.groupId.length > 0);
|
||||
|
||||
TSGroupThread *thread =
|
||||
[self fetchObjectWithUniqueID:[self threadIdFromGroupId:groupModel.groupId] transaction:transaction];
|
||||
|
||||
if (!thread) {
|
||||
thread = [[TSGroupThread alloc] initWithGroupModel:groupModel];
|
||||
[thread saveWithTransaction:transaction];
|
||||
}
|
||||
return thread;
|
||||
}
|
||||
|
||||
+ (instancetype)getOrCreateThreadWithGroupModel:(TSGroupModel *)groupModel
|
||||
{
|
||||
OWSAssert(groupModel);
|
||||
OWSAssert(groupModel.groupId.length > 0);
|
||||
|
||||
__block TSGroupThread *thread;
|
||||
[[self dbReadWriteConnection] readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
|
||||
thread = [self getOrCreateThreadWithGroupModel:groupModel transaction:transaction];
|
||||
}];
|
||||
return thread;
|
||||
}
|
||||
|
||||
+ (NSString *)threadIdFromGroupId:(NSData *)groupId
|
||||
{
|
||||
OWSAssert(groupId.length > 0);
|
||||
|
||||
return [TSGroupThreadPrefix stringByAppendingString:[groupId base64EncodedString]];
|
||||
}
|
||||
|
||||
+ (NSData *)groupIdFromThreadId:(NSString *)threadId
|
||||
{
|
||||
OWSAssert(threadId.length > 0);
|
||||
|
||||
return [NSData dataFromBase64String:[threadId substringWithRange:NSMakeRange(1, threadId.length - 1)]];
|
||||
}
|
||||
|
||||
- (NSArray<NSString *> *)recipientIdentifiers
|
||||
{
|
||||
NSMutableArray<NSString *> *groupMemberIds = [self.groupModel.groupMemberIds mutableCopy];
|
||||
if (groupMemberIds == nil) {
|
||||
return @[];
|
||||
}
|
||||
|
||||
[groupMemberIds removeObject:[TSAccountManager localNumber]];
|
||||
|
||||
return [groupMemberIds copy];
|
||||
}
|
||||
|
||||
// Group and Contact threads share a collection, this is a convenient way to enumerate *just* the group threads
|
||||
+ (void)enumerateGroupThreadsUsingBlock:(void (^)(TSGroupThread *groupThread, BOOL *stop))block
|
||||
{
|
||||
[self enumerateCollectionObjectsUsingBlock:^(id obj, BOOL *stop) {
|
||||
if ([obj isKindOfClass:[TSGroupThread class]]) {
|
||||
block((TSGroupThread *)obj, stop);
|
||||
}
|
||||
}];
|
||||
}
|
||||
|
||||
// @returns all threads to which the recipient is a member.
|
||||
//
|
||||
// @note If this becomes a hotspot we can extract into a YapDB View.
|
||||
// As is, the number of groups should be small (dozens, *maybe* hundreds), and we only enumerate them upon SN changes.
|
||||
+ (NSArray<TSGroupThread *> *)groupThreadsWithRecipientId:(NSString *)recipientId
|
||||
{
|
||||
NSMutableArray<TSGroupThread *> *groupThreads = [NSMutableArray new];
|
||||
|
||||
[self enumerateGroupThreadsUsingBlock:^(TSGroupThread *_Nonnull groupThread, BOOL *_Nonnull stop) {
|
||||
if ([groupThread.groupModel.groupMemberIds containsObject:recipientId]) {
|
||||
[groupThreads addObject:groupThread];
|
||||
}
|
||||
}];
|
||||
|
||||
return [groupThreads copy];
|
||||
}
|
||||
|
||||
- (BOOL)isGroupThread
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
- (NSString *)name
|
||||
{
|
||||
return self.groupModel.groupName ? self.groupModel.groupName : NSLocalizedString(@"NEW_GROUP_DEFAULT_TITLE", @"");
|
||||
}
|
||||
|
||||
- (void)updateAvatarWithAttachmentStream:(TSAttachmentStream *)attachmentStream
|
||||
{
|
||||
self.groupModel.groupImage = [attachmentStream image];
|
||||
[self save];
|
||||
|
||||
// Avatars are stored directly in the database, so there's no need
|
||||
// to keep the attachment around after assigning the image.
|
||||
[attachmentStream remove];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,15 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "OWSOutgoingSyncMessage.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface OWSBlockedPhoneNumbersMessage : OWSOutgoingSyncMessage
|
||||
|
||||
- (instancetype)initWithPhoneNumbers:(NSArray<NSString *> *)phoneNumbers;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,43 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "OWSBlockedPhoneNumbersMessage.h"
|
||||
#import "OWSSignalServiceProtos.pb.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface OWSBlockedPhoneNumbersMessage ()
|
||||
|
||||
@property (nonatomic, readonly) NSArray<NSString *> *phoneNumbers;
|
||||
|
||||
@end
|
||||
|
||||
@implementation OWSBlockedPhoneNumbersMessage
|
||||
|
||||
- (instancetype)initWithPhoneNumbers:(NSArray<NSString *> *)phoneNumbers
|
||||
{
|
||||
self = [super init];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
_phoneNumbers = [phoneNumbers copy];
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (OWSSignalServiceProtosSyncMessageBuilder *)syncMessageBuilder
|
||||
{
|
||||
OWSSignalServiceProtosSyncMessageBlockedBuilder *blockedPhoneNumbersBuilder =
|
||||
[OWSSignalServiceProtosSyncMessageBlockedBuilder new];
|
||||
[blockedPhoneNumbersBuilder setNumbersArray:_phoneNumbers];
|
||||
OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder = [OWSSignalServiceProtosSyncMessageBuilder new];
|
||||
[syncMessageBuilder setBlocked:[blockedPhoneNumbersBuilder build]];
|
||||
|
||||
return syncMessageBuilder;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,16 @@
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class PBCodedOutputStream;
|
||||
|
||||
@interface OWSChunkedOutputStream : NSObject
|
||||
|
||||
@property (nonatomic, readonly) PBCodedOutputStream *delegateStream;
|
||||
|
||||
+ (instancetype)streamWithOutputStream:(NSOutputStream *)output;
|
||||
- (void)flush;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,35 @@
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
#import "OWSChunkedOutputStream.h"
|
||||
#import <ProtocolBuffers/CodedOutputStream.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@implementation OWSChunkedOutputStream
|
||||
|
||||
+ (instancetype)streamWithOutputStream:(NSOutputStream *)output
|
||||
{
|
||||
return [[self alloc] initWithOutputStream:output];
|
||||
}
|
||||
|
||||
- (instancetype)initWithOutputStream:(NSOutputStream *)outputStream
|
||||
{
|
||||
self = [super init];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
_delegateStream = [PBCodedOutputStream streamWithOutputStream:outputStream];
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)flush
|
||||
{
|
||||
[self.delegateStream flush];
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,19 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "OWSChunkedOutputStream.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class SignalAccount;
|
||||
@class OWSRecipientIdentity;
|
||||
|
||||
@interface OWSContactsOutputStream : OWSChunkedOutputStream
|
||||
|
||||
- (void)writeSignalAccount:(SignalAccount *)signalAccount
|
||||
recipientIdentity:(nullable OWSRecipientIdentity *)recipientIdentity;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,60 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "OWSContactsOutputStream.h"
|
||||
#import "Contact.h"
|
||||
#import "MIMETypeUtil.h"
|
||||
#import "NSData+keyVersionByte.h"
|
||||
#import "OWSRecipientIdentity.h"
|
||||
#import "OWSSignalServiceProtos.pb.h"
|
||||
#import "SignalAccount.h"
|
||||
#import <ProtocolBuffers/CodedOutputStream.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@implementation OWSContactsOutputStream
|
||||
|
||||
- (void)writeSignalAccount:(SignalAccount *)signalAccount
|
||||
recipientIdentity:(nullable OWSRecipientIdentity *)recipientIdentity
|
||||
{
|
||||
OWSAssert(signalAccount);
|
||||
OWSAssert(signalAccount.contact);
|
||||
|
||||
OWSSignalServiceProtosContactDetailsBuilder *contactBuilder = [OWSSignalServiceProtosContactDetailsBuilder new];
|
||||
[contactBuilder setName:signalAccount.contact.fullName];
|
||||
[contactBuilder setNumber:signalAccount.recipientId];
|
||||
|
||||
if (recipientIdentity != nil) {
|
||||
OWSSignalServiceProtosVerifiedBuilder *verifiedBuilder = [OWSSignalServiceProtosVerifiedBuilder new];
|
||||
verifiedBuilder.destination = recipientIdentity.recipientId;
|
||||
verifiedBuilder.identityKey = [recipientIdentity.identityKey prependKeyType];
|
||||
verifiedBuilder.state = OWSVerificationStateToProtoState(recipientIdentity.verificationState);
|
||||
contactBuilder.verifiedBuilder = verifiedBuilder;
|
||||
}
|
||||
|
||||
NSData *avatarPng;
|
||||
if (signalAccount.contact.image) {
|
||||
OWSSignalServiceProtosContactDetailsAvatarBuilder *avatarBuilder =
|
||||
[OWSSignalServiceProtosContactDetailsAvatarBuilder new];
|
||||
|
||||
[avatarBuilder setContentType:OWSMimeTypeImagePng];
|
||||
avatarPng = UIImagePNGRepresentation(signalAccount.contact.image);
|
||||
[avatarBuilder setLength:(uint32_t)avatarPng.length];
|
||||
[contactBuilder setAvatarBuilder:avatarBuilder];
|
||||
}
|
||||
|
||||
NSData *contactData = [[contactBuilder build] data];
|
||||
|
||||
uint32_t contactDataLength = (uint32_t)contactData.length;
|
||||
[self.delegateStream writeRawVarint32:contactDataLength];
|
||||
[self.delegateStream writeRawData:contactData];
|
||||
|
||||
if (signalAccount.contact.image) {
|
||||
[self.delegateStream writeRawData:avatarPng];
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,57 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "TSYapDatabaseObject.h"
|
||||
#import <Mantle/MTLJSONAdapter.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
extern uint32_t const OWSDevicePrimaryDeviceId;
|
||||
|
||||
@interface OWSDevice : TSYapDatabaseObject <MTLJSONSerializing>
|
||||
|
||||
@property (nonatomic, readonly) NSInteger deviceId;
|
||||
@property (nullable, readonly) NSString *name;
|
||||
@property (readonly) NSDate *createdAt;
|
||||
@property (readonly) NSDate *lastSeenAt;
|
||||
|
||||
+ (instancetype)deviceFromJSONDictionary:(NSDictionary *)deviceAttributes error:(NSError **)error;
|
||||
|
||||
/**
|
||||
* Set local database of devices to `devices`.
|
||||
*
|
||||
* This will create missing devices, update existing devices, and delete stale devices.
|
||||
* @param devices Removes any existing devices, replacing them with `devices`
|
||||
*/
|
||||
+ (void)replaceAll:(NSArray<OWSDevice *> *)devices;
|
||||
|
||||
/**
|
||||
* The id of the device currently running this application
|
||||
*/
|
||||
+ (uint32_t)currentDeviceId;
|
||||
|
||||
/**
|
||||
*
|
||||
* @param transaction yapTransaction
|
||||
* @return
|
||||
* If the user has any linked devices (apart from the device this app is running on).
|
||||
*/
|
||||
+ (BOOL)hasSecondaryDevicesWithTransaction:(YapDatabaseReadTransaction *)transaction;
|
||||
|
||||
- (NSString *)displayName;
|
||||
- (BOOL)isPrimaryDevice;
|
||||
|
||||
/**
|
||||
* Assign attributes to this device from another.
|
||||
*
|
||||
* @param other
|
||||
* OWSDevice whose attributes to copy to this device
|
||||
* @return
|
||||
* YES if any values on self changed, else NO
|
||||
*/
|
||||
- (BOOL)updateAttributesWithDevice:(OWSDevice *)other;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,183 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "OWSDevice.h"
|
||||
#import "NSDate+millisecondTimeStamp.h"
|
||||
#import "OWSError.h"
|
||||
#import "YapDatabaseConnection.h"
|
||||
#import "YapDatabaseTransaction.h"
|
||||
#import <Mantle/MTLValueTransformer.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
static MTLValueTransformer *_millisecondTimestampToDateTransformer;
|
||||
uint32_t const OWSDevicePrimaryDeviceId = 1;
|
||||
|
||||
@interface OWSDevice ()
|
||||
|
||||
@property NSString *name;
|
||||
@property NSDate *createdAt;
|
||||
@property NSDate *lastSeenAt;
|
||||
|
||||
@end
|
||||
|
||||
@implementation OWSDevice
|
||||
|
||||
@synthesize name = _name;
|
||||
|
||||
+ (instancetype)deviceFromJSONDictionary:(NSDictionary *)deviceAttributes error:(NSError **)error
|
||||
{
|
||||
return [MTLJSONAdapter modelOfClass:[self class] fromJSONDictionary:deviceAttributes error:error];
|
||||
}
|
||||
|
||||
+ (NSDictionary *)JSONKeyPathsByPropertyKey
|
||||
{
|
||||
return @{
|
||||
@"createdAt": @"created",
|
||||
@"lastSeenAt": @"lastSeen",
|
||||
@"deviceId": @"id",
|
||||
@"name": @"name"
|
||||
};
|
||||
}
|
||||
|
||||
+ (MTLValueTransformer *)createdAtJSONTransformer
|
||||
{
|
||||
return self.millisecondTimestampToDateTransformer;
|
||||
}
|
||||
|
||||
+ (MTLValueTransformer *)lastSeenAtJSONTransformer
|
||||
{
|
||||
return self.millisecondTimestampToDateTransformer;
|
||||
}
|
||||
|
||||
+ (void)replaceAll:(NSArray<OWSDevice *> *)currentDevices
|
||||
{
|
||||
NSMutableArray<OWSDevice *> *existingDevices = [[self allObjectsInCollection] mutableCopy];
|
||||
for (OWSDevice *currentDevice in currentDevices) {
|
||||
NSUInteger existingDeviceIndex = [existingDevices indexOfObject:currentDevice];
|
||||
if (existingDeviceIndex == NSNotFound) {
|
||||
// New Device
|
||||
[currentDevice save];
|
||||
} else {
|
||||
OWSDevice *existingDevice = existingDevices[existingDeviceIndex];
|
||||
if ([existingDevice updateAttributesWithDevice:currentDevice]) {
|
||||
[existingDevice save];
|
||||
}
|
||||
[existingDevices removeObjectAtIndex:existingDeviceIndex];
|
||||
}
|
||||
}
|
||||
|
||||
// Since we removed existing devices as we went, only stale devices remain
|
||||
for (OWSDevice *staleDevice in existingDevices) {
|
||||
[staleDevice remove];
|
||||
}
|
||||
}
|
||||
|
||||
+ (MTLValueTransformer *)millisecondTimestampToDateTransformer
|
||||
{
|
||||
if (!_millisecondTimestampToDateTransformer) {
|
||||
_millisecondTimestampToDateTransformer =
|
||||
[MTLValueTransformer transformerUsingForwardBlock:^id(id value, BOOL *success, NSError **error) {
|
||||
if ([value isKindOfClass:[NSNumber class]]) {
|
||||
NSNumber *number = (NSNumber *)value;
|
||||
NSDate *result = [NSDate ows_dateWithMillisecondsSince1970:[number longLongValue]];
|
||||
if (result) {
|
||||
*success = YES;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
*success = NO;
|
||||
*error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToDecodeJson,
|
||||
[NSString stringWithFormat:@"unable to decode date from %@", value]);
|
||||
return nil;
|
||||
}
|
||||
reverseBlock:^id(id value, BOOL *success, NSError **error) {
|
||||
if ([value isKindOfClass:[NSDate class]]) {
|
||||
NSDate *date = (NSDate *)value;
|
||||
NSNumber *result = [NSNumber numberWithLongLong:[NSDate ows_millisecondsSince1970ForDate:date]];
|
||||
if (result) {
|
||||
*success = YES;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
*error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToEncodeJson,
|
||||
[NSString stringWithFormat:@"unable to encode date from %@", value]);
|
||||
*success = NO;
|
||||
return nil;
|
||||
}];
|
||||
}
|
||||
return _millisecondTimestampToDateTransformer;
|
||||
}
|
||||
|
||||
+ (uint32_t)currentDeviceId
|
||||
{
|
||||
// Someday it may be possible to have a non-primary iOS device, but for now
|
||||
// any iOS device must be the primary device.
|
||||
return OWSDevicePrimaryDeviceId;
|
||||
}
|
||||
|
||||
- (BOOL)isPrimaryDevice
|
||||
{
|
||||
return self.deviceId == OWSDevicePrimaryDeviceId;
|
||||
}
|
||||
|
||||
- (NSString *)displayName
|
||||
{
|
||||
if (self.name) {
|
||||
return self.name;
|
||||
}
|
||||
|
||||
if (self.deviceId == OWSDevicePrimaryDeviceId) {
|
||||
return @"This Device";
|
||||
}
|
||||
return NSLocalizedString(@"UNNAMED_DEVICE", @"Label text in device manager for a device with no name");
|
||||
}
|
||||
|
||||
- (BOOL)updateAttributesWithDevice:(OWSDevice *)other
|
||||
{
|
||||
BOOL changed = NO;
|
||||
if (![self.lastSeenAt isEqual:other.lastSeenAt]) {
|
||||
self.lastSeenAt = other.lastSeenAt;
|
||||
changed = YES;
|
||||
}
|
||||
|
||||
if (![self.createdAt isEqual:other.createdAt]) {
|
||||
self.createdAt = other.createdAt;
|
||||
changed = YES;
|
||||
}
|
||||
|
||||
if (![self.name isEqual:other.name]) {
|
||||
self.name = other.name;
|
||||
changed = YES;
|
||||
}
|
||||
|
||||
return changed;
|
||||
}
|
||||
|
||||
+ (BOOL)hasSecondaryDevicesWithTransaction:(YapDatabaseReadTransaction *)transaction
|
||||
{
|
||||
return [self numberOfKeysInCollectionWithTransaction:transaction] > 1;
|
||||
}
|
||||
|
||||
- (BOOL)isEqual:(id)object
|
||||
{
|
||||
if (self == object) {
|
||||
return YES;
|
||||
}
|
||||
|
||||
if (![object isKindOfClass:[OWSDevice class]]) {
|
||||
return NO;
|
||||
}
|
||||
|
||||
return [self isEqualToDevice:(OWSDevice *)object];
|
||||
}
|
||||
|
||||
- (BOOL)isEqualToDevice:(OWSDevice *)device
|
||||
{
|
||||
return self.deviceId == device.deviceId;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,30 @@
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class OWSDeviceProvisioningCodeService;
|
||||
@class OWSDeviceProvisioningService;
|
||||
|
||||
@interface OWSDeviceProvisioner : NSObject
|
||||
|
||||
- (instancetype)init NS_UNAVAILABLE;
|
||||
|
||||
- (instancetype)initWithMyPublicKey:(NSData *)myPublicKey
|
||||
myPrivateKey:(NSData *)myPrivateKey
|
||||
theirPublicKey:(NSData *)theirPublicKey
|
||||
theirEphemeralDeviceId:(NSString *)ephemeralDeviceId
|
||||
accountIdentifier:(NSString *)accountIdentifier
|
||||
provisioningCodeService:(OWSDeviceProvisioningCodeService *)provisioningCodeService
|
||||
provisioningService:(OWSDeviceProvisioningService *)provisioningService NS_DESIGNATED_INITIALIZER;
|
||||
|
||||
- (instancetype)initWithMyPublicKey:(NSData *)myPublicKey
|
||||
myPrivateKey:(NSData *)myPrivateKey
|
||||
theirPublicKey:(NSData *)theirEncodedPublicKey
|
||||
theirEphemeralDeviceId:(NSString *)ephemeralDeviceId
|
||||
accountIdentifier:(NSString *)accountIdentifier;
|
||||
|
||||
- (void)provisionWithSuccess:(void (^)())successCallback failure:(void (^)(NSError *))failureCallback;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,99 @@
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
#import "OWSDeviceProvisioner.h"
|
||||
#import "OWSDeviceProvisioningCodeService.h"
|
||||
#import "OWSDeviceProvisioningService.h"
|
||||
#import "OWSProvisioningMessage.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface OWSDeviceProvisioner ()
|
||||
|
||||
@property (nonatomic, readonly) NSData *myPublicKey;
|
||||
@property (nonatomic, readonly) NSData *myPrivateKey;
|
||||
@property (nonatomic, readonly) NSData *theirPublicKey;
|
||||
@property (nonatomic, readonly) NSString *accountIdentifier;
|
||||
@property (nonatomic, nullable) NSString *ephemeralDeviceId;
|
||||
@property (nonatomic, readonly) OWSDeviceProvisioningCodeService *provisioningCodeService;
|
||||
@property (nonatomic, readonly) OWSDeviceProvisioningService *provisioningService;
|
||||
|
||||
@end
|
||||
|
||||
@implementation OWSDeviceProvisioner
|
||||
|
||||
- (instancetype)initWithMyPublicKey:(NSData *)myPublicKey
|
||||
myPrivateKey:(NSData *)myPrivateKey
|
||||
theirPublicKey:(NSData *)theirPublicKey
|
||||
theirEphemeralDeviceId:(NSString *)ephemeralDeviceId
|
||||
accountIdentifier:(NSString *)accountIdentifier
|
||||
provisioningCodeService:(OWSDeviceProvisioningCodeService *)provisioningCodeService
|
||||
provisioningService:(OWSDeviceProvisioningService *)provisioningService
|
||||
{
|
||||
self = [super init];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
_myPublicKey = myPublicKey;
|
||||
_myPrivateKey = myPrivateKey;
|
||||
_theirPublicKey = theirPublicKey;
|
||||
_accountIdentifier = accountIdentifier;
|
||||
_ephemeralDeviceId = ephemeralDeviceId;
|
||||
_provisioningCodeService = provisioningCodeService;
|
||||
_provisioningService = provisioningService;
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (instancetype)initWithMyPublicKey:(NSData *)myPublicKey
|
||||
myPrivateKey:(NSData *)myPrivateKey
|
||||
theirPublicKey:(NSData *)theirPublicKey
|
||||
theirEphemeralDeviceId:(NSString *)ephemeralDeviceId
|
||||
accountIdentifier:(NSString *)accountIdentifier
|
||||
{
|
||||
return [self initWithMyPublicKey:myPublicKey
|
||||
myPrivateKey:myPrivateKey
|
||||
theirPublicKey:theirPublicKey
|
||||
theirEphemeralDeviceId:ephemeralDeviceId
|
||||
accountIdentifier:accountIdentifier
|
||||
provisioningCodeService:[OWSDeviceProvisioningCodeService new]
|
||||
provisioningService:[OWSDeviceProvisioningService new]];
|
||||
}
|
||||
|
||||
- (void)provisionWithSuccess:(void (^)())successCallback failure:(void (^)(NSError *_Nonnull))failureCallback
|
||||
{
|
||||
[self.provisioningCodeService requestProvisioningCodeWithSuccess:^(NSString *provisioningCode) {
|
||||
DDLogInfo(@"Retrieved provisioning code.");
|
||||
[self provisionWithCode:provisioningCode success:successCallback failure:failureCallback];
|
||||
}
|
||||
failure:^(NSError *error) {
|
||||
DDLogError(@"Failed to get provisioning code with error: %@", error);
|
||||
failureCallback(error);
|
||||
}];
|
||||
}
|
||||
|
||||
- (void)provisionWithCode:(NSString *)provisioningCode
|
||||
success:(void (^)())successCallback
|
||||
failure:(void (^)(NSError *_Nonnull))failureCallback
|
||||
{
|
||||
OWSProvisioningMessage *message = [[OWSProvisioningMessage alloc] initWithMyPublicKey:self.myPublicKey
|
||||
myPrivateKey:self.myPrivateKey
|
||||
theirPublicKey:self.theirPublicKey
|
||||
accountIdentifier:self.accountIdentifier
|
||||
provisioningCode:provisioningCode];
|
||||
|
||||
[self.provisioningService provisionWithMessageBody:[message buildEncryptedMessageBody]
|
||||
ephemeralDeviceId:self.ephemeralDeviceId
|
||||
success:^{
|
||||
DDLogInfo(@"ProvisioningService SUCCEEDED");
|
||||
successCallback();
|
||||
}
|
||||
failure:^(NSError *error) {
|
||||
DDLogError(@"ProvisioningService FAILED with error:%@", error);
|
||||
failureCallback(error);
|
||||
}];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,15 @@
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
#import "OWSChunkedOutputStream.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class TSGroupModel;
|
||||
|
||||
@interface OWSGroupsOutputStream : OWSChunkedOutputStream
|
||||
|
||||
- (void)writeGroup:(TSGroupModel *)group;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,43 @@
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
#import "OWSGroupsOutputStream.h"
|
||||
#import "MIMETypeUtil.h"
|
||||
#import "OWSSignalServiceProtos.pb.h"
|
||||
#import "TSGroupModel.h"
|
||||
#import <ProtocolBuffers/CodedOutputStream.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@implementation OWSGroupsOutputStream
|
||||
|
||||
- (void)writeGroup:(TSGroupModel *)group
|
||||
{
|
||||
OWSSignalServiceProtosGroupDetailsBuilder *groupBuilder = [OWSSignalServiceProtosGroupDetailsBuilder new];
|
||||
[groupBuilder setId:group.groupId];
|
||||
[groupBuilder setName:group.groupName];
|
||||
[groupBuilder setMembersArray:group.groupMemberIds];
|
||||
|
||||
NSData *avatarPng;
|
||||
if (group.groupImage) {
|
||||
OWSSignalServiceProtosGroupDetailsAvatarBuilder *avatarBuilder =
|
||||
[OWSSignalServiceProtosGroupDetailsAvatarBuilder new];
|
||||
|
||||
[avatarBuilder setContentType:OWSMimeTypeImagePng];
|
||||
avatarPng = UIImagePNGRepresentation(group.groupImage);
|
||||
[avatarBuilder setLength:(uint32_t)avatarPng.length];
|
||||
[groupBuilder setAvatarBuilder:avatarBuilder];
|
||||
}
|
||||
|
||||
NSData *groupData = [[groupBuilder build] data];
|
||||
uint32_t groupDataLength = (uint32_t)groupData.length;
|
||||
[self.delegateStream writeRawVarint32:groupDataLength];
|
||||
[self.delegateStream writeRawData:groupData];
|
||||
|
||||
if (avatarPng) {
|
||||
[self.delegateStream writeRawData:avatarPng];
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,14 @@
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface OWSProvisioningCipher : NSObject
|
||||
|
||||
@property (nonatomic, readonly) NSData *ourPublicKey;
|
||||
|
||||
- (instancetype)initWithTheirPublicKey:(NSData *)theirPublicKey;
|
||||
- (NSData *)encrypt:(NSData *)plainText;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,103 @@
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
#import "OWSProvisioningCipher.h"
|
||||
#import <25519/Curve25519.h>
|
||||
#import <HKDFKit/HKDFKit.h>
|
||||
#import <SignalServiceKit/Cryptography.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface OWSProvisioningCipher ()
|
||||
|
||||
@property (nonatomic, readonly) NSData *theirPublicKey;
|
||||
@property (nonatomic, readonly) ECKeyPair *ourKeyPair;
|
||||
|
||||
@end
|
||||
|
||||
@implementation OWSProvisioningCipher
|
||||
|
||||
- (instancetype)initWithTheirPublicKey:(NSData *)theirPublicKey
|
||||
{
|
||||
self = [super init];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
_theirPublicKey = theirPublicKey;
|
||||
_ourKeyPair = [Curve25519 generateKeyPair];
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (NSData *)ourPublicKey
|
||||
{
|
||||
return self.ourKeyPair.publicKey;
|
||||
}
|
||||
|
||||
- (NSData *)encrypt:(NSData *)dataToEncrypt
|
||||
{
|
||||
NSData *sharedSecret =
|
||||
[Curve25519 generateSharedSecretFromPublicKey:self.theirPublicKey andKeyPair:self.ourKeyPair];
|
||||
|
||||
NSData *infoData = [@"TextSecure Provisioning Message" dataUsingEncoding:NSASCIIStringEncoding];
|
||||
NSData *nullSalt = [[NSMutableData dataWithLength:32] copy];
|
||||
NSData *derivedSecret = [HKDFKit deriveKey:sharedSecret info:infoData salt:nullSalt outputSize:64];
|
||||
NSData *cipherKey = [derivedSecret subdataWithRange:NSMakeRange(0, 32)];
|
||||
NSData *macKey = [derivedSecret subdataWithRange:NSMakeRange(32, 32)];
|
||||
NSAssert(cipherKey.length == 32, @"Cipher Key must be 32 bytes");
|
||||
NSAssert(macKey.length == 32, @"Mac Key must be 32 bytes");
|
||||
|
||||
u_int8_t versionByte[] = { 0x01 };
|
||||
NSMutableData *message = [NSMutableData dataWithBytes:&versionByte length:1];
|
||||
|
||||
NSData *cipherText = [self encrypt:dataToEncrypt withKey:cipherKey];
|
||||
[message appendData:cipherText];
|
||||
|
||||
NSData *mac = [self macForMessage:message withKey:macKey];
|
||||
[message appendData:mac];
|
||||
|
||||
return [message copy];
|
||||
}
|
||||
|
||||
- (NSData *)encrypt:(NSData *)dataToEncrypt withKey:(NSData *)cipherKey
|
||||
{
|
||||
NSData *iv = [Cryptography generateRandomBytes:kCCBlockSizeAES128];
|
||||
// allow space for message + padding any incomplete block
|
||||
size_t bufferSize = dataToEncrypt.length + kCCBlockSizeAES128;
|
||||
void *buffer = malloc(bufferSize);
|
||||
size_t bytesEncrypted = 0;
|
||||
|
||||
CCCryptorStatus cryptStatus = CCCrypt(kCCEncrypt,
|
||||
kCCAlgorithmAES,
|
||||
kCCOptionPKCS7Padding,
|
||||
cipherKey.bytes,
|
||||
cipherKey.length,
|
||||
iv.bytes,
|
||||
dataToEncrypt.bytes,
|
||||
dataToEncrypt.length,
|
||||
buffer,
|
||||
bufferSize,
|
||||
&bytesEncrypted);
|
||||
|
||||
if (cryptStatus != kCCSuccess) {
|
||||
DDLogError(@"Encryption failed with status: %d", cryptStatus);
|
||||
}
|
||||
|
||||
NSMutableData *encryptedMessage = [[NSMutableData alloc] initWithData:iv];
|
||||
[encryptedMessage appendBytes:buffer length:bytesEncrypted];
|
||||
|
||||
return [encryptedMessage copy];
|
||||
}
|
||||
|
||||
- (NSData *)macForMessage:(NSData *)message withKey:(NSData *)macKey
|
||||
{
|
||||
uint8_t hmacBytes[CC_SHA256_DIGEST_LENGTH] = { 0 };
|
||||
CCHmac(kCCHmacAlgSHA256, macKey.bytes, macKey.length, message.bytes, message.length, hmacBytes);
|
||||
|
||||
return [NSData dataWithBytes:hmacBytes length:CC_SHA256_DIGEST_LENGTH];
|
||||
}
|
||||
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,17 @@
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface OWSProvisioningMessage : NSObject
|
||||
|
||||
- (instancetype)initWithMyPublicKey:(NSData *)myPublicKey
|
||||
myPrivateKey:(NSData *)myPrivateKey
|
||||
theirPublicKey:(NSData *)theirPublicKey
|
||||
accountIdentifier:(NSString *)accountIdentifier
|
||||
provisioningCode:(NSString *)provisioningCode;
|
||||
|
||||
- (NSData *)buildEncryptedMessageBody;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,68 @@
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
#import "OWSProvisioningMessage.h"
|
||||
#import "OWSProvisioningCipher.h"
|
||||
#import "OWSProvisioningProtos.pb.h"
|
||||
#import <25519/Curve25519.h>
|
||||
#import <AxolotlKit/NSData+keyVersionByte.h>
|
||||
#import <HKDFKit/HKDFKit.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface OWSProvisioningMessage ()
|
||||
|
||||
@property (nonatomic, readonly) NSData *myPublicKey;
|
||||
@property (nonatomic, readonly) NSData *myPrivateKey;
|
||||
@property (nonatomic, readonly) NSString *accountIdentifier;
|
||||
@property (nonatomic, readonly) NSData *theirPublicKey;
|
||||
@property (nonatomic, readonly) NSString *provisioningCode;
|
||||
|
||||
@end
|
||||
|
||||
@implementation OWSProvisioningMessage
|
||||
|
||||
- (instancetype)initWithMyPublicKey:(NSData *)myPublicKey
|
||||
myPrivateKey:(NSData *)myPrivateKey
|
||||
theirPublicKey:(NSData *)theirPublicKey
|
||||
accountIdentifier:(NSString *)accountIdentifier
|
||||
provisioningCode:(NSString *)provisioningCode
|
||||
{
|
||||
self = [super init];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
_myPublicKey = myPublicKey;
|
||||
_myPrivateKey = myPrivateKey;
|
||||
_accountIdentifier = accountIdentifier;
|
||||
_theirPublicKey = theirPublicKey;
|
||||
_provisioningCode = provisioningCode;
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (NSData *)buildEncryptedMessageBody
|
||||
{
|
||||
OWSProvisioningProtosProvisionMessageBuilder *messageBuilder = [OWSProvisioningProtosProvisionMessageBuilder new];
|
||||
[messageBuilder setIdentityKeyPublic:self.myPublicKey];
|
||||
[messageBuilder setIdentityKeyPrivate:self.myPrivateKey];
|
||||
[messageBuilder setNumber:self.accountIdentifier];
|
||||
[messageBuilder setProvisioningCode:self.provisioningCode];
|
||||
[messageBuilder setUserAgent:@"OWI"];
|
||||
|
||||
NSData *plainTextProvisionMessage = [[messageBuilder build] data];
|
||||
|
||||
OWSProvisioningCipher *cipher = [[OWSProvisioningCipher alloc] initWithTheirPublicKey:self.theirPublicKey];
|
||||
NSData *encryptedProvisionMessage = [cipher encrypt:plainTextProvisionMessage];
|
||||
|
||||
OWSProvisioningProtosProvisionEnvelopeBuilder *envelopeBuilder = [OWSProvisioningProtosProvisionEnvelopeBuilder new];
|
||||
// Note that this is a one-time-use *cipher* public key, not our Signal *identity* public key
|
||||
[envelopeBuilder setPublicKey:[cipher.ourPublicKey prependKeyType]];
|
||||
[envelopeBuilder setBody:encryptedProvisionMessage];
|
||||
|
||||
return [[envelopeBuilder build] data];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,215 @@
|
||||
// Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
|
||||
#import <ProtocolBuffers/ProtocolBuffers.h>
|
||||
|
||||
// @@protoc_insertion_point(imports)
|
||||
|
||||
@class OWSProvisioningProtosProvisionEnvelope;
|
||||
@class OWSProvisioningProtosProvisionEnvelopeBuilder;
|
||||
@class OWSProvisioningProtosProvisionMessage;
|
||||
@class OWSProvisioningProtosProvisionMessageBuilder;
|
||||
@class ObjectiveCFileOptions;
|
||||
@class ObjectiveCFileOptionsBuilder;
|
||||
@class PBDescriptorProto;
|
||||
@class PBDescriptorProtoBuilder;
|
||||
@class PBDescriptorProtoExtensionRange;
|
||||
@class PBDescriptorProtoExtensionRangeBuilder;
|
||||
@class PBEnumDescriptorProto;
|
||||
@class PBEnumDescriptorProtoBuilder;
|
||||
@class PBEnumOptions;
|
||||
@class PBEnumOptionsBuilder;
|
||||
@class PBEnumValueDescriptorProto;
|
||||
@class PBEnumValueDescriptorProtoBuilder;
|
||||
@class PBEnumValueOptions;
|
||||
@class PBEnumValueOptionsBuilder;
|
||||
@class PBFieldDescriptorProto;
|
||||
@class PBFieldDescriptorProtoBuilder;
|
||||
@class PBFieldOptions;
|
||||
@class PBFieldOptionsBuilder;
|
||||
@class PBFileDescriptorProto;
|
||||
@class PBFileDescriptorProtoBuilder;
|
||||
@class PBFileDescriptorSet;
|
||||
@class PBFileDescriptorSetBuilder;
|
||||
@class PBFileOptions;
|
||||
@class PBFileOptionsBuilder;
|
||||
@class PBMessageOptions;
|
||||
@class PBMessageOptionsBuilder;
|
||||
@class PBMethodDescriptorProto;
|
||||
@class PBMethodDescriptorProtoBuilder;
|
||||
@class PBMethodOptions;
|
||||
@class PBMethodOptionsBuilder;
|
||||
@class PBOneofDescriptorProto;
|
||||
@class PBOneofDescriptorProtoBuilder;
|
||||
@class PBServiceDescriptorProto;
|
||||
@class PBServiceDescriptorProtoBuilder;
|
||||
@class PBServiceOptions;
|
||||
@class PBServiceOptionsBuilder;
|
||||
@class PBSourceCodeInfo;
|
||||
@class PBSourceCodeInfoBuilder;
|
||||
@class PBSourceCodeInfoLocation;
|
||||
@class PBSourceCodeInfoLocationBuilder;
|
||||
@class PBUninterpretedOption;
|
||||
@class PBUninterpretedOptionBuilder;
|
||||
@class PBUninterpretedOptionNamePart;
|
||||
@class PBUninterpretedOptionNamePartBuilder;
|
||||
|
||||
|
||||
|
||||
@interface OWSProvisioningProtosOwsprovisioningProtosRoot : NSObject {
|
||||
}
|
||||
+ (PBExtensionRegistry*) extensionRegistry;
|
||||
+ (void) registerAllExtensions:(PBMutableExtensionRegistry*) registry;
|
||||
@end
|
||||
|
||||
#define ProvisionEnvelope_publicKey @"publicKey"
|
||||
#define ProvisionEnvelope_body @"body"
|
||||
@interface OWSProvisioningProtosProvisionEnvelope : PBGeneratedMessage<GeneratedMessageProtocol> {
|
||||
@private
|
||||
BOOL hasPublicKey_:1;
|
||||
BOOL hasBody_:1;
|
||||
NSData* publicKey;
|
||||
NSData* body;
|
||||
}
|
||||
- (BOOL) hasPublicKey;
|
||||
- (BOOL) hasBody;
|
||||
@property (readonly, strong) NSData* publicKey;
|
||||
@property (readonly, strong) NSData* body;
|
||||
|
||||
+ (instancetype) defaultInstance;
|
||||
- (instancetype) defaultInstance;
|
||||
|
||||
- (BOOL) isInitialized;
|
||||
- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output;
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) builder;
|
||||
+ (OWSProvisioningProtosProvisionEnvelopeBuilder*) builder;
|
||||
+ (OWSProvisioningProtosProvisionEnvelopeBuilder*) builderWithPrototype:(OWSProvisioningProtosProvisionEnvelope*) prototype;
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) toBuilder;
|
||||
|
||||
+ (OWSProvisioningProtosProvisionEnvelope*) parseFromData:(NSData*) data;
|
||||
+ (OWSProvisioningProtosProvisionEnvelope*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
|
||||
+ (OWSProvisioningProtosProvisionEnvelope*) parseFromInputStream:(NSInputStream*) input;
|
||||
+ (OWSProvisioningProtosProvisionEnvelope*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
|
||||
+ (OWSProvisioningProtosProvisionEnvelope*) parseFromCodedInputStream:(PBCodedInputStream*) input;
|
||||
+ (OWSProvisioningProtosProvisionEnvelope*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
|
||||
@end
|
||||
|
||||
@interface OWSProvisioningProtosProvisionEnvelopeBuilder : PBGeneratedMessageBuilder {
|
||||
@private
|
||||
OWSProvisioningProtosProvisionEnvelope* resultProvisionEnvelope;
|
||||
}
|
||||
|
||||
- (OWSProvisioningProtosProvisionEnvelope*) defaultInstance;
|
||||
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) clear;
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) clone;
|
||||
|
||||
- (OWSProvisioningProtosProvisionEnvelope*) build;
|
||||
- (OWSProvisioningProtosProvisionEnvelope*) buildPartial;
|
||||
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) mergeFrom:(OWSProvisioningProtosProvisionEnvelope*) other;
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input;
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
|
||||
|
||||
- (BOOL) hasPublicKey;
|
||||
- (NSData*) publicKey;
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) setPublicKey:(NSData*) value;
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) clearPublicKey;
|
||||
|
||||
- (BOOL) hasBody;
|
||||
- (NSData*) body;
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) setBody:(NSData*) value;
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) clearBody;
|
||||
@end
|
||||
|
||||
#define ProvisionMessage_identityKeyPublic @"identityKeyPublic"
|
||||
#define ProvisionMessage_identityKeyPrivate @"identityKeyPrivate"
|
||||
#define ProvisionMessage_number @"number"
|
||||
#define ProvisionMessage_provisioningCode @"provisioningCode"
|
||||
#define ProvisionMessage_userAgent @"userAgent"
|
||||
@interface OWSProvisioningProtosProvisionMessage : PBGeneratedMessage<GeneratedMessageProtocol> {
|
||||
@private
|
||||
BOOL hasNumber_:1;
|
||||
BOOL hasProvisioningCode_:1;
|
||||
BOOL hasUserAgent_:1;
|
||||
BOOL hasIdentityKeyPublic_:1;
|
||||
BOOL hasIdentityKeyPrivate_:1;
|
||||
NSString* number;
|
||||
NSString* provisioningCode;
|
||||
NSString* userAgent;
|
||||
NSData* identityKeyPublic;
|
||||
NSData* identityKeyPrivate;
|
||||
}
|
||||
- (BOOL) hasIdentityKeyPublic;
|
||||
- (BOOL) hasIdentityKeyPrivate;
|
||||
- (BOOL) hasNumber;
|
||||
- (BOOL) hasProvisioningCode;
|
||||
- (BOOL) hasUserAgent;
|
||||
@property (readonly, strong) NSData* identityKeyPublic;
|
||||
@property (readonly, strong) NSData* identityKeyPrivate;
|
||||
@property (readonly, strong) NSString* number;
|
||||
@property (readonly, strong) NSString* provisioningCode;
|
||||
@property (readonly, strong) NSString* userAgent;
|
||||
|
||||
+ (instancetype) defaultInstance;
|
||||
- (instancetype) defaultInstance;
|
||||
|
||||
- (BOOL) isInitialized;
|
||||
- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output;
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) builder;
|
||||
+ (OWSProvisioningProtosProvisionMessageBuilder*) builder;
|
||||
+ (OWSProvisioningProtosProvisionMessageBuilder*) builderWithPrototype:(OWSProvisioningProtosProvisionMessage*) prototype;
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) toBuilder;
|
||||
|
||||
+ (OWSProvisioningProtosProvisionMessage*) parseFromData:(NSData*) data;
|
||||
+ (OWSProvisioningProtosProvisionMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
|
||||
+ (OWSProvisioningProtosProvisionMessage*) parseFromInputStream:(NSInputStream*) input;
|
||||
+ (OWSProvisioningProtosProvisionMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
|
||||
+ (OWSProvisioningProtosProvisionMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input;
|
||||
+ (OWSProvisioningProtosProvisionMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
|
||||
@end
|
||||
|
||||
@interface OWSProvisioningProtosProvisionMessageBuilder : PBGeneratedMessageBuilder {
|
||||
@private
|
||||
OWSProvisioningProtosProvisionMessage* resultProvisionMessage;
|
||||
}
|
||||
|
||||
- (OWSProvisioningProtosProvisionMessage*) defaultInstance;
|
||||
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) clear;
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) clone;
|
||||
|
||||
- (OWSProvisioningProtosProvisionMessage*) build;
|
||||
- (OWSProvisioningProtosProvisionMessage*) buildPartial;
|
||||
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) mergeFrom:(OWSProvisioningProtosProvisionMessage*) other;
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input;
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry;
|
||||
|
||||
- (BOOL) hasIdentityKeyPublic;
|
||||
- (NSData*) identityKeyPublic;
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) setIdentityKeyPublic:(NSData*) value;
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) clearIdentityKeyPublic;
|
||||
|
||||
- (BOOL) hasIdentityKeyPrivate;
|
||||
- (NSData*) identityKeyPrivate;
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) setIdentityKeyPrivate:(NSData*) value;
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) clearIdentityKeyPrivate;
|
||||
|
||||
- (BOOL) hasNumber;
|
||||
- (NSString*) number;
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) setNumber:(NSString*) value;
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) clearNumber;
|
||||
|
||||
- (BOOL) hasProvisioningCode;
|
||||
- (NSString*) provisioningCode;
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) setProvisioningCode:(NSString*) value;
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) clearProvisioningCode;
|
||||
|
||||
- (BOOL) hasUserAgent;
|
||||
- (NSString*) userAgent;
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) setUserAgent:(NSString*) value;
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) clearUserAgent;
|
||||
@end
|
||||
|
||||
|
||||
// @@protoc_insertion_point(global_scope)
|
||||
@ -0,0 +1,682 @@
|
||||
// Generated by the protocol buffer compiler. DO NOT EDIT!
|
||||
|
||||
#import "OWSProvisioningProtos.pb.h"
|
||||
// @@protoc_insertion_point(imports)
|
||||
|
||||
@implementation OWSProvisioningProtosOwsprovisioningProtosRoot
|
||||
static PBExtensionRegistry* extensionRegistry = nil;
|
||||
+ (PBExtensionRegistry*) extensionRegistry {
|
||||
return extensionRegistry;
|
||||
}
|
||||
|
||||
+ (void) initialize {
|
||||
if (self == [OWSProvisioningProtosOwsprovisioningProtosRoot class]) {
|
||||
PBMutableExtensionRegistry* registry = [PBMutableExtensionRegistry registry];
|
||||
[self registerAllExtensions:registry];
|
||||
[ObjectivecDescriptorRoot registerAllExtensions:registry];
|
||||
extensionRegistry = registry;
|
||||
}
|
||||
}
|
||||
+ (void) registerAllExtensions:(PBMutableExtensionRegistry*) registry {
|
||||
}
|
||||
@end
|
||||
|
||||
@interface OWSProvisioningProtosProvisionEnvelope ()
|
||||
@property (strong) NSData* publicKey;
|
||||
@property (strong) NSData* body;
|
||||
@end
|
||||
|
||||
@implementation OWSProvisioningProtosProvisionEnvelope
|
||||
|
||||
- (BOOL) hasPublicKey {
|
||||
return !!hasPublicKey_;
|
||||
}
|
||||
- (void) setHasPublicKey:(BOOL) _value_ {
|
||||
hasPublicKey_ = !!_value_;
|
||||
}
|
||||
@synthesize publicKey;
|
||||
- (BOOL) hasBody {
|
||||
return !!hasBody_;
|
||||
}
|
||||
- (void) setHasBody:(BOOL) _value_ {
|
||||
hasBody_ = !!_value_;
|
||||
}
|
||||
@synthesize body;
|
||||
- (instancetype) init {
|
||||
if ((self = [super init])) {
|
||||
self.publicKey = [NSData data];
|
||||
self.body = [NSData data];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
static OWSProvisioningProtosProvisionEnvelope* defaultOWSProvisioningProtosProvisionEnvelopeInstance = nil;
|
||||
+ (void) initialize {
|
||||
if (self == [OWSProvisioningProtosProvisionEnvelope class]) {
|
||||
defaultOWSProvisioningProtosProvisionEnvelopeInstance = [[OWSProvisioningProtosProvisionEnvelope alloc] init];
|
||||
}
|
||||
}
|
||||
+ (instancetype) defaultInstance {
|
||||
return defaultOWSProvisioningProtosProvisionEnvelopeInstance;
|
||||
}
|
||||
- (instancetype) defaultInstance {
|
||||
return defaultOWSProvisioningProtosProvisionEnvelopeInstance;
|
||||
}
|
||||
- (BOOL) isInitialized {
|
||||
return YES;
|
||||
}
|
||||
- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output {
|
||||
if (self.hasPublicKey) {
|
||||
[output writeData:1 value:self.publicKey];
|
||||
}
|
||||
if (self.hasBody) {
|
||||
[output writeData:2 value:self.body];
|
||||
}
|
||||
[self.unknownFields writeToCodedOutputStream:output];
|
||||
}
|
||||
- (SInt32) serializedSize {
|
||||
__block SInt32 size_ = memoizedSerializedSize;
|
||||
if (size_ != -1) {
|
||||
return size_;
|
||||
}
|
||||
|
||||
size_ = 0;
|
||||
if (self.hasPublicKey) {
|
||||
size_ += computeDataSize(1, self.publicKey);
|
||||
}
|
||||
if (self.hasBody) {
|
||||
size_ += computeDataSize(2, self.body);
|
||||
}
|
||||
size_ += self.unknownFields.serializedSize;
|
||||
memoizedSerializedSize = size_;
|
||||
return size_;
|
||||
}
|
||||
+ (OWSProvisioningProtosProvisionEnvelope*) parseFromData:(NSData*) data {
|
||||
return (OWSProvisioningProtosProvisionEnvelope*)[[[OWSProvisioningProtosProvisionEnvelope builder] mergeFromData:data] build];
|
||||
}
|
||||
+ (OWSProvisioningProtosProvisionEnvelope*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
|
||||
return (OWSProvisioningProtosProvisionEnvelope*)[[[OWSProvisioningProtosProvisionEnvelope builder] mergeFromData:data extensionRegistry:extensionRegistry] build];
|
||||
}
|
||||
+ (OWSProvisioningProtosProvisionEnvelope*) parseFromInputStream:(NSInputStream*) input {
|
||||
return (OWSProvisioningProtosProvisionEnvelope*)[[[OWSProvisioningProtosProvisionEnvelope builder] mergeFromInputStream:input] build];
|
||||
}
|
||||
+ (OWSProvisioningProtosProvisionEnvelope*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
|
||||
return (OWSProvisioningProtosProvisionEnvelope*)[[[OWSProvisioningProtosProvisionEnvelope builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build];
|
||||
}
|
||||
+ (OWSProvisioningProtosProvisionEnvelope*) parseFromCodedInputStream:(PBCodedInputStream*) input {
|
||||
return (OWSProvisioningProtosProvisionEnvelope*)[[[OWSProvisioningProtosProvisionEnvelope builder] mergeFromCodedInputStream:input] build];
|
||||
}
|
||||
+ (OWSProvisioningProtosProvisionEnvelope*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
|
||||
return (OWSProvisioningProtosProvisionEnvelope*)[[[OWSProvisioningProtosProvisionEnvelope builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build];
|
||||
}
|
||||
+ (OWSProvisioningProtosProvisionEnvelopeBuilder*) builder {
|
||||
return [[OWSProvisioningProtosProvisionEnvelopeBuilder alloc] init];
|
||||
}
|
||||
+ (OWSProvisioningProtosProvisionEnvelopeBuilder*) builderWithPrototype:(OWSProvisioningProtosProvisionEnvelope*) prototype {
|
||||
return [[OWSProvisioningProtosProvisionEnvelope builder] mergeFrom:prototype];
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) builder {
|
||||
return [OWSProvisioningProtosProvisionEnvelope builder];
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) toBuilder {
|
||||
return [OWSProvisioningProtosProvisionEnvelope builderWithPrototype:self];
|
||||
}
|
||||
- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent {
|
||||
if (self.hasPublicKey) {
|
||||
[output appendFormat:@"%@%@: %@\n", indent, @"publicKey", self.publicKey];
|
||||
}
|
||||
if (self.hasBody) {
|
||||
[output appendFormat:@"%@%@: %@\n", indent, @"body", self.body];
|
||||
}
|
||||
[self.unknownFields writeDescriptionTo:output withIndent:indent];
|
||||
}
|
||||
- (void) storeInDictionary:(NSMutableDictionary *)dictionary {
|
||||
if (self.hasPublicKey) {
|
||||
[dictionary setObject: self.publicKey forKey: @"publicKey"];
|
||||
}
|
||||
if (self.hasBody) {
|
||||
[dictionary setObject: self.body forKey: @"body"];
|
||||
}
|
||||
[self.unknownFields storeInDictionary:dictionary];
|
||||
}
|
||||
- (BOOL) isEqual:(id)other {
|
||||
if (other == self) {
|
||||
return YES;
|
||||
}
|
||||
if (![other isKindOfClass:[OWSProvisioningProtosProvisionEnvelope class]]) {
|
||||
return NO;
|
||||
}
|
||||
OWSProvisioningProtosProvisionEnvelope *otherMessage = other;
|
||||
return
|
||||
self.hasPublicKey == otherMessage.hasPublicKey &&
|
||||
(!self.hasPublicKey || [self.publicKey isEqual:otherMessage.publicKey]) &&
|
||||
self.hasBody == otherMessage.hasBody &&
|
||||
(!self.hasBody || [self.body isEqual:otherMessage.body]) &&
|
||||
(self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields]));
|
||||
}
|
||||
- (NSUInteger) hash {
|
||||
__block NSUInteger hashCode = 7;
|
||||
if (self.hasPublicKey) {
|
||||
hashCode = hashCode * 31 + [self.publicKey hash];
|
||||
}
|
||||
if (self.hasBody) {
|
||||
hashCode = hashCode * 31 + [self.body hash];
|
||||
}
|
||||
hashCode = hashCode * 31 + [self.unknownFields hash];
|
||||
return hashCode;
|
||||
}
|
||||
@end
|
||||
|
||||
@interface OWSProvisioningProtosProvisionEnvelopeBuilder()
|
||||
@property (strong) OWSProvisioningProtosProvisionEnvelope* resultProvisionEnvelope;
|
||||
@end
|
||||
|
||||
@implementation OWSProvisioningProtosProvisionEnvelopeBuilder
|
||||
@synthesize resultProvisionEnvelope;
|
||||
- (instancetype) init {
|
||||
if ((self = [super init])) {
|
||||
self.resultProvisionEnvelope = [[OWSProvisioningProtosProvisionEnvelope alloc] init];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
- (PBGeneratedMessage*) internalGetResult {
|
||||
return resultProvisionEnvelope;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) clear {
|
||||
self.resultProvisionEnvelope = [[OWSProvisioningProtosProvisionEnvelope alloc] init];
|
||||
return self;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) clone {
|
||||
return [OWSProvisioningProtosProvisionEnvelope builderWithPrototype:resultProvisionEnvelope];
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionEnvelope*) defaultInstance {
|
||||
return [OWSProvisioningProtosProvisionEnvelope defaultInstance];
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionEnvelope*) build {
|
||||
[self checkInitialized];
|
||||
return [self buildPartial];
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionEnvelope*) buildPartial {
|
||||
OWSProvisioningProtosProvisionEnvelope* returnMe = resultProvisionEnvelope;
|
||||
self.resultProvisionEnvelope = nil;
|
||||
return returnMe;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) mergeFrom:(OWSProvisioningProtosProvisionEnvelope*) other {
|
||||
if (other == [OWSProvisioningProtosProvisionEnvelope defaultInstance]) {
|
||||
return self;
|
||||
}
|
||||
if (other.hasPublicKey) {
|
||||
[self setPublicKey:other.publicKey];
|
||||
}
|
||||
if (other.hasBody) {
|
||||
[self setBody:other.body];
|
||||
}
|
||||
[self mergeUnknownFields:other.unknownFields];
|
||||
return self;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input {
|
||||
return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]];
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
|
||||
PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields];
|
||||
while (YES) {
|
||||
SInt32 tag = [input readTag];
|
||||
switch (tag) {
|
||||
case 0:
|
||||
[self setUnknownFields:[unknownFields build]];
|
||||
return self;
|
||||
default: {
|
||||
if (![self parseUnknownField:input unknownFields:unknownFields extensionRegistry:extensionRegistry tag:tag]) {
|
||||
[self setUnknownFields:[unknownFields build]];
|
||||
return self;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 10: {
|
||||
[self setPublicKey:[input readData]];
|
||||
break;
|
||||
}
|
||||
case 18: {
|
||||
[self setBody:[input readData]];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
- (BOOL) hasPublicKey {
|
||||
return resultProvisionEnvelope.hasPublicKey;
|
||||
}
|
||||
- (NSData*) publicKey {
|
||||
return resultProvisionEnvelope.publicKey;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) setPublicKey:(NSData*) value {
|
||||
resultProvisionEnvelope.hasPublicKey = YES;
|
||||
resultProvisionEnvelope.publicKey = value;
|
||||
return self;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) clearPublicKey {
|
||||
resultProvisionEnvelope.hasPublicKey = NO;
|
||||
resultProvisionEnvelope.publicKey = [NSData data];
|
||||
return self;
|
||||
}
|
||||
- (BOOL) hasBody {
|
||||
return resultProvisionEnvelope.hasBody;
|
||||
}
|
||||
- (NSData*) body {
|
||||
return resultProvisionEnvelope.body;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) setBody:(NSData*) value {
|
||||
resultProvisionEnvelope.hasBody = YES;
|
||||
resultProvisionEnvelope.body = value;
|
||||
return self;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionEnvelopeBuilder*) clearBody {
|
||||
resultProvisionEnvelope.hasBody = NO;
|
||||
resultProvisionEnvelope.body = [NSData data];
|
||||
return self;
|
||||
}
|
||||
@end
|
||||
|
||||
@interface OWSProvisioningProtosProvisionMessage ()
|
||||
@property (strong) NSData* identityKeyPublic;
|
||||
@property (strong) NSData* identityKeyPrivate;
|
||||
@property (strong) NSString* number;
|
||||
@property (strong) NSString* provisioningCode;
|
||||
@property (strong) NSString* userAgent;
|
||||
@end
|
||||
|
||||
@implementation OWSProvisioningProtosProvisionMessage
|
||||
|
||||
- (BOOL) hasIdentityKeyPublic {
|
||||
return !!hasIdentityKeyPublic_;
|
||||
}
|
||||
- (void) setHasIdentityKeyPublic:(BOOL) _value_ {
|
||||
hasIdentityKeyPublic_ = !!_value_;
|
||||
}
|
||||
@synthesize identityKeyPublic;
|
||||
- (BOOL) hasIdentityKeyPrivate {
|
||||
return !!hasIdentityKeyPrivate_;
|
||||
}
|
||||
- (void) setHasIdentityKeyPrivate:(BOOL) _value_ {
|
||||
hasIdentityKeyPrivate_ = !!_value_;
|
||||
}
|
||||
@synthesize identityKeyPrivate;
|
||||
- (BOOL) hasNumber {
|
||||
return !!hasNumber_;
|
||||
}
|
||||
- (void) setHasNumber:(BOOL) _value_ {
|
||||
hasNumber_ = !!_value_;
|
||||
}
|
||||
@synthesize number;
|
||||
- (BOOL) hasProvisioningCode {
|
||||
return !!hasProvisioningCode_;
|
||||
}
|
||||
- (void) setHasProvisioningCode:(BOOL) _value_ {
|
||||
hasProvisioningCode_ = !!_value_;
|
||||
}
|
||||
@synthesize provisioningCode;
|
||||
- (BOOL) hasUserAgent {
|
||||
return !!hasUserAgent_;
|
||||
}
|
||||
- (void) setHasUserAgent:(BOOL) _value_ {
|
||||
hasUserAgent_ = !!_value_;
|
||||
}
|
||||
@synthesize userAgent;
|
||||
- (instancetype) init {
|
||||
if ((self = [super init])) {
|
||||
self.identityKeyPublic = [NSData data];
|
||||
self.identityKeyPrivate = [NSData data];
|
||||
self.number = @"";
|
||||
self.provisioningCode = @"";
|
||||
self.userAgent = @"";
|
||||
}
|
||||
return self;
|
||||
}
|
||||
static OWSProvisioningProtosProvisionMessage* defaultOWSProvisioningProtosProvisionMessageInstance = nil;
|
||||
+ (void) initialize {
|
||||
if (self == [OWSProvisioningProtosProvisionMessage class]) {
|
||||
defaultOWSProvisioningProtosProvisionMessageInstance = [[OWSProvisioningProtosProvisionMessage alloc] init];
|
||||
}
|
||||
}
|
||||
+ (instancetype) defaultInstance {
|
||||
return defaultOWSProvisioningProtosProvisionMessageInstance;
|
||||
}
|
||||
- (instancetype) defaultInstance {
|
||||
return defaultOWSProvisioningProtosProvisionMessageInstance;
|
||||
}
|
||||
- (BOOL) isInitialized {
|
||||
return YES;
|
||||
}
|
||||
- (void) writeToCodedOutputStream:(PBCodedOutputStream*) output {
|
||||
if (self.hasIdentityKeyPublic) {
|
||||
[output writeData:1 value:self.identityKeyPublic];
|
||||
}
|
||||
if (self.hasIdentityKeyPrivate) {
|
||||
[output writeData:2 value:self.identityKeyPrivate];
|
||||
}
|
||||
if (self.hasNumber) {
|
||||
[output writeString:3 value:self.number];
|
||||
}
|
||||
if (self.hasProvisioningCode) {
|
||||
[output writeString:4 value:self.provisioningCode];
|
||||
}
|
||||
if (self.hasUserAgent) {
|
||||
[output writeString:5 value:self.userAgent];
|
||||
}
|
||||
[self.unknownFields writeToCodedOutputStream:output];
|
||||
}
|
||||
- (SInt32) serializedSize {
|
||||
__block SInt32 size_ = memoizedSerializedSize;
|
||||
if (size_ != -1) {
|
||||
return size_;
|
||||
}
|
||||
|
||||
size_ = 0;
|
||||
if (self.hasIdentityKeyPublic) {
|
||||
size_ += computeDataSize(1, self.identityKeyPublic);
|
||||
}
|
||||
if (self.hasIdentityKeyPrivate) {
|
||||
size_ += computeDataSize(2, self.identityKeyPrivate);
|
||||
}
|
||||
if (self.hasNumber) {
|
||||
size_ += computeStringSize(3, self.number);
|
||||
}
|
||||
if (self.hasProvisioningCode) {
|
||||
size_ += computeStringSize(4, self.provisioningCode);
|
||||
}
|
||||
if (self.hasUserAgent) {
|
||||
size_ += computeStringSize(5, self.userAgent);
|
||||
}
|
||||
size_ += self.unknownFields.serializedSize;
|
||||
memoizedSerializedSize = size_;
|
||||
return size_;
|
||||
}
|
||||
+ (OWSProvisioningProtosProvisionMessage*) parseFromData:(NSData*) data {
|
||||
return (OWSProvisioningProtosProvisionMessage*)[[[OWSProvisioningProtosProvisionMessage builder] mergeFromData:data] build];
|
||||
}
|
||||
+ (OWSProvisioningProtosProvisionMessage*) parseFromData:(NSData*) data extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
|
||||
return (OWSProvisioningProtosProvisionMessage*)[[[OWSProvisioningProtosProvisionMessage builder] mergeFromData:data extensionRegistry:extensionRegistry] build];
|
||||
}
|
||||
+ (OWSProvisioningProtosProvisionMessage*) parseFromInputStream:(NSInputStream*) input {
|
||||
return (OWSProvisioningProtosProvisionMessage*)[[[OWSProvisioningProtosProvisionMessage builder] mergeFromInputStream:input] build];
|
||||
}
|
||||
+ (OWSProvisioningProtosProvisionMessage*) parseFromInputStream:(NSInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
|
||||
return (OWSProvisioningProtosProvisionMessage*)[[[OWSProvisioningProtosProvisionMessage builder] mergeFromInputStream:input extensionRegistry:extensionRegistry] build];
|
||||
}
|
||||
+ (OWSProvisioningProtosProvisionMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input {
|
||||
return (OWSProvisioningProtosProvisionMessage*)[[[OWSProvisioningProtosProvisionMessage builder] mergeFromCodedInputStream:input] build];
|
||||
}
|
||||
+ (OWSProvisioningProtosProvisionMessage*) parseFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
|
||||
return (OWSProvisioningProtosProvisionMessage*)[[[OWSProvisioningProtosProvisionMessage builder] mergeFromCodedInputStream:input extensionRegistry:extensionRegistry] build];
|
||||
}
|
||||
+ (OWSProvisioningProtosProvisionMessageBuilder*) builder {
|
||||
return [[OWSProvisioningProtosProvisionMessageBuilder alloc] init];
|
||||
}
|
||||
+ (OWSProvisioningProtosProvisionMessageBuilder*) builderWithPrototype:(OWSProvisioningProtosProvisionMessage*) prototype {
|
||||
return [[OWSProvisioningProtosProvisionMessage builder] mergeFrom:prototype];
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) builder {
|
||||
return [OWSProvisioningProtosProvisionMessage builder];
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) toBuilder {
|
||||
return [OWSProvisioningProtosProvisionMessage builderWithPrototype:self];
|
||||
}
|
||||
- (void) writeDescriptionTo:(NSMutableString*) output withIndent:(NSString*) indent {
|
||||
if (self.hasIdentityKeyPublic) {
|
||||
[output appendFormat:@"%@%@: %@\n", indent, @"identityKeyPublic", self.identityKeyPublic];
|
||||
}
|
||||
if (self.hasIdentityKeyPrivate) {
|
||||
[output appendFormat:@"%@%@: %@\n", indent, @"identityKeyPrivate", self.identityKeyPrivate];
|
||||
}
|
||||
if (self.hasNumber) {
|
||||
[output appendFormat:@"%@%@: %@\n", indent, @"number", self.number];
|
||||
}
|
||||
if (self.hasProvisioningCode) {
|
||||
[output appendFormat:@"%@%@: %@\n", indent, @"provisioningCode", self.provisioningCode];
|
||||
}
|
||||
if (self.hasUserAgent) {
|
||||
[output appendFormat:@"%@%@: %@\n", indent, @"userAgent", self.userAgent];
|
||||
}
|
||||
[self.unknownFields writeDescriptionTo:output withIndent:indent];
|
||||
}
|
||||
- (void) storeInDictionary:(NSMutableDictionary *)dictionary {
|
||||
if (self.hasIdentityKeyPublic) {
|
||||
[dictionary setObject: self.identityKeyPublic forKey: @"identityKeyPublic"];
|
||||
}
|
||||
if (self.hasIdentityKeyPrivate) {
|
||||
[dictionary setObject: self.identityKeyPrivate forKey: @"identityKeyPrivate"];
|
||||
}
|
||||
if (self.hasNumber) {
|
||||
[dictionary setObject: self.number forKey: @"number"];
|
||||
}
|
||||
if (self.hasProvisioningCode) {
|
||||
[dictionary setObject: self.provisioningCode forKey: @"provisioningCode"];
|
||||
}
|
||||
if (self.hasUserAgent) {
|
||||
[dictionary setObject: self.userAgent forKey: @"userAgent"];
|
||||
}
|
||||
[self.unknownFields storeInDictionary:dictionary];
|
||||
}
|
||||
- (BOOL) isEqual:(id)other {
|
||||
if (other == self) {
|
||||
return YES;
|
||||
}
|
||||
if (![other isKindOfClass:[OWSProvisioningProtosProvisionMessage class]]) {
|
||||
return NO;
|
||||
}
|
||||
OWSProvisioningProtosProvisionMessage *otherMessage = other;
|
||||
return
|
||||
self.hasIdentityKeyPublic == otherMessage.hasIdentityKeyPublic &&
|
||||
(!self.hasIdentityKeyPublic || [self.identityKeyPublic isEqual:otherMessage.identityKeyPublic]) &&
|
||||
self.hasIdentityKeyPrivate == otherMessage.hasIdentityKeyPrivate &&
|
||||
(!self.hasIdentityKeyPrivate || [self.identityKeyPrivate isEqual:otherMessage.identityKeyPrivate]) &&
|
||||
self.hasNumber == otherMessage.hasNumber &&
|
||||
(!self.hasNumber || [self.number isEqual:otherMessage.number]) &&
|
||||
self.hasProvisioningCode == otherMessage.hasProvisioningCode &&
|
||||
(!self.hasProvisioningCode || [self.provisioningCode isEqual:otherMessage.provisioningCode]) &&
|
||||
self.hasUserAgent == otherMessage.hasUserAgent &&
|
||||
(!self.hasUserAgent || [self.userAgent isEqual:otherMessage.userAgent]) &&
|
||||
(self.unknownFields == otherMessage.unknownFields || (self.unknownFields != nil && [self.unknownFields isEqual:otherMessage.unknownFields]));
|
||||
}
|
||||
- (NSUInteger) hash {
|
||||
__block NSUInteger hashCode = 7;
|
||||
if (self.hasIdentityKeyPublic) {
|
||||
hashCode = hashCode * 31 + [self.identityKeyPublic hash];
|
||||
}
|
||||
if (self.hasIdentityKeyPrivate) {
|
||||
hashCode = hashCode * 31 + [self.identityKeyPrivate hash];
|
||||
}
|
||||
if (self.hasNumber) {
|
||||
hashCode = hashCode * 31 + [self.number hash];
|
||||
}
|
||||
if (self.hasProvisioningCode) {
|
||||
hashCode = hashCode * 31 + [self.provisioningCode hash];
|
||||
}
|
||||
if (self.hasUserAgent) {
|
||||
hashCode = hashCode * 31 + [self.userAgent hash];
|
||||
}
|
||||
hashCode = hashCode * 31 + [self.unknownFields hash];
|
||||
return hashCode;
|
||||
}
|
||||
@end
|
||||
|
||||
@interface OWSProvisioningProtosProvisionMessageBuilder()
|
||||
@property (strong) OWSProvisioningProtosProvisionMessage* resultProvisionMessage;
|
||||
@end
|
||||
|
||||
@implementation OWSProvisioningProtosProvisionMessageBuilder
|
||||
@synthesize resultProvisionMessage;
|
||||
- (instancetype) init {
|
||||
if ((self = [super init])) {
|
||||
self.resultProvisionMessage = [[OWSProvisioningProtosProvisionMessage alloc] init];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
- (PBGeneratedMessage*) internalGetResult {
|
||||
return resultProvisionMessage;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) clear {
|
||||
self.resultProvisionMessage = [[OWSProvisioningProtosProvisionMessage alloc] init];
|
||||
return self;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) clone {
|
||||
return [OWSProvisioningProtosProvisionMessage builderWithPrototype:resultProvisionMessage];
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessage*) defaultInstance {
|
||||
return [OWSProvisioningProtosProvisionMessage defaultInstance];
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessage*) build {
|
||||
[self checkInitialized];
|
||||
return [self buildPartial];
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessage*) buildPartial {
|
||||
OWSProvisioningProtosProvisionMessage* returnMe = resultProvisionMessage;
|
||||
self.resultProvisionMessage = nil;
|
||||
return returnMe;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) mergeFrom:(OWSProvisioningProtosProvisionMessage*) other {
|
||||
if (other == [OWSProvisioningProtosProvisionMessage defaultInstance]) {
|
||||
return self;
|
||||
}
|
||||
if (other.hasIdentityKeyPublic) {
|
||||
[self setIdentityKeyPublic:other.identityKeyPublic];
|
||||
}
|
||||
if (other.hasIdentityKeyPrivate) {
|
||||
[self setIdentityKeyPrivate:other.identityKeyPrivate];
|
||||
}
|
||||
if (other.hasNumber) {
|
||||
[self setNumber:other.number];
|
||||
}
|
||||
if (other.hasProvisioningCode) {
|
||||
[self setProvisioningCode:other.provisioningCode];
|
||||
}
|
||||
if (other.hasUserAgent) {
|
||||
[self setUserAgent:other.userAgent];
|
||||
}
|
||||
[self mergeUnknownFields:other.unknownFields];
|
||||
return self;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input {
|
||||
return [self mergeFromCodedInputStream:input extensionRegistry:[PBExtensionRegistry emptyRegistry]];
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) mergeFromCodedInputStream:(PBCodedInputStream*) input extensionRegistry:(PBExtensionRegistry*) extensionRegistry {
|
||||
PBUnknownFieldSetBuilder* unknownFields = [PBUnknownFieldSet builderWithUnknownFields:self.unknownFields];
|
||||
while (YES) {
|
||||
SInt32 tag = [input readTag];
|
||||
switch (tag) {
|
||||
case 0:
|
||||
[self setUnknownFields:[unknownFields build]];
|
||||
return self;
|
||||
default: {
|
||||
if (![self parseUnknownField:input unknownFields:unknownFields extensionRegistry:extensionRegistry tag:tag]) {
|
||||
[self setUnknownFields:[unknownFields build]];
|
||||
return self;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 10: {
|
||||
[self setIdentityKeyPublic:[input readData]];
|
||||
break;
|
||||
}
|
||||
case 18: {
|
||||
[self setIdentityKeyPrivate:[input readData]];
|
||||
break;
|
||||
}
|
||||
case 26: {
|
||||
[self setNumber:[input readString]];
|
||||
break;
|
||||
}
|
||||
case 34: {
|
||||
[self setProvisioningCode:[input readString]];
|
||||
break;
|
||||
}
|
||||
case 42: {
|
||||
[self setUserAgent:[input readString]];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
- (BOOL) hasIdentityKeyPublic {
|
||||
return resultProvisionMessage.hasIdentityKeyPublic;
|
||||
}
|
||||
- (NSData*) identityKeyPublic {
|
||||
return resultProvisionMessage.identityKeyPublic;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) setIdentityKeyPublic:(NSData*) value {
|
||||
resultProvisionMessage.hasIdentityKeyPublic = YES;
|
||||
resultProvisionMessage.identityKeyPublic = value;
|
||||
return self;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) clearIdentityKeyPublic {
|
||||
resultProvisionMessage.hasIdentityKeyPublic = NO;
|
||||
resultProvisionMessage.identityKeyPublic = [NSData data];
|
||||
return self;
|
||||
}
|
||||
- (BOOL) hasIdentityKeyPrivate {
|
||||
return resultProvisionMessage.hasIdentityKeyPrivate;
|
||||
}
|
||||
- (NSData*) identityKeyPrivate {
|
||||
return resultProvisionMessage.identityKeyPrivate;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) setIdentityKeyPrivate:(NSData*) value {
|
||||
resultProvisionMessage.hasIdentityKeyPrivate = YES;
|
||||
resultProvisionMessage.identityKeyPrivate = value;
|
||||
return self;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) clearIdentityKeyPrivate {
|
||||
resultProvisionMessage.hasIdentityKeyPrivate = NO;
|
||||
resultProvisionMessage.identityKeyPrivate = [NSData data];
|
||||
return self;
|
||||
}
|
||||
- (BOOL) hasNumber {
|
||||
return resultProvisionMessage.hasNumber;
|
||||
}
|
||||
- (NSString*) number {
|
||||
return resultProvisionMessage.number;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) setNumber:(NSString*) value {
|
||||
resultProvisionMessage.hasNumber = YES;
|
||||
resultProvisionMessage.number = value;
|
||||
return self;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) clearNumber {
|
||||
resultProvisionMessage.hasNumber = NO;
|
||||
resultProvisionMessage.number = @"";
|
||||
return self;
|
||||
}
|
||||
- (BOOL) hasProvisioningCode {
|
||||
return resultProvisionMessage.hasProvisioningCode;
|
||||
}
|
||||
- (NSString*) provisioningCode {
|
||||
return resultProvisionMessage.provisioningCode;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) setProvisioningCode:(NSString*) value {
|
||||
resultProvisionMessage.hasProvisioningCode = YES;
|
||||
resultProvisionMessage.provisioningCode = value;
|
||||
return self;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) clearProvisioningCode {
|
||||
resultProvisionMessage.hasProvisioningCode = NO;
|
||||
resultProvisionMessage.provisioningCode = @"";
|
||||
return self;
|
||||
}
|
||||
- (BOOL) hasUserAgent {
|
||||
return resultProvisionMessage.hasUserAgent;
|
||||
}
|
||||
- (NSString*) userAgent {
|
||||
return resultProvisionMessage.userAgent;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) setUserAgent:(NSString*) value {
|
||||
resultProvisionMessage.hasUserAgent = YES;
|
||||
resultProvisionMessage.userAgent = value;
|
||||
return self;
|
||||
}
|
||||
- (OWSProvisioningProtosProvisionMessageBuilder*) clearUserAgent {
|
||||
resultProvisionMessage.hasUserAgent = NO;
|
||||
resultProvisionMessage.userAgent = @"";
|
||||
return self;
|
||||
}
|
||||
@end
|
||||
|
||||
|
||||
// @@protoc_insertion_point(global_scope)
|
||||
@ -0,0 +1,23 @@
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
#import "TSYapDatabaseObject.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class YapDatabase;
|
||||
|
||||
@interface OWSReadReceipt : TSYapDatabaseObject
|
||||
|
||||
@property (nonatomic, readonly) NSString *senderId;
|
||||
@property (nonatomic, readonly) uint64_t timestamp;
|
||||
@property (nonatomic, readonly, getter=isValid) BOOL valid;
|
||||
@property (nonatomic, readonly) NSArray<NSString *> *validationErrorMessages;
|
||||
|
||||
- (instancetype)initWithSenderId:(NSString *)senderId timestamp:(uint64_t)timestamp;
|
||||
|
||||
+ (nullable instancetype)firstWithSenderId:(NSString *)senderId timestamp:(uint64_t)timestamp;
|
||||
+ (void)asyncRegisterIndexOnSenderIdAndTimestampWithDatabase:(YapDatabase *)database;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,140 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "OWSReadReceipt.h"
|
||||
#import <YapDatabase/YapDatabase.h>
|
||||
#import <YapDatabase/YapDatabaseConnection.h>
|
||||
#import <YapDatabase/YapDatabaseSecondaryIndex.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
NSString *const OWSReadReceiptIndexOnSenderIdAndTimestamp = @"OWSReadReceiptIndexOnSenderIdAndTimestamp";
|
||||
NSString *const OWSReadReceiptColumnTimestamp = @"timestamp";
|
||||
NSString *const OWSReadReceiptColumnSenderId = @"senderId";
|
||||
|
||||
@implementation OWSReadReceipt
|
||||
|
||||
- (instancetype)initWithSenderId:(NSString *)senderId timestamp:(uint64_t)timestamp;
|
||||
{
|
||||
self = [super init];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
NSMutableArray<NSString *> *validationErrorMessage = [NSMutableArray new];
|
||||
if (!senderId) {
|
||||
[validationErrorMessage addObject:@"Must specify sender id"];
|
||||
}
|
||||
_senderId = senderId;
|
||||
|
||||
if (!timestamp) {
|
||||
[validationErrorMessage addObject:@"Must specify timestamp"];
|
||||
}
|
||||
_timestamp = timestamp;
|
||||
|
||||
_valid = validationErrorMessage.count == 0;
|
||||
_validationErrorMessages = [validationErrorMessage copy];
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (instancetype)initWithCoder:(NSCoder *)decoder
|
||||
{
|
||||
self = [super initWithCoder:decoder];
|
||||
if (!self) {
|
||||
return nil;
|
||||
}
|
||||
|
||||
_valid = YES;
|
||||
_validationErrorMessages = @[];
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
+ (MTLPropertyStorage)storageBehaviorForPropertyWithKey:(NSString *)propertyKey
|
||||
{
|
||||
// Don't store ephemeral properties.
|
||||
if ([propertyKey isEqualToString:@"valid"] || [propertyKey isEqualToString:@"validationErrorMessages"]) {
|
||||
return MTLPropertyStorageNone;
|
||||
} else {
|
||||
return [super storageBehaviorForPropertyWithKey:propertyKey];
|
||||
}
|
||||
}
|
||||
|
||||
+ (void)asyncRegisterIndexOnSenderIdAndTimestampWithDatabase:(YapDatabase *)database
|
||||
{
|
||||
YapDatabaseSecondaryIndexSetup *setup = [YapDatabaseSecondaryIndexSetup new];
|
||||
[setup addColumn:OWSReadReceiptColumnSenderId withType:YapDatabaseSecondaryIndexTypeText];
|
||||
[setup addColumn:OWSReadReceiptColumnTimestamp withType:YapDatabaseSecondaryIndexTypeInteger];
|
||||
|
||||
YapDatabaseSecondaryIndexHandler *handler =
|
||||
[YapDatabaseSecondaryIndexHandler withObjectBlock:^(YapDatabaseReadTransaction *transaction,
|
||||
NSMutableDictionary *dict,
|
||||
NSString *collection,
|
||||
NSString *key,
|
||||
id object) {
|
||||
if ([object isKindOfClass:[OWSReadReceipt class]]) {
|
||||
OWSReadReceipt *readReceipt = (OWSReadReceipt *)object;
|
||||
dict[OWSReadReceiptColumnSenderId] = readReceipt.senderId;
|
||||
dict[OWSReadReceiptColumnTimestamp] = @(readReceipt.timestamp);
|
||||
}
|
||||
}];
|
||||
|
||||
YapDatabaseSecondaryIndex *index = [[YapDatabaseSecondaryIndex alloc] initWithSetup:setup handler:handler];
|
||||
|
||||
[database
|
||||
asyncRegisterExtension:index
|
||||
withName:OWSReadReceiptIndexOnSenderIdAndTimestamp
|
||||
completionBlock:^(BOOL ready) {
|
||||
if (ready) {
|
||||
DDLogDebug(@"%@ Successfully set up extension: %@",
|
||||
self.tag,
|
||||
OWSReadReceiptIndexOnSenderIdAndTimestamp);
|
||||
} else {
|
||||
DDLogError(
|
||||
@"%@ Unable to setup extension: %@", self.tag, OWSReadReceiptIndexOnSenderIdAndTimestamp);
|
||||
}
|
||||
}];
|
||||
}
|
||||
|
||||
+ (nullable instancetype)firstWithSenderId:(NSString *)senderId timestamp:(uint64_t)timestamp
|
||||
{
|
||||
__block OWSReadReceipt *foundReadReceipt;
|
||||
|
||||
NSString *queryFormat = [NSString
|
||||
stringWithFormat:@"WHERE %@ = ? AND %@ = ?", OWSReadReceiptColumnSenderId, OWSReadReceiptColumnTimestamp];
|
||||
YapDatabaseQuery *query = [YapDatabaseQuery queryWithFormat:queryFormat, senderId, @(timestamp)];
|
||||
|
||||
[[self dbReadConnection] readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
|
||||
[[transaction ext:OWSReadReceiptIndexOnSenderIdAndTimestamp]
|
||||
enumerateKeysAndObjectsMatchingQuery:query
|
||||
usingBlock:^(NSString *collection, NSString *key, id object, BOOL *stop) {
|
||||
if (![object isKindOfClass:[OWSReadReceipt class]]) {
|
||||
DDLogError(@"%@ Unexpected object in index: %@", self.tag, object);
|
||||
return;
|
||||
}
|
||||
|
||||
foundReadReceipt = (OWSReadReceipt *)object;
|
||||
*stop = YES;
|
||||
}];
|
||||
}];
|
||||
|
||||
return foundReadReceipt;
|
||||
}
|
||||
|
||||
#pragma mark - Logging
|
||||
|
||||
+ (NSString *)tag
|
||||
{
|
||||
return [NSString stringWithFormat:@"[%@]", self.class];
|
||||
}
|
||||
|
||||
- (NSString *)tag
|
||||
{
|
||||
return self.class.tag;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,15 @@
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
#import "OWSOutgoingSyncMessage.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class OWSReadReceipt;
|
||||
|
||||
@interface OWSReadReceiptsMessage : OWSOutgoingSyncMessage
|
||||
|
||||
- (instancetype)initWithReadReceipts:(NSArray<OWSReadReceipt *> *)readReceipts;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,47 @@
|
||||
//
|
||||
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
|
||||
//
|
||||
|
||||
#import "OWSReadReceiptsMessage.h"
|
||||
#import "OWSReadReceipt.h"
|
||||
#import "OWSSignalServiceProtos.pb.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface OWSReadReceiptsMessage ()
|
||||
|
||||
@property (nonatomic, readonly) NSArray<OWSReadReceipt *> *readReceipts;
|
||||
|
||||
@end
|
||||
|
||||
@implementation OWSReadReceiptsMessage
|
||||
|
||||
- (instancetype)initWithReadReceipts:(NSArray<OWSReadReceipt *> *)readReceipts
|
||||
{
|
||||
self = [super init];
|
||||
if (!self) {
|
||||
return self;
|
||||
}
|
||||
|
||||
_readReceipts = [readReceipts copy];
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (OWSSignalServiceProtosSyncMessageBuilder *)syncMessageBuilder
|
||||
{
|
||||
OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder = [OWSSignalServiceProtosSyncMessageBuilder new];
|
||||
for (OWSReadReceipt *readReceipt in self.readReceipts) {
|
||||
OWSSignalServiceProtosSyncMessageReadBuilder *readProtoBuilder =
|
||||
[OWSSignalServiceProtosSyncMessageReadBuilder new];
|
||||
[readProtoBuilder setSender:readReceipt.senderId];
|
||||
[readProtoBuilder setTimestamp:readReceipt.timestamp];
|
||||
[syncMessageBuilder addRead:[readProtoBuilder build]];
|
||||
}
|
||||
|
||||
return syncMessageBuilder;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@ -0,0 +1,36 @@
|
||||
// Copyright © 2016 Open Whisper Systems. All rights reserved.
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class OWSSignalServiceProtosSyncMessageRead;
|
||||
@class OWSReadReceipt;
|
||||
@class TSIncomingMessage;
|
||||
@class TSStorageManager;
|
||||
|
||||
extern NSString *const OWSReadReceiptsProcessorMarkedMessageAsReadNotification;
|
||||
|
||||
@interface OWSReadReceiptsProcessor : NSObject
|
||||
|
||||
/**
|
||||
* Mark existing messages as read from the given received read receipts.
|
||||
*/
|
||||
- (instancetype)initWithReadReceiptProtos:(NSArray<OWSSignalServiceProtosSyncMessageRead *> *)readReceiptProtos
|
||||
storageManager:(TSStorageManager *)storageManager;
|
||||
|
||||
/**
|
||||
* Mark a new message as read in the rare (but does happen!) case that we receive the read receipt before the message
|
||||
* the read receipt refers to.
|
||||
*/
|
||||
- (instancetype)initWithIncomingMessage:(TSIncomingMessage *)incomingMessage
|
||||
storageManager:(TSStorageManager *)storageManager;
|
||||
|
||||
- (instancetype)initWithReadReceipts:(NSArray<OWSReadReceipt *> *)readReceipts
|
||||
storageManager:(TSStorageManager *)storageManager NS_DESIGNATED_INITIALIZER;
|
||||
|
||||
- (instancetype)init NS_UNAVAILABLE;
|
||||
|
||||
- (void)process;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue