Merge remote-tracking branch 'jlund/github-updates'

7 years ago · 9ad437a04c
parent f3d0cb49e0 e411bd5ee5
commit 9ad437a04c
16 changed files with 41 additions and 41 deletions
--- a/BUILDING.md
+++ b/BUILDING.md
@ -60,7 +60,7 @@ carthage build --platform iOS

 A prebuilt version of WebRTC.framework resides in our Carthage submodule
 and should be installed by the above steps.  However, if you'd like to
-build it from source, see: https://github.com/WhisperSystems/signal-webrtc-ios
+build it from source, see: https://github.com/signalapp/signal-webrtc-ios

 ## 3. XCode

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -32,7 +32,7 @@ If you don't agree with us, you can use the [ClangFormat Xcode plugin](https://g

 ## Contributors

-Signal wouldn’t be possible without the many open-source projects we depend on. Big shoutout to the maintainers of all the [pods](https://github.com/WhisperSystems/Signal-iOS/blob/master/Podfile) we use!
+Signal wouldn’t be possible without the many open-source projects we depend on. Big shoutout to the maintainers of all the [pods](https://github.com/signalapp/Signal-iOS/blob/master/Podfile) we use!

 The original version of Signal was developed by Twisted Oak Studios.
 v1.0 development by Twisted Oak Studios:
--- a/MAINTAINING.md
+++ b/MAINTAINING.md
@ -14,7 +14,7 @@ Similarly, Carthage dependencies can be updated like so:
 `carthage update`

 WebRTC updates are managed separately and manually based on
-https://github.com/WhisperSystems/signal-webrtc-ios
+https://github.com/signalapp/signal-webrtc-ios

 ## Translations

--- a/12
+++ b/12
@ -8,22 +8,22 @@ def shared_pods
  # pod 'SQLCipher', path: '../sqlcipher2'
  pod 'SQLCipher', :git => 'https://github.com/sqlcipher/sqlcipher.git', :commit => 'd5c2bec'
  # pod 'YapDatabase/SQLCipher', path: '../YapDatabase'
-  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/WhisperSystems/YapDatabase.git', branch: 'release/unencryptedHeaders'
+  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'release/unencryptedHeaders'
  # pod 'AxolotlKit',   path: '../SignalProtocolKit'
  pod 'SignalServiceKit', path: '.'
  pod 'AxolotlKit', git: 'https://github.com/signalapp/SignalProtocolKit.git'
  #pod 'AxolotlKit', path: '../SignalProtocolKit'
-  pod 'HKDFKit', git: 'https://github.com/WhisperSystems/HKDFKit.git', branch: 'mkirk/framework-friendly'
+  pod 'HKDFKit', git: 'https://github.com/signalapp/HKDFKit.git', branch: 'mkirk/framework-friendly'
  #pod 'HKDFKit', path: '../HKDFKit'
-  pod 'Curve25519Kit', git: 'https://github.com/WhisperSystems/Curve25519Kit', branch: 'mkirk/framework-friendly'
+  pod 'Curve25519Kit', git: 'https://github.com/signalapp/Curve25519Kit', branch: 'mkirk/framework-friendly'
  #pod 'Curve25519Kit', path: '../Curve25519Kit'
-  pod 'GRKOpenSSLFramework', git: 'https://github.com/WhisperSystems/GRKOpenSSLFramework'
+  pod 'GRKOpenSSLFramework', git: 'https://github.com/signalapp/GRKOpenSSLFramework'
  #pod 'GRKOpenSSLFramework', path: '../GRKOpenSSLFramework'

  # third party pods
  pod 'AFNetworking', inhibit_warnings: true
-  pod 'JSQMessagesViewController',  git: 'https://github.com/WhisperSystems/JSQMessagesViewController.git', branch: 'mkirk/share-compatible', :inhibit_warnings => true
-  #pod 'JSQMessagesViewController',  git: 'https://github.com/WhisperSystems/JSQMessagesViewController.git', branch: 'signal-master', :inhibit_warnings => true
+  pod 'JSQMessagesViewController',  git: 'https://github.com/signalapp/JSQMessagesViewController.git', branch: 'mkirk/share-compatible', :inhibit_warnings => true
+  #pod 'JSQMessagesViewController',  git: 'https://github.com/signalapp/JSQMessagesViewController.git', branch: 'signal-master', :inhibit_warnings => true
  #pod 'JSQMessagesViewController',   path: '../JSQMessagesViewController'
  pod 'Mantle', :inhibit_warnings => true
  # pod 'YapDatabase/SQLCipher', :inhibit_warnings => true
--- a/Podfile.lock
+++ b/Podfile.lock
@ -130,10 +130,10 @@ DEPENDENCIES:
  - AFNetworking
  - ATAppUpdater
  - AxolotlKit (from `https://github.com/signalapp/SignalProtocolKit.git`)
-  - Curve25519Kit (from `https://github.com/WhisperSystems/Curve25519Kit`, branch `mkirk/framework-friendly`)
-  - GRKOpenSSLFramework (from `https://github.com/WhisperSystems/GRKOpenSSLFramework`)
-  - HKDFKit (from `https://github.com/WhisperSystems/HKDFKit.git`, branch `mkirk/framework-friendly`)
-  - JSQMessagesViewController (from `https://github.com/WhisperSystems/JSQMessagesViewController.git`, branch `mkirk/share-compatible`)
+  - Curve25519Kit (from `https://github.com/signalapp/Curve25519Kit`, branch `mkirk/framework-friendly`)
+  - GRKOpenSSLFramework (from `https://github.com/signalapp/GRKOpenSSLFramework`)
+  - HKDFKit (from `https://github.com/signalapp/HKDFKit.git`, branch `mkirk/framework-friendly`)
+  - JSQMessagesViewController (from `https://github.com/signalapp/JSQMessagesViewController.git`, branch `mkirk/share-compatible`)
  - Mantle
  - PureLayout
  - Reachability
@ -141,7 +141,7 @@ DEPENDENCIES:
  - SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
  - SQLCipher (from `https://github.com/sqlcipher/sqlcipher.git`, commit `d5c2bec`)
  - SSZipArchive
-  - YapDatabase/SQLCipher (from `https://github.com/WhisperSystems/YapDatabase.git`, branch `release/unencryptedHeaders`)
+  - YapDatabase/SQLCipher (from `https://github.com/signalapp/YapDatabase.git`, branch `release/unencryptedHeaders`)
  - YYImage

 EXTERNAL SOURCES:
@ -149,15 +149,15 @@ EXTERNAL SOURCES:
    :git: https://github.com/signalapp/SignalProtocolKit.git
  Curve25519Kit:
    :branch: mkirk/framework-friendly
-    :git: https://github.com/WhisperSystems/Curve25519Kit
+    :git: https://github.com/signalapp/Curve25519Kit
  GRKOpenSSLFramework:
-    :git: https://github.com/WhisperSystems/GRKOpenSSLFramework
+    :git: https://github.com/signalapp/GRKOpenSSLFramework
  HKDFKit:
    :branch: mkirk/framework-friendly
-    :git: https://github.com/WhisperSystems/HKDFKit.git
+    :git: https://github.com/signalapp/HKDFKit.git
  JSQMessagesViewController:
    :branch: mkirk/share-compatible
-    :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
+    :git: https://github.com/signalapp/JSQMessagesViewController.git
  SignalServiceKit:
    :path: .
  SocketRocket:
@ -167,7 +167,7 @@ EXTERNAL SOURCES:
    :git: https://github.com/sqlcipher/sqlcipher.git
  YapDatabase:
    :branch: release/unencryptedHeaders
-    :git: https://github.com/WhisperSystems/YapDatabase.git
+    :git: https://github.com/signalapp/YapDatabase.git

 CHECKOUT OPTIONS:
  AxolotlKit:
@ -175,16 +175,16 @@ CHECKOUT OPTIONS:
    :git: https://github.com/signalapp/SignalProtocolKit.git
  Curve25519Kit:
    :commit: 03a19c80aafc10a3464f0c086b1eb38239c507ac
-    :git: https://github.com/WhisperSystems/Curve25519Kit
+    :git: https://github.com/signalapp/Curve25519Kit
  GRKOpenSSLFramework:
    :commit: 841e24eba93cabfe503222f858de2a40b3762aab
-    :git: https://github.com/WhisperSystems/GRKOpenSSLFramework
+    :git: https://github.com/signalapp/GRKOpenSSLFramework
  HKDFKit:
    :commit: d2e2e50990e88537d6c4e38cc32a6f6debd83446
-    :git: https://github.com/WhisperSystems/HKDFKit.git
+    :git: https://github.com/signalapp/HKDFKit.git
  JSQMessagesViewController:
    :commit: 33dd72b7bac85fc54a87fb8016c9a927af222153
-    :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
+    :git: https://github.com/signalapp/JSQMessagesViewController.git
  SocketRocket:
    :commit: 28035e1a98a427853e4038ff1b70479fa8374cfa
    :git: https://github.com/facebook/SocketRocket.git
@ -193,7 +193,7 @@ CHECKOUT OPTIONS:
    :git: https://github.com/sqlcipher/sqlcipher.git
  YapDatabase:
    :commit: bdd7409de45f9e38b9144adba3b38d74ca48ea77
-    :git: https://github.com/WhisperSystems/YapDatabase.git
+    :git: https://github.com/signalapp/YapDatabase.git

 SPEC CHECKSUMS:
  AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
@ -211,7 +211,7 @@ SPEC CHECKSUMS:
  PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd
  Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
  SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
-  SignalServiceKit: 8f9038e584080bee8c367268067e6e0ec0feefcf
+  SignalServiceKit: 2dbddc0638e387feb714d9cc68962d4956c8ebe5
  SocketRocket: dbb1554b8fc288ef8ef370d6285aeca7361be31e
  SQLCipher: f9fcf29b2e59ced7defc2a2bdd0ebe79b40d4990
  SSZipArchive: 14401ade5f8e82aba1ff03e9f88e9de60937ae60
@ -220,6 +220,6 @@ SPEC CHECKSUMS:
  YapDatabase: 299a32de9d350d37a9ac5b0532609d87d5d2a5de
  YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54

-PODFILE CHECKSUM: d424a8f153ae6e31631ed25ef5700e7e60234a79
+PODFILE CHECKSUM: 59053e1c79fca64b3429210d11db5520977f49cb

 COCOAPODS: 1.3.1
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 0cabd3831b29c6aa789160479133d5e432b487e6
+Subproject commit 74892fab4a428293530f7d82299f2e6d8cf0be5d
--- a/README.md
+++ b/README.md
@ -9,9 +9,9 @@ Signal is a messaging app for simple private communication with friends.
 Help us translate Signal! The translation effort happens on [Transifex](https://www.transifex.com/open-whisper-systems/signal-ios/)

 ## Contributing Code
-Instructions on how to setup your development environment and build Signal-iOS can be found in  [BUILDING.md](https://github.com/WhisperSystems/Signal-iOS/blob/master/BUILDING.md). Other useful instructions for development can be found in the [Development Guide wiki page](https://github.com/WhisperSystems/Signal-iOS/wiki/Development-Guide)
+Instructions on how to setup your development environment and build Signal-iOS can be found in  [BUILDING.md](https://github.com/signalapp/Signal-iOS/blob/master/BUILDING.md). Other useful instructions for development can be found in the [Development Guide wiki page](https://github.com/signalapp/Signal-iOS/wiki/Development-Guide)

-We recommend going through our issues and picking out something with the [help wanted](https://github.com/WhisperSystems/Signal-iOS/labels/help%20wanted) label.
+We recommend going through our issues and picking out something with the [help wanted](https://github.com/signalapp/Signal-iOS/labels/help%20wanted) label.

 For larger changes and feature ideas, we ask that you propose it on the [unofficial Community Forum](https://whispersystems.discoursehosting.net) for a high-level discussion with the wider community before implementation.

--- a/SettingsBundle/licenses/AxolotlKit.license
+++ b/SettingsBundle/licenses/AxolotlKit.license
@ -1,5 +1,5 @@
 AxolotlKit
-https://github.com/WhisperSystems/AxolotlKit
+https://github.com/signalapp/AxolotlKit

 GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991
--- a/SignalMessaging/attachments/SignalAttachment.swift
+++ b/SignalMessaging/attachments/SignalAttachment.swift
@ -171,7 +171,7 @@ public class SignalAttachment: NSObject {
    /**
     * Media Size constraints from Signal-Android
     *
-     * https://github.com/WhisperSystems/Signal-Android/blob/master/src/org/thoughtcrime/securesms/mms/PushMediaConstraints.java
+     * https://github.com/signalapp/Signal-Android/blob/master/src/org/thoughtcrime/securesms/mms/PushMediaConstraints.java
     */
    static let kMaxFileSizeAnimatedImage = UInt(25 * 1024 * 1024)
    static let kMaxFileSizeImage = UInt(6 * 1024 * 1024)
--- a/SignalServiceKit.podspec
+++ b/SignalServiceKit.podspec
@ -15,10 +15,10 @@ Pod::Spec.new do |s|
 An Objective-C library for communicating with the Signal messaging service.
  DESC

-  s.homepage         = "https://github.com/WhisperSystems/SignalServiceKit"
+  s.homepage         = "https://github.com/signalapp/SignalServiceKit"
  s.license          = 'GPLv3'
  s.author           = { "Frederic Jacobs" => "github@fredericjacobs.com" }
-  s.source           = { :git => "https://github.com/WhisperSystems/SignalServiceKit.git", :tag => s.version.to_s }
+  s.source           = { :git => "https://github.com/signalapp/SignalServiceKit.git", :tag => s.version.to_s }
  s.social_media_url = 'https://twitter.com/FredericJacobs'

  s.platform     = :ios, '8.0'
--- a/SignalServiceKit/CONTRIBUTING.md
+++ b/SignalServiceKit/CONTRIBUTING.md
@ -9,5 +9,5 @@ Please go ahead and sign, putting your github username in "Address line #2", so

 ## Code Conventions

-Follow all [Signal-iOS Code Conventions](https://github.com/WhisperSystems/Signal-iOS/blob/master/CONTRIBUTING.md).
+Follow all [Signal-iOS Code Conventions](https://github.com/signalapp/Signal-iOS/blob/master/CONTRIBUTING.md).

--- a/SignalServiceKit/Example/TSKitiOSTestApp/Podfile
+++ b/SignalServiceKit/Example/TSKitiOSTestApp/Podfile
@ -3,9 +3,9 @@ source 'https://github.com/CocoaPods/Specs.git'

 target 'TSKitiOSTestApp' do
  pod 'SocketRocket', git: 'https://github.com/facebook/SocketRocket.git'
-  pod 'AxolotlKit',  git: 'https://github.com/WhisperSystems/SignalProtocolKit.git'
+  pod 'AxolotlKit',  git: 'https://github.com/signalapp/SignalProtocolKit.git'
  pod 'SignalServiceKit', :path => '../../../SignalServiceKit.podspec'
-  pod 'OpenSSL', git: 'https://github.com/WhisperSystems/OpenSSL-Pod'
+  pod 'OpenSSL', git: 'https://github.com/signalapp/OpenSSL-Pod'

  target 'TSKitiOSTestAppTests' do
     inherit! :search_paths
--- a/SignalServiceKit/README.md
+++ b/SignalServiceKit/README.md
@ -5,5 +5,5 @@ messaging service for iOS & OS X

 To use SignalServiceKit via Cocoapods add the following to your Podfile

-    pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/Signal-iOS.git'
+    pod 'SignalServiceKit', git: 'https://github.com/signalapp/Signal-iOS.git'

--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@ -385,7 +385,7 @@ NS_ASSUME_NONNULL_BEGIN
        return;
    }

-    // FIXME: https://github.com/WhisperSystems/Signal-iOS/issues/1340
+    // FIXME: https://github.com/signalapp/Signal-iOS/issues/1340
    DDLogInfo(@"%@ Sending group info request: %@", self.logTag, envelopeAddress(envelope));

    NSString *recipientId = envelope.source;
--- a/SignalServiceKit/src/Messages/OWSMessageServiceParams.h
+++ b/SignalServiceKit/src/Messages/OWSMessageServiceParams.h
@ -10,7 +10,7 @@
 * the Signal Web Service.
 *
 * See:
- * https://github.com/WhisperSystems/libsignal-service-java/blob/master/java/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessage.java
+ * https://github.com/signalapp/libsignal-service-java/blob/master/java/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessage.java
 */
@interface OWSMessageServiceParams : MTLModel <MTLJSONSerializing>

--- a/SignalServiceKit/src/Util/NSData+messagePadding.m
+++ b/SignalServiceKit/src/Util/NSData+messagePadding.m
@ -32,7 +32,7 @@

 - (NSData *)paddedMessageBody {
    // From
-    // https://github.com/WhisperSystems/TextSecure/blob/master/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushTransportDetails.java#L55
+    // https://github.com/signalapp/TextSecure/blob/master/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushTransportDetails.java#L55
    // NOTE: This is dumb.  We have our own padding scheme, but so does the cipher.
    // The +1 -1 here is to make sure the Cipher has room to add one padding byte,
    // otherwise it'll add a full 16 extra bytes.