diff --git a/Podfile b/Podfile
index 650740219..8d603ed46 100644
--- a/Podfile
+++ b/Podfile
@@ -6,14 +6,14 @@ link_with ["Signal", "SignalTests"]
pod 'OpenSSL', '~> 1.0.201'
pod 'libPhoneNumber-iOS', '~> 0.8.2'
-pod 'AxolotlKit', '~> 0.6.2'
+pod 'AxolotlKit', '~> 0.6.3'
pod 'PastelogKit', '~> 1.2'
pod 'TwistedOakCollapsingFutures','~> 1.0'
pod 'AFNetworking', '~> 2.5.3'
pod 'Mantle', '~> 2.0'
pod 'FFCircularProgressView', '>= 0.1'
pod 'SCWaveformView', '~> 1.0'
-pod 'YapDatabase/SQLCipher'
+pod 'YapDatabase/SQLCipher', '2.6.1'
pod 'SSKeychain'
pod 'DJWActionSheet'
diff --git a/Podfile.lock b/Podfile.lock
index 8658e9b47..be4b90c65 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -1,5 +1,5 @@
PODS:
- - 25519 (1.8)
+ - 25519 (1.9)
- AFNetworking (2.5.3):
- AFNetworking/NSURLConnection (= 2.5.3)
- AFNetworking/NSURLSession (= 2.5.3)
@@ -22,8 +22,8 @@ PODS:
- AFNetworking/NSURLConnection
- AFNetworking/NSURLSession
- APDropDownNavToolbar (1.1)
- - AxolotlKit (0.6.2):
- - 25519 (~> 1.8)
+ - AxolotlKit (0.6.3):
+ - 25519 (~> 1.9)
- HKDFKit (~> 0.0.3)
- ProtocolBuffers (~> 1.9.7)
- CocoaLumberjack (1.9.2):
@@ -65,7 +65,7 @@ DEPENDENCIES:
- AFNetworking (~> 2.5.3)
- APDropDownNavToolbar (from `https://github.com/corbett/APDropDownNavToolbar.git`,
branch `master`)
- - AxolotlKit (~> 0.6.2)
+ - AxolotlKit (~> 0.6.3)
- DJWActionSheet
- FFCircularProgressView (>= 0.1)
- JSQMessagesViewController (from `https://github.com/WhisperSystems/JSQMessagesViewController`,
@@ -80,7 +80,7 @@ DEPENDENCIES:
- SSKeychain
- TwistedOakCollapsingFutures (~> 1.0)
- UICKeyChainStore (from `Podspecs/UICKeyChainStore.podspec`)
- - YapDatabase/SQLCipher
+ - YapDatabase/SQLCipher (= 2.6.1)
EXTERNAL SOURCES:
APDropDownNavToolbar:
@@ -107,10 +107,10 @@ CHECKOUT OPTIONS:
:git: https://github.com/FredericJacobs/SocketRocket.git
SPEC CHECKSUMS:
- '25519': f4e131763c4e3551951d27ff1af258a93cd94f3e
+ '25519': 64b9ee595df81056693072b0a84246483988afac
AFNetworking: e1d86c2a96bb5d2e7408da36149806706ee122fe
APDropDownNavToolbar: 5d0c3f363208543d20e86ddb4630927c28cdfd4b
- AxolotlKit: 630fd578a69223b29579b300bdfd88f90d83218a
+ AxolotlKit: 1e4afc7ed1d0c724888f1d986c032976436f8bef
CocoaLumberjack: 628fca2e88ef06f7cf6817309aa405f325d9a6fa
DJWActionSheet: 2fe54b1298a7f0fe44462233752c76a530e0cd80
FFCircularProgressView: 683a4ab1e1bd613246a3dffa61503ffdebcde8d8
@@ -118,7 +118,7 @@ SPEC CHECKSUMS:
JSQMessagesViewController: 9fd7e9ac96e9fc91f2deca86928e2cc916aeebaa
JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
libPhoneNumber-iOS: dbfc7b4128510a4955df3e5a6f125393fc9ebc2f
- Mantle: 17de73ef929db2234d76fde2aacfb89ab11c61e8
+ Mantle: d7c75b6fb789b20f7ae30cd0d09435fe545896ff
OpenSSL: 4e990d04b14015c49c800c400b86ae44a4818a5c
PastelogKit: c73795b8c0bbf33ea45d3b6a5eabb373be3d5955
ProtocolBuffers: 9a4a171c0c7cc8f21dd29aeca4f9ac775d84a880
diff --git a/Pods b/Pods
index 733706c8f..642380430 160000
--- a/Pods
+++ b/Pods
@@ -1 +1 @@
-Subproject commit 733706c8f65bd25bd3b1ba33b1a61076dcca6a9b
+Subproject commit 642380430d7d5e1704c9a492312e76162e5e4c28
diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist
index 88d51f0f3..549f5778d 100644
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@@ -40,7 +40,7 @@
CFBundleVersion
- 2.0.22
+ 2.0.35
LOGS_EMAIL
support@whispersystems.org
LOGS_URL
diff --git a/Signal/translations/ar.lproj/Localizable.strings b/Signal/translations/ar.lproj/Localizable.strings
index 003418704..11ec97f86 100644
Binary files a/Signal/translations/ar.lproj/Localizable.strings and b/Signal/translations/ar.lproj/Localizable.strings differ
diff --git a/Signal/translations/az_AZ.lproj/Localizable.strings b/Signal/translations/az_AZ.lproj/Localizable.strings
index e0a4e380f..dec976c37 100644
Binary files a/Signal/translations/az_AZ.lproj/Localizable.strings and b/Signal/translations/az_AZ.lproj/Localizable.strings differ
diff --git a/Signal/translations/bg_BG.lproj/Localizable.strings b/Signal/translations/bg_BG.lproj/Localizable.strings
index d78d659bc..9f2a71eaa 100644
Binary files a/Signal/translations/bg_BG.lproj/Localizable.strings and b/Signal/translations/bg_BG.lproj/Localizable.strings differ
diff --git a/Signal/translations/bs.lproj/Localizable.strings b/Signal/translations/bs.lproj/Localizable.strings
index 17262d2a7..506a0f509 100644
Binary files a/Signal/translations/bs.lproj/Localizable.strings and b/Signal/translations/bs.lproj/Localizable.strings differ
diff --git a/Signal/translations/ca.lproj/Localizable.strings b/Signal/translations/ca.lproj/Localizable.strings
index 4cc1fbe21..33088f5f5 100644
Binary files a/Signal/translations/ca.lproj/Localizable.strings and b/Signal/translations/ca.lproj/Localizable.strings differ
diff --git a/Signal/translations/cs.lproj/Localizable.strings b/Signal/translations/cs.lproj/Localizable.strings
index a6b356449..3c9b2752e 100644
Binary files a/Signal/translations/cs.lproj/Localizable.strings and b/Signal/translations/cs.lproj/Localizable.strings differ
diff --git a/Signal/translations/da.lproj/Localizable.strings b/Signal/translations/da.lproj/Localizable.strings
index 1af89fa0a..47316d799 100644
Binary files a/Signal/translations/da.lproj/Localizable.strings and b/Signal/translations/da.lproj/Localizable.strings differ
diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings
index 9b4d2c14a..7fa276f5a 100644
Binary files a/Signal/translations/de.lproj/Localizable.strings and b/Signal/translations/de.lproj/Localizable.strings differ
diff --git a/Signal/translations/el_GR.lproj/Localizable.strings b/Signal/translations/el_GR.lproj/Localizable.strings
index b00a1b310..4b538e98b 100644
Binary files a/Signal/translations/el_GR.lproj/Localizable.strings and b/Signal/translations/el_GR.lproj/Localizable.strings differ
diff --git a/Signal/translations/es.lproj/Localizable.strings b/Signal/translations/es.lproj/Localizable.strings
index 540c607ac..720e07cd0 100644
Binary files a/Signal/translations/es.lproj/Localizable.strings and b/Signal/translations/es.lproj/Localizable.strings differ
diff --git a/Signal/translations/et_EE.lproj/Localizable.strings b/Signal/translations/et_EE.lproj/Localizable.strings
index f0ac6226d..de5351703 100644
Binary files a/Signal/translations/et_EE.lproj/Localizable.strings and b/Signal/translations/et_EE.lproj/Localizable.strings differ
diff --git a/Signal/translations/fa.lproj/Localizable.strings b/Signal/translations/fa.lproj/Localizable.strings
index f0ac6226d..de5351703 100644
Binary files a/Signal/translations/fa.lproj/Localizable.strings and b/Signal/translations/fa.lproj/Localizable.strings differ
diff --git a/Signal/translations/fi.lproj/Localizable.strings b/Signal/translations/fi.lproj/Localizable.strings
index 0e0dd12ab..27d992383 100644
Binary files a/Signal/translations/fi.lproj/Localizable.strings and b/Signal/translations/fi.lproj/Localizable.strings differ
diff --git a/Signal/translations/fil.lproj/Localizable.strings b/Signal/translations/fil.lproj/Localizable.strings
index e51b68402..803e85982 100644
Binary files a/Signal/translations/fil.lproj/Localizable.strings and b/Signal/translations/fil.lproj/Localizable.strings differ
diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings
index 2a4ba813f..3b4dcd834 100644
Binary files a/Signal/translations/fr.lproj/Localizable.strings and b/Signal/translations/fr.lproj/Localizable.strings differ
diff --git a/Signal/translations/he.lproj/Localizable.strings b/Signal/translations/he.lproj/Localizable.strings
index 27eef97b2..04806eb09 100644
Binary files a/Signal/translations/he.lproj/Localizable.strings and b/Signal/translations/he.lproj/Localizable.strings differ
diff --git a/Signal/translations/hi_IN.lproj/Localizable.strings b/Signal/translations/hi_IN.lproj/Localizable.strings
index 1c66557b5..71c466949 100644
Binary files a/Signal/translations/hi_IN.lproj/Localizable.strings and b/Signal/translations/hi_IN.lproj/Localizable.strings differ
diff --git a/Signal/translations/hr.lproj/Localizable.strings b/Signal/translations/hr.lproj/Localizable.strings
index 0be10daf0..9dcc75a12 100644
Binary files a/Signal/translations/hr.lproj/Localizable.strings and b/Signal/translations/hr.lproj/Localizable.strings differ
diff --git a/Signal/translations/hu.lproj/Localizable.strings b/Signal/translations/hu.lproj/Localizable.strings
index d00796cca..97c8aebf8 100644
Binary files a/Signal/translations/hu.lproj/Localizable.strings and b/Signal/translations/hu.lproj/Localizable.strings differ
diff --git a/Signal/translations/id_ID.lproj/Localizable.strings b/Signal/translations/id_ID.lproj/Localizable.strings
index f0ac6226d..de5351703 100644
Binary files a/Signal/translations/id_ID.lproj/Localizable.strings and b/Signal/translations/id_ID.lproj/Localizable.strings differ
diff --git a/Signal/translations/it_IT.lproj/Localizable.strings b/Signal/translations/it_IT.lproj/Localizable.strings
index 699be669b..ce2b8ad51 100644
Binary files a/Signal/translations/it_IT.lproj/Localizable.strings and b/Signal/translations/it_IT.lproj/Localizable.strings differ
diff --git a/Signal/translations/ja_JP.lproj/Localizable.strings b/Signal/translations/ja_JP.lproj/Localizable.strings
index 56ff48ee9..dcce98c62 100644
Binary files a/Signal/translations/ja_JP.lproj/Localizable.strings and b/Signal/translations/ja_JP.lproj/Localizable.strings differ
diff --git a/Signal/translations/ko_KR.lproj/Localizable.strings b/Signal/translations/ko_KR.lproj/Localizable.strings
index 2ae4f175c..af818f085 100644
Binary files a/Signal/translations/ko_KR.lproj/Localizable.strings and b/Signal/translations/ko_KR.lproj/Localizable.strings differ
diff --git a/Signal/translations/lv.lproj/Localizable.strings b/Signal/translations/lv.lproj/Localizable.strings
index f2318e78e..2106d278e 100644
Binary files a/Signal/translations/lv.lproj/Localizable.strings and b/Signal/translations/lv.lproj/Localizable.strings differ
diff --git a/Signal/translations/nb_NO.lproj/Localizable.strings b/Signal/translations/nb_NO.lproj/Localizable.strings
index 639e5bde0..4a00c6db4 100644
Binary files a/Signal/translations/nb_NO.lproj/Localizable.strings and b/Signal/translations/nb_NO.lproj/Localizable.strings differ
diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings
index 524e72faf..c87169cd6 100644
Binary files a/Signal/translations/nl.lproj/Localizable.strings and b/Signal/translations/nl.lproj/Localizable.strings differ
diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings
index 59d194893..229d8075a 100644
Binary files a/Signal/translations/pl.lproj/Localizable.strings and b/Signal/translations/pl.lproj/Localizable.strings differ
diff --git a/Signal/translations/pt_BR.lproj/Localizable.strings b/Signal/translations/pt_BR.lproj/Localizable.strings
index 1c90ada8e..bd4e2e0c7 100644
Binary files a/Signal/translations/pt_BR.lproj/Localizable.strings and b/Signal/translations/pt_BR.lproj/Localizable.strings differ
diff --git a/Signal/translations/pt_PT.lproj/Localizable.strings b/Signal/translations/pt_PT.lproj/Localizable.strings
index 41461ad2d..b267664bf 100644
Binary files a/Signal/translations/pt_PT.lproj/Localizable.strings and b/Signal/translations/pt_PT.lproj/Localizable.strings differ
diff --git a/Signal/translations/ro.lproj/Localizable.strings b/Signal/translations/ro.lproj/Localizable.strings
index e865e8018..2b78418b1 100644
Binary files a/Signal/translations/ro.lproj/Localizable.strings and b/Signal/translations/ro.lproj/Localizable.strings differ
diff --git a/Signal/translations/ru.lproj/Localizable.strings b/Signal/translations/ru.lproj/Localizable.strings
index 07c4b8216..08ab55712 100644
Binary files a/Signal/translations/ru.lproj/Localizable.strings and b/Signal/translations/ru.lproj/Localizable.strings differ
diff --git a/Signal/translations/sl.lproj/Localizable.strings b/Signal/translations/sl.lproj/Localizable.strings
index 244ea387c..07392154f 100644
Binary files a/Signal/translations/sl.lproj/Localizable.strings and b/Signal/translations/sl.lproj/Localizable.strings differ
diff --git a/Signal/translations/sv_SE.lproj/Localizable.strings b/Signal/translations/sv_SE.lproj/Localizable.strings
index b6deb2908..7b1ef1997 100644
Binary files a/Signal/translations/sv_SE.lproj/Localizable.strings and b/Signal/translations/sv_SE.lproj/Localizable.strings differ
diff --git a/Signal/translations/th_TH.lproj/Localizable.strings b/Signal/translations/th_TH.lproj/Localizable.strings
index 42db6b4ed..72e0d20a1 100644
Binary files a/Signal/translations/th_TH.lproj/Localizable.strings and b/Signal/translations/th_TH.lproj/Localizable.strings differ
diff --git a/Signal/translations/tr_TR.lproj/Localizable.strings b/Signal/translations/tr_TR.lproj/Localizable.strings
index fff286c26..d2651163a 100644
Binary files a/Signal/translations/tr_TR.lproj/Localizable.strings and b/Signal/translations/tr_TR.lproj/Localizable.strings differ
diff --git a/Signal/translations/uk.lproj/Localizable.strings b/Signal/translations/uk.lproj/Localizable.strings
index f0ac6226d..de5351703 100644
Binary files a/Signal/translations/uk.lproj/Localizable.strings and b/Signal/translations/uk.lproj/Localizable.strings differ
diff --git a/Signal/translations/zh_CN.lproj/Localizable.strings b/Signal/translations/zh_CN.lproj/Localizable.strings
index 23046f519..cabe9248e 100644
Binary files a/Signal/translations/zh_CN.lproj/Localizable.strings and b/Signal/translations/zh_CN.lproj/Localizable.strings differ