Skip to content

Commit d572103

Browse files
davidchilesdavidchiles
committed
Merge remote-tracking branch 'origin/develop' into push
2 parents b47e682 + e1c48b3 commit d572103

63 files changed

Lines changed: 614 additions & 466 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
[submodule "Submodules/xmpp-server-list"]
2323
path = Submodules/xmpp-server-list
2424
url = git@github.com:ChatSecure/xmpp-server-list.git
25+
[submodule "Submodules/ParkedTextField"]
26+
path = Submodules/ParkedTextField
27+
url = git@github.com:chrisballinger/ParkedTextField.git
2528
[submodule "Submodules/ChatSecure-Push-iOS"]
2629
path = Submodules/ChatSecure-Push-iOS
2730
url = git@github.com:ChatSecure/ChatSecure-Push-iOS.git

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode6.4
2+
osx_image: xcode7
33

44
# Handle git submodules yourself
55
# http://stackoverflow.com/a/24600210/805882

‎ChatSecure.xcodeproj/project.pbxproj‎

Lines changed: 28 additions & 13 deletions
Large diffs are not rendered by default.

‎ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure.xcscheme‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0610"
3+
LastUpgradeVersion = "0700"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40+
buildConfiguration = "Debug"
4041
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4142
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42-
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
43+
shouldUseLaunchSchemeArgsEnv = "YES">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
@@ -62,15 +62,18 @@
6262
ReferencedContainer = "container:ChatSecure.xcodeproj">
6363
</BuildableReference>
6464
</MacroExpansion>
65+
<AdditionalOptions>
66+
</AdditionalOptions>
6567
</TestAction>
6668
<LaunchAction
69+
buildConfiguration = "Debug"
6770
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6871
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
6972
launchStyle = "0"
7073
useCustomWorkingDirectory = "NO"
71-
buildConfiguration = "Debug"
7274
ignoresPersistentStateOnLaunch = "NO"
7375
debugDocumentVersioning = "YES"
76+
debugServiceExtension = "internal"
7477
allowLocationSimulation = "YES">
7578
<BuildableProductRunnable
7679
runnableDebuggingMode = "0">
@@ -86,10 +89,10 @@
8689
</AdditionalOptions>
8790
</LaunchAction>
8891
<ProfileAction
92+
buildConfiguration = "Release"
8993
shouldUseLaunchSchemeArgsEnv = "YES"
9094
savedToolIdentifier = ""
9195
useCustomWorkingDirectory = "NO"
92-
buildConfiguration = "Release"
9396
debugDocumentVersioning = "YES">
9497
<BuildableProductRunnable
9598
runnableDebuggingMode = "0">

‎ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureTests.xcscheme‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0630"
3+
LastUpgradeVersion = "0700"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
<TestableReference
3232
skipped = "NO">
@@ -48,15 +48,18 @@
4848
ReferencedContainer = "container:ChatSecure.xcodeproj">
4949
</BuildableReference>
5050
</MacroExpansion>
51+
<AdditionalOptions>
52+
</AdditionalOptions>
5153
</TestAction>
5254
<LaunchAction
55+
buildConfiguration = "Debug"
5356
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5457
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
5558
launchStyle = "0"
5659
useCustomWorkingDirectory = "NO"
57-
buildConfiguration = "Debug"
5860
ignoresPersistentStateOnLaunch = "NO"
5961
debugDocumentVersioning = "YES"
62+
debugServiceExtension = "internal"
6063
allowLocationSimulation = "YES">
6164
<MacroExpansion>
6265
<BuildableReference
@@ -71,10 +74,10 @@
7174
</AdditionalOptions>
7275
</LaunchAction>
7376
<ProfileAction
77+
buildConfiguration = "Release"
7478
shouldUseLaunchSchemeArgsEnv = "YES"
7579
savedToolIdentifier = ""
7680
useCustomWorkingDirectory = "NO"
77-
buildConfiguration = "Release"
7881
debugDocumentVersioning = "YES">
7982
<MacroExpansion>
8083
<BuildableReference

‎ChatSecure.xcworkspace/xcshareddata/ChatSecure.xcscmblueprint‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
"98D05BCBC40AE5315578EEE7C186D3063CCA59C3" : 0,
88
"1C75F1C5CFCB95B3702F6F632FA05ED5244B519E" : 0,
99
"9894A09246C3858F99AD97DCE53FE014CFC07C96" : 0,
10+
"0667158F825A93D2AA325B5DCB5737C5DE9CB558" : 0,
1011
"B775552D1BBEEADC6A0BBB2FD048B6AA26CB309D" : 0,
1112
"DAAB2C887EFA8AB12BAB622BBAFD20531F9A3784" : 0,
12-
"0667158F825A93D2AA325B5DCB5737C5DE9CB558" : 0,
1313
"E2E339EC05FF99AF5ECAE62EDBC78398DA1111C6" : 0,
14-
"8D256B418BF7466F1E7306EA36B44A4A04C31B48" : 0,
14+
"6629762BA356A4C56436558F8BA2A9102478B1C6" : 0,
1515
"425D736B25093B4D45BF64638604863B9D31F2C1" : 0,
16+
"8D256B418BF7466F1E7306EA36B44A4A04C31B48" : 0,
17+
"A9EA2EFC6B3324DC133DBB5B2F093519479E5635" : 0,
1618
"65A79C2919A5538250064F3C245A290D7BFC656E" : 0,
1719
"285D543319EEB38B059014F34D43A79D66C1ECDC" : 0,
1820
"2D31E58E12E928BB18019A2FA755DD659EB4E709" : 0
@@ -22,18 +24,20 @@
2224
"98D05BCBC40AE5315578EEE7C186D3063CCA59C3" : "ChatSecure-iOS\/Submodules\/CPAProxy",
2325
"1C75F1C5CFCB95B3702F6F632FA05ED5244B519E" : "chatsecure-iosPods\/CocoaAsyncSocket",
2426
"9894A09246C3858F99AD97DCE53FE014CFC07C96" : "chatsecure-iosSubmodules\/OnionKit",
27+
"0667158F825A93D2AA325B5DCB5737C5DE9CB558" : "ChatSecure-iOS\/Submodules\/IOCipher",
2528
"B775552D1BBEEADC6A0BBB2FD048B6AA26CB309D" : "chatsecure-iosSubmodules\/XMPPFramework",
2629
"DAAB2C887EFA8AB12BAB622BBAFD20531F9A3784" : "chatsecure-ios\/Submodules\/YapDatabase",
27-
"0667158F825A93D2AA325B5DCB5737C5DE9CB558" : "ChatSecure-iOS\/Submodules\/IOCipher",
2830
"E2E339EC05FF99AF5ECAE62EDBC78398DA1111C6" : "chatsecure-iosPods\/SIAlertView",
29-
"8D256B418BF7466F1E7306EA36B44A4A04C31B48" : "chatsecure-iosPods\/AFOAuth2Client",
31+
"6629762BA356A4C56436558F8BA2A9102478B1C6" : "ChatSecure-iOS\/Submodules\/xmpp-server-list\/",
3032
"425D736B25093B4D45BF64638604863B9D31F2C1" : "chatsecure-iosSubmodules\/OTRKit",
33+
"8D256B418BF7466F1E7306EA36B44A4A04C31B48" : "chatsecure-iosPods\/AFOAuth2Client",
34+
"A9EA2EFC6B3324DC133DBB5B2F093519479E5635" : "ChatSecure-iOS\/Submodules\/ParkedTextField\/",
3135
"65A79C2919A5538250064F3C245A290D7BFC656E" : "chatsecure-ios",
3236
"285D543319EEB38B059014F34D43A79D66C1ECDC" : "chatsecure-iosPods\/uservoice-iphone-sdk",
3337
"2D31E58E12E928BB18019A2FA755DD659EB4E709" : "chatsecure-iosSubmodules\/ProxyKit"
3438
},
3539
"DVTSourceControlWorkspaceBlueprintNameKey" : "ChatSecure",
36-
"DVTSourceControlWorkspaceBlueprintVersion" : 203,
40+
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
3741
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "ChatSecure.xcworkspace",
3842
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
3943
{
@@ -66,6 +70,11 @@
6670
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
6771
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "65A79C2919A5538250064F3C245A290D7BFC656E"
6872
},
73+
{
74+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:ChatSecure\/xmpp-server-list.git",
75+
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
76+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "6629762BA356A4C56436558F8BA2A9102478B1C6"
77+
},
6978
{
7079
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:ChatSecure\/AFOAuth2Client.git",
7180
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
@@ -81,6 +90,11 @@
8190
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
8291
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "98D05BCBC40AE5315578EEE7C186D3063CCA59C3"
8392
},
93+
{
94+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:chrisballinger\/ParkedTextField.git",
95+
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
96+
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "A9EA2EFC6B3324DC133DBB5B2F093519479E5635"
97+
},
8498
{
8599
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:ChatSecure\/XMPPFramework.git",
86100
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",

‎ChatSecure/Classes/Controllers/OTRAccountsManager.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
#import "OTRConstants.h"
2626
#import "OTRProtocolManager.h"
2727
#import "OTRDatabaseManager.h"
28-
#import "YapDatabaseConnection.h"
29-
#import "YapDatabaseTransaction.h"
28+
@import YapDatabase;
29+
3030
#import "OTRLog.h"
3131
#import "OTRAccount.h"
3232

‎ChatSecure/Classes/Controllers/OTRDatabaseManager.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88

99
#import <Foundation/Foundation.h>
1010

11-
#import "YapDatabaseConnection.h"
12-
#import "YapDatabase.h"
13-
#import "YapDatabaseTransaction.h"
11+
@import YapDatabase;
12+
1413
#import "OTRMediaServer.h"
1514
#import "OTRMediaFileManager.h"
1615

‎ChatSecure/Classes/Controllers/OTRDatabaseManager.m‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@
1111
#import "OTRManagedAccount.h"
1212
#import "OTREncryptionManager.h"
1313
#import "OTRLog.h"
14-
#import "YapDatabaseRelationship.h"
1514
#import "OTRDatabaseView.h"
1615
#import <SSKeychain/SSKeychain.h>
1716
#import "OTRConstants.h"
18-
#import "YapDatabaseSecondaryIndexSetup.h"
19-
#import "YapDatabaseSecondaryIndex.h"
2017

2118
#import "OTRManagedOscarAccount.h"
2219
#import "OTRXMPPAccount.h"

‎ChatSecure/Classes/Controllers/OTRDatabaseView.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//
88

99
#import <Foundation/Foundation.h>
10-
#import "YapDatabaseViewMappings.h"
11-
#import "YapDatabaseView.h"
10+
@import YapDatabase;
11+
1212

1313
//Extension Strings
1414
extern NSString *OTRConversationDatabaseViewExtensionName;

0 commit comments

Comments
 (0)