From c7ee430790898110f575adbda5bf34000b32242f Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Mon, 12 Sep 2016 10:09:30 -0400
Subject: [PATCH] Support for receiving voice messages from android (aac)
 (#1321)

We already support receiving them from Desktop (mp3)

Plus some Xcode 8 turds in the image assets.

// FREEBIE
---
 Podfile                                       |  3 ++-
 Podfile.lock                                  |  7 +++----
 .../AppIcon.appiconset/Contents.json          | 20 +++++++++++++++++++
 Signal/Signal-Info.plist                      |  4 ++--
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/Podfile b/Podfile
index 9928bc2de..10ec6ea81 100644
--- a/Podfile
+++ b/Podfile
@@ -3,7 +3,8 @@ source 'https://github.com/CocoaPods/Specs.git'
 
 target 'Signal' do
     pod 'SocketRocket',               :git => 'https://github.com/facebook/SocketRocket.git'
-    pod 'SignalServiceKit',           :git => 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'dt'
+    pod 'SignalServiceKit',           :git => 'https://github.com/WhisperSystems/SignalServiceKit.git'
+    #pod 'SignalServiceKit',           path: '../SignalServiceKit'
     pod 'OpenSSL',                    '~> 1.0.208'
     pod 'PastelogKit',                '~> 1.3'
     pod 'FFCircularProgressView',     '~> 0.5'
diff --git a/Podfile.lock b/Podfile.lock
index d2d881cac..5873a2f98 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -119,19 +119,18 @@ DEPENDENCIES:
   - OpenSSL (~> 1.0.208)
   - PastelogKit (~> 1.3)
   - SCWaveformView (~> 1.0)
-  - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `dt`)
+  - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`)
   - SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
 
 EXTERNAL SOURCES:
   SignalServiceKit:
-    :branch: dt
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :git: https://github.com/facebook/SocketRocket.git
 
 CHECKOUT OPTIONS:
   SignalServiceKit:
-    :commit: 0933b921289ded4bb0761ce4176a2004aeab4dd5
+    :commit: d802918603158e50987a2a4c74d4174cdc0f72d6
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 8096fef47d582bff8ae3758c9ae7af1d55ea53d6
@@ -162,6 +161,6 @@ SPEC CHECKSUMS:
   UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
   YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
 
-PODFILE CHECKSUM: bcac03a0ce180ba50c3467068062f8e55e11e778
+PODFILE CHECKSUM: 547945066e021c3aa0bd6bea018af5e4769a3113
 
 COCOAPODS: 1.0.1
diff --git a/Signal/Images.xcassets/AppIcon.appiconset/Contents.json b/Signal/Images.xcassets/AppIcon.appiconset/Contents.json
index 710c64c90..d0f940243 100644
--- a/Signal/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Signal/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "size" : "29x29",
       "idiom" : "iphone",
@@ -42,6 +52,16 @@
       "filename" : "launch-icon@3x.png",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "size" : "29x29",
       "idiom" : "ipad",
diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist
index d7c26624b..3c439dcf1 100644
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.0</string>
+	<string>2.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -38,7 +38,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.5.0.7</string>
+	<string>2.6.0.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LOGS_EMAIL</key>