Merge pull request #1138 from WhisperSystems/test_branch

Closing some backlog
9 years ago · 8abfc3e2b3
parent bd377e65af 4034baedb9
commit 8abfc3e2b3
19 changed files with 118 additions and 67 deletions
--- a/2
+++ b/2
@ -2,7 +2,7 @@ platform :ios, '8.0'
 source 'https://github.com/CocoaPods/Specs.git'
 link_with ["Signal", "SignalTests"]

-pod 'TextSecureKit',              :git => 'https://github.com/WhisperSystems/TextSecureKit', :branch => 'master'
+pod 'SignalServiceKit',              :git => 'https://github.com/WhisperSystems/SignalServiceKit.git', :branch => 'test'
 pod 'OpenSSL',                    '~> 1.0.205'
 pod 'PastelogKit',                '~> 1.3'
 pod 'FFCircularProgressView',     '~> 0.5'
--- a/Podfile.lock
+++ b/Podfile.lock
@ -1,19 +1,19 @@
 PODS:
  - 25519 (2.0.2)
-  - AFNetworking (3.0.4):
-    - AFNetworking/NSURLSession (= 3.0.4)
-    - AFNetworking/Reachability (= 3.0.4)
-    - AFNetworking/Security (= 3.0.4)
-    - AFNetworking/Serialization (= 3.0.4)
-    - AFNetworking/UIKit (= 3.0.4)
-  - AFNetworking/NSURLSession (3.0.4):
+  - 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.0.4)
-  - AFNetworking/Security (3.0.4)
-  - AFNetworking/Serialization (3.0.4)
-  - AFNetworking/UIKit (3.0.4):
+  - 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):
    - 25519 (~> 2.0.1)
@ -33,21 +33,16 @@ PODS:
  - JSQMessagesViewController (7.1.0):
    - JSQSystemSoundPlayer (~> 2.0.1)
  - JSQSystemSoundPlayer (2.0.1)
-  - libPhoneNumber-iOS (0.8.10)
+  - libPhoneNumber-iOS (0.8.11)
  - Mantle (2.0.6):
    - Mantle/extobjc (= 2.0.6)
  - Mantle/extobjc (2.0.6)
-  - OpenSSL (1.0.205)
+  - OpenSSL (1.0.207)
  - PastelogKit (1.3):
    - CocoaLumberjack (~> 2.0)
-  - ProtocolBuffers (1.9.9.2)
+  - ProtocolBuffers (1.9.10)
  - SCWaveformView (1.0.0)
-  - SocketRocket-PinningPolicy (0.4.3)
-  - SQLCipher/common (3.3.1)
-  - SQLCipher/fts (3.3.1):
-    - SQLCipher/common
-  - SSKeychain (1.3.1)
-  - TextSecureKit (0.0.4):
+  - SignalServiceKit (0.0.4):
    - '25519'
    - AFNetworking
    - AxolotlKit
@ -58,12 +53,56 @@ PODS:
    - SSKeychain
    - TwistedOakCollapsingFutures
    - YapDatabase/SQLCipher
+  - SocketRocket-PinningPolicy (0.4.3)
+  - SQLCipher/common (3.3.1)
+  - SQLCipher/fts (3.3.1):
+    - SQLCipher/common
+  - SSKeychain (1.4.0)
  - TwistedOakCollapsingFutures (1.0.0):
    - UnionFind (~> 1.0)
  - UnionFind (1.0.1)
-  - YapDatabase/SQLCipher (2.7.7):
+  - YapDatabase/SQLCipher (2.8.3):
+    - YapDatabase/SQLCipher/Core (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions (= 2.8.3)
+  - YapDatabase/SQLCipher/Core (2.8.3):
    - CocoaLumberjack (~> 2)
    - SQLCipher/fts
+  - YapDatabase/SQLCipher/Extensions (2.8.3):
+    - YapDatabase/SQLCipher/Core
+    - YapDatabase/SQLCipher/Extensions/CloudKit (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/ConnectionProxy (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/FilteredViews (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/FullTextSearch (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/Hooks (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/Relationships (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/RTreeIndex (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/SearchResults (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/SecondaryIndex (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/SecondaryIndex (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/Views (= 2.8.3)
+  - YapDatabase/SQLCipher/Extensions/CloudKit (2.8.3):
+    - YapDatabase/SQLCipher/Core
+  - YapDatabase/SQLCipher/Extensions/ConnectionProxy (2.8.3):
+    - YapDatabase/SQLCipher/Core
+  - YapDatabase/SQLCipher/Extensions/FilteredViews (2.8.3):
+    - YapDatabase/SQLCipher/Core
+    - YapDatabase/SQLCipher/Extensions/Views
+  - YapDatabase/SQLCipher/Extensions/FullTextSearch (2.8.3):
+    - YapDatabase/SQLCipher/Core
+  - YapDatabase/SQLCipher/Extensions/Hooks (2.8.3):
+    - YapDatabase/SQLCipher/Core
+  - YapDatabase/SQLCipher/Extensions/Relationships (2.8.3):
+    - YapDatabase/SQLCipher/Core
+  - YapDatabase/SQLCipher/Extensions/RTreeIndex (2.8.3):
+    - YapDatabase/SQLCipher/Core
+  - YapDatabase/SQLCipher/Extensions/SearchResults (2.8.3):
+    - YapDatabase/SQLCipher/Core
+    - YapDatabase/SQLCipher/Extensions/FullTextSearch
+    - YapDatabase/SQLCipher/Extensions/Views
+  - YapDatabase/SQLCipher/Extensions/SecondaryIndex (2.8.3):
+    - YapDatabase/SQLCipher/Core
+  - YapDatabase/SQLCipher/Extensions/Views (2.8.3):
+    - YapDatabase/SQLCipher/Core

 DEPENDENCIES:
  - DJWActionSheet
@ -73,28 +112,28 @@ DEPENDENCIES:
  - OpenSSL (~> 1.0.205)
  - PastelogKit (~> 1.3)
  - SCWaveformView (~> 1.0)
-  - TextSecureKit (from `https://github.com/WhisperSystems/TextSecureKit`, branch
-    `master`)
+  - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`,
+    branch `test`)

 EXTERNAL SOURCES:
  JSQMessagesViewController:
    :commit: e5582fef8a6b3e35f8070361ef37237222da712b
    :git: https://github.com/WhisperSystems/JSQMessagesViewController
-  TextSecureKit:
-    :branch: master
-    :git: https://github.com/WhisperSystems/TextSecureKit
+  SignalServiceKit:
+    :branch: test
+    :git: https://github.com/WhisperSystems/SignalServiceKit.git

 CHECKOUT OPTIONS:
  JSQMessagesViewController:
    :commit: e5582fef8a6b3e35f8070361ef37237222da712b
    :git: https://github.com/WhisperSystems/JSQMessagesViewController
-  TextSecureKit:
-    :commit: f6f6133498661a7c406097970d152b4acea9099e
-    :git: https://github.com/WhisperSystems/TextSecureKit
+  SignalServiceKit:
+    :commit: 518c44ce9ad3b005146669972d84e8d4c4477005
+    :git: https://github.com/WhisperSystems/SignalServiceKit.git

 SPEC CHECKSUMS:
  '25519': dc4bad7e2dbcbf1efa121068a705a44cd98c80fc
-  AFNetworking: a0075feb321559dc78d9d85b55d11caa19eabb93
+  AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
  AxolotlKit: a33962f26943990e5d69d05b30470cea18caeed0
  CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
  DJWActionSheet: 2fe54b1298a7f0fe44462233752c76a530e0cd80
@ -102,18 +141,18 @@ SPEC CHECKSUMS:
  HKDFKit: c058305d6f64b84f28c50bd7aa89574625bcb62a
  JSQMessagesViewController: ca11f86fa68ca70835f05e169df9244147c1dc40
  JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
-  libPhoneNumber-iOS: 7bfd00f843fdcd82b5182b463e8eb3b27579f41d
+  libPhoneNumber-iOS: ded33fab2c51ee847979556aa504c9e70f32d703
  Mantle: 299966b00759634931699f69cb6a30b9239b944d
-  OpenSSL: 162687d7e96a3edeb4cf443ca6ce7cdb2912df7b
+  OpenSSL: 26eb46b2836c0dade24fa53276b552f14c6eece1
  PastelogKit: 7b475be4cf577713506a943dd940bcc0499c8bca
-  ProtocolBuffers: 7111461618460961e6b7469177ec45ee551b4f0e
+  ProtocolBuffers: d088180c10072b3d24a9939a6314b7b9bcc2340b
  SCWaveformView: 52a96750255d817e300565a80c81fb643e233e07
+  SignalServiceKit: fff03a2fbc089417860acaef4faa66c415448199
  SocketRocket-PinningPolicy: f2ef00c3927bac05cd04d9d5171f82d922b40d3d
  SQLCipher: d490d2effe735895d2204d25a154b1e722278421
-  SSKeychain: 04c4ec40f4c3deda524e269bc76e5f30e638a174
-  TextSecureKit: b7419cbc792e5be4cbfd93a4da340f7a51d7bc41
+  SSKeychain: c71293fa57216a40ab06c23f4085387583293de4
  TwistedOakCollapsingFutures: f359b90f203e9ab13dfb92c9ff41842a7fe1cd0c
  UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
-  YapDatabase: a7a1ae3e0f89c319e3b22615c2351987fbbdbded
+  YapDatabase: 15b6867a07ff30eac3af28794cd2262b4d0ca4ca

 COCOAPODS: 0.39.0
--- a/README.md
+++ b/README.md
@ -1,5 +1,4 @@
 # Signal for iOS [![Build Status](https://travis-ci.org/WhisperSystems/Signal-iOS.svg?branch=master)](https://travis-ci.org/WhisperSystems/Signal-iOS)
-[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/WhisperSystems/Signal-iOS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

 Signal is a messaging app for simple private communication with friends.

--- a/Scripts/unused_strings.py
+++ b/Scripts/unused_strings.py
@ -1,9 +1,10 @@
-#!/usr/bin/env sh
+#!/usr/bin/env python
 """
 This script can be used to grep the source to tree to see which localized strings are in use. 

 author: corbett
 usage: ./unused_strings.py Localizable.strings source_dir
+eg:    ./unused_strings.py ../Signal/translations/en.lproj/Localizable.strings ../Signal/src
 """
 import sys
 import os
@ -32,10 +33,13 @@ def rgrep_match(dir_name, s_pat):
 			if match:
 				return match
 	return False
-	
+
 if __name__ == '__main__':
-	for item in open(sys.argv[1]).readlines():
-		grep_for=item.strip().split(' = ')[0].replace('"','')
-		if rgrep_match(sys.argv[2],grep_for):
+	strings_file = sys.argv[1]
+	src_dir_name = sys.argv[2]
+
+	for item in open(strings_file).readlines():
+		grep_for = item.strip().split(' = ')[0].replace('"','')
+		if rgrep_match(src_dir_name, grep_for):
 			print item.strip()
-			
+
--- a/Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint
+++ b/Signal.xcworkspace/xcshareddata/Signal.xcscmblueprint
@ -5,12 +5,14 @@
  },
  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
    "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : 0,
-    "37054CE35CE656680D6FFFA9EE19249E0D149C5E" : 0
+    "37054CE35CE656680D6FFFA9EE19249E0D149C5E" : 0,
+    "D74FB800F048CB516BB4BC70047F7CC676D291B9" : 0
  },
  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "D0F297E7-A82D-4657-A941-96B268F80ABC",
  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
    "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C" : "Signal-iOS\/",
-    "37054CE35CE656680D6FFFA9EE19249E0D149C5E" : "TSKit\/"
+    "37054CE35CE656680D6FFFA9EE19249E0D149C5E" : "TSKit\/",
+    "D74FB800F048CB516BB4BC70047F7CC676D291B9" : "Signal-iOS\/Pods\/"
  },
  "DVTSourceControlWorkspaceBlueprintNameKey" : "Signal",
  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
@ -25,6 +27,11 @@
      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:WhisperSystems\/Signal-iOS.git",
      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "5D79A077E31B3FE97A3C6613CBFFDD71C314D14C"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/FredericJacobs\/Precompiled-Signal-Dependencies.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D74FB800F048CB516BB4BC70047F7CC676D291B9"
    }
  ]
 }
--- a/Signal/src/call/RecentCall.h
+++ b/Signal/src/call/RecentCall.h
@ -1,6 +1,6 @@
 #import <AddressBook/AddressBook.h>
 #import <Foundation/Foundation.h>
-#import <TextSecureKit/TSCall.h>
+#import <SignalServiceKit/TSCall.h>
 #import "Contact.h"
 #import "ContactsManager.h"
 #import "PhoneNumber.h"
--- a/Signal/src/call/RecentCallManager.m
+++ b/Signal/src/call/RecentCallManager.m
@ -1,4 +1,4 @@
-#import <TextSecureKit/TextSecureKitEnv.h>
+#import <SignalServiceKit/TextSecureKitEnv.h>
 #import "NotificationsManager.h"
 #import "RecentCallManager.h"
 #import "TSCall.h"
--- a/Signal/src/contact/ContactsManager.h
+++ b/Signal/src/contact/ContactsManager.h
@ -1,7 +1,7 @@
 #import <Contacts/Contacts.h>
 #import <Foundation/Foundation.h>
-#import <TextSecureKit/ContactsManagerProtocol.h>
-#import <TextSecureKit/PhoneNumber.h>
+#import <SignalServiceKit/ContactsManagerProtocol.h>
+#import <SignalServiceKit/PhoneNumber.h>
 #import "CollapsingFutures.h"
 #import "Contact.h"
 #import "ObservableValue.h"
--- a/Signal/src/environment/NotificationsManager.h
+++ b/Signal/src/environment/NotificationsManager.h
@ -7,7 +7,7 @@
 //

 #import <Foundation/Foundation.h>
-#import <TextSecureKit/NotificationsProtocol.h>
+#import <SignalServiceKit/NotificationsProtocol.h>

@class TSCall;

--- a/Signal/src/environment/NotificationsManager.m
+++ b/Signal/src/environment/NotificationsManager.m
@ -7,11 +7,11 @@
 //

 #import <AudioToolbox/AudioServices.h>
-#import <TextSecureKit/TSCall.h>
-#import <TextSecureKit/TSContactThread.h>
-#import <TextSecureKit/TSErrorMessage.h>
-#import <TextSecureKit/TSIncomingMessage.h>
-#import <TextSecureKit/TextSecureKitEnv.h>
+#import <SignalServiceKit/TSCall.h>
+#import <SignalServiceKit/TSContactThread.h>
+#import <SignalServiceKit/TSErrorMessage.h>
+#import <SignalServiceKit/TSIncomingMessage.h>
+#import <SignalServiceKit/TextSecureKitEnv.h>
 #import "Environment.h"
 #import "NotificationsManager.h"
 #import "PreferencesUtil.h"
--- a/Signal/src/network/http/RPAPICall.m
+++ b/Signal/src/network/http/RPAPICall.m
@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
 //

-#import <TextSecureKit/TSAccountManager.h>
+#import <SignalServiceKit/TSAccountManager.h>
 #import "Constraints.h"
 #import "CryptoTools.h"
 #import "NSData+ows_StripToken.h"
--- a/Signal/src/phone/RPAccountManager.m
+++ b/Signal/src/phone/RPAccountManager.m
@ -7,7 +7,7 @@
 //

 #import <Mantle/Mantle.h>
-#import <TextSecureKit/NSData+Base64.h>
+#import <SignalServiceKit/NSData+Base64.h>
 #import "ArrayUtil.h"
 #import "DataUtil.h"
 #import "RPAPICall.h"
--- a/Signal/src/phone/signaling/SignalUtil.m
+++ b/Signal/src/phone/signaling/SignalUtil.m
@ -1,6 +1,6 @@
 #import "SignalUtil.h"

-#import <TextSecureKit/TSAccountManager.h>
+#import <SignalServiceKit/TSAccountManager.h>
 #import "Constraints.h"
 #import "SignalKeyingStorage.h"
 #import "Util.h"
--- a/Signal/src/phone/signaling/number
+++ b/Signal/src/phone/signaling/number
@ -8,7 +8,7 @@

 #import "GroupContactsResult.h"

-#import <TextSecureKit/TSAccountManager.h>
+#import <SignalServiceKit/TSAccountManager.h>
 #import "Contact.h"
 #import "ContactsManager.h"
 #import "Environment.h"
--- a/controllers/CodeVerificationViewController.m
+++ b/controllers/CodeVerificationViewController.m
@ -8,7 +8,7 @@

 #import "CodeVerificationViewController.h"

-#import <TextSecureKit/TSStorageManager+keyingMaterial.h>
+#import <SignalServiceKit/TSStorageManager+keyingMaterial.h>
 #import "ContactsManager.h"
 #import "Environment.h"
 #import "LocalizableText.h"
--- a/controllers/MessagesViewController.m
+++ b/controllers/MessagesViewController.m
@ -12,7 +12,7 @@
 #import <AssetsLibrary/AssetsLibrary.h>
 #import <ContactsUI/CNContactViewController.h>
 #import <MobileCoreServices/UTCoreTypes.h>
-#import <TextSecureKit/TSAccountManager.h>
+#import <SignalServiceKit/TSAccountManager.h>
 #import <YapDatabase/YapDatabaseView.h>
 #import "ContactsManager.h"
 #import "DJWActionSheet+OWS.h"
@ -173,6 +173,8 @@ typedef enum : NSUInteger {
    [self initializeBubbles];
    [self initializeTextView];

+    [JSQMessagesCollectionViewCell registerMenuAction:@selector(delete:)];
+
    [self initializeCollectionViewLayout];

    self.senderId          = ME_MESSAGE_IDENTIFIER;
--- a/controllers/NewGroupViewController.m
+++ b/controllers/NewGroupViewController.m
@ -7,10 +7,10 @@
 //

 #import <MobileCoreServices/UTCoreTypes.h>
-#import <TextSecureKit/NSDate+millisecondTimeStamp.h>
-#import <TextSecureKit/TSAccountManager.h>
-#import <TextSecureKit/TSMessagesManager+attachments.h>
-#import <TextSecureKit/TSMessagesManager+sendMessages.h>
+#import <SignalServiceKit/NSDate+millisecondTimeStamp.h>
+#import <SignalServiceKit/TSAccountManager.h>
+#import <SignalServiceKit/TSMessagesManager+attachments.h>
+#import <SignalServiceKit/TSMessagesManager+sendMessages.h>
 #import "ContactsManager.h"
 #import "DJWActionSheet+OWS.h"
 #import "Environment.h"
--- a/Signal/test/network/http/HttpRequestResponseTest.m
+++ b/Signal/test/network/http/HttpRequestResponseTest.m
@ -1,4 +1,4 @@
-#import <TextSecureKit/TSStorageManager+keyingMaterial.h>
+#import <SignalServiceKit/TSStorageManager+keyingMaterial.h>
 #import <XCTest/XCTest.h>
 #import "HttpSocket.h"
 #import "SignalKeyingStorage.h"
--- a/Signal/translations/en.lproj/Localizable.strings
+++ b/Signal/translations/en.lproj/Localizable.strings