From 1818aea6282a15e04b7cfdf7ea44c5b90893fbbf Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Tue, 13 Jun 2017 15:36:39 -0400
Subject: [PATCH] =?UTF-8?q?[SSK]=20Ensure=20message=20sends=20only=20succe?=
=?UTF-8?q?ed=20or=20fail=20once.=20Add=20=E2=80=9Cgroup=20creation=20fail?=
=?UTF-8?q?ed=E2=80=9D=20error=20message.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
// FREEBIE
---
Podfile | 4 ++--
Podfile.lock | 9 ++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Podfile b/Podfile
index 624665393..55d7dcd08 100644
--- a/Podfile
+++ b/Podfile
@@ -5,8 +5,8 @@ target 'Signal' do
pod 'SocketRocket', :git => 'https://github.com/facebook/SocketRocket.git'
pod 'AxolotlKit', git: 'https://github.com/WhisperSystems/SignalProtocolKit.git'
#pod 'AxolotlKit', path: '../SignalProtocolKit'
- #pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
- pod 'SignalServiceKit', path: '../SignalServiceKit'
+ pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
+ #pod 'SignalServiceKit', path: '../SignalServiceKit'
pod 'OpenSSL'
pod 'JSQMessagesViewController', git: 'https://github.com/WhisperSystems/JSQMessagesViewController.git', branch: 'mkirk/position-edit-menu'
#pod 'JSQMessagesViewController' path: '../JSQMessagesViewController'
diff --git a/Podfile.lock b/Podfile.lock
index 0f8ef4e41..30fb92a64 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -114,7 +114,7 @@ DEPENDENCIES:
- OpenSSL
- PureLayout
- Reachability
- - SignalServiceKit (from `../SignalServiceKit`)
+ - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`)
- SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
EXTERNAL SOURCES:
@@ -124,7 +124,7 @@ EXTERNAL SOURCES:
:branch: mkirk/position-edit-menu
:git: https://github.com/WhisperSystems/JSQMessagesViewController.git
SignalServiceKit:
- :path: ../SignalServiceKit
+ :git: https://github.com/WhisperSystems/SignalServiceKit.git
SocketRocket:
:git: https://github.com/facebook/SocketRocket.git
@@ -135,6 +135,9 @@ CHECKOUT OPTIONS:
JSQMessagesViewController:
:commit: 7054e4b13ee5bcd6d524adb6dc9a726e8c466308
:git: https://github.com/WhisperSystems/JSQMessagesViewController.git
+ SignalServiceKit:
+ :commit: 1f1410ffaedd2204f0f84ef009a8b0fb76785717
+ :git: https://github.com/WhisperSystems/SignalServiceKit.git
SocketRocket:
:commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf
:git: https://github.com/facebook/SocketRocket.git
@@ -161,6 +164,6 @@ SPEC CHECKSUMS:
UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
YapDatabase: cd911121580ff16675f65ad742a9eb0ab4d9e266
-PODFILE CHECKSUM: 6f9ef5d9fa17469569e127a9f5719dafa11631b9
+PODFILE CHECKSUM: 48e80d7f1e049bbf544a689fdfdf33e8196c640a
COCOAPODS: 1.2.1