updating changes

.gitignore

@@ -0,0 +1,13 @@
+Pods/*
+Libraries/bin/*
+Libraries/include/*
+*.lock
+Libraries/src/*
+.DS_Store
+*.swp
+.Trashes
+*~.nib
+xcuserdata
+Libraries/lib/*
+*.xccheckout
+Build/*

.travis.yml

@@ -0,0 +1,8 @@
+language: objective-c
+before_install:
+  - export LANG=en_US.UTF-8
+  - gem install cocoapods --no-ri --no-rdoc
+xcode_workspace: TextSecureiOS.xcworkspace
+xcode_scheme: TextSecureiOS
+xcode_sdk: iphonesimulator
+

CONTRIBUTING.md

@@ -0,0 +1,59 @@
+## Contribute
+
+At this early stage there are two primary developers of TextSecure iOS: [@corbett](https://github.com/corbett) and [@FredericJacobs](https://github.com/fredericjacobs) and as we move from the early stages to more advanced ones opportunities will abound to contribute to the core code base. We are particularly interested in support and contributions associated localization, code review, and automated testing, with any of the [Open Issues](https://github.com/WhisperSystems/TextSecure-iOS/issues?state=open) or [Milestones](https://github.com/WhisperSystems/TextSecure-iOS/issues/milestones?state=open). It may help to open an issue or milestone if you plan to make a contribution so we can be sure to clarify questions, give an overview of architectural plans, and ensure we do not overlap work.
+## Contributor agreement
+
+Apple requires contributors to iOS projects to relicense their code on submit. We'll have to have individual contributors sign something to enable this.
+
+Our volunteer legal have put together a form you can sign electronically. So no scanning, faxing, or carrier pigeons involved. How modern:
+https://whispersystems.org/cla/
+
+Please go ahead and sign, putting your github username in "Address line #2", so that we can accept your pull requests at our heart's delight.
+
+## Code Conventions
+
+We are trying to follow the [GitHub code conventions for Objective-C](https://github.com/github/objective-c-conventions) and we appreciate that pull requests do conform with those conventions. 
+
+In addition to that, always add curly braces to your `if` conditionals, even if there is no `else`. Booleans should be declared according to their Objective-C definition, and hence take `YES` or `NO` as values.
+
+One note, for programmers joining us from Java or similar language communities, note that [exceptions are not commonly used for errors that may occur in normal use](http://stackoverflow.com/questions/324284/throwing-an-exception-in-objective-c-cocoa/324805#324805) so familiarize yourself with **NSError** 
+
+###UI conventions
+We prefer to use [Storyboards](https://developer.apple.com/library/ios/documentation/general/conceptual/Devpedia-CocoaApp/Storyboard.html) vs. building UI elements within the code itself. We are not at the stage to provide a .strings localizable file for translating, but the goal is to have translatable strings in a single entry point so that we can reach users in their native language wherever possible. 
+
+Some tips
+- any PR that does not use segues or story board conventions (red flags:   ```[self.navigationController pushViewController:<#(UIViewController *)#> animated:<#(BOOL)#>]``` and/or manual creation of UI elements and/or orphaned ViewControllers in the storyboard) will need to be refactored prior to merge
+- the following are the storyboarder's best friends:
+
+```- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender;```
+
+``` [self performSegueWithIdentifier:<#(NSString *)#> sender:<#(id)#>];```
+
+## Tabs vs Spaces
+
+It's the eternal debate. We chose to adopt spaces. Please set your default Xcode configuration to 4 spaces for tabs, and 4 spaces for indentation (it's Xcode's default setting).
+
+![Tabs vs Spaces](http://cl.ly/TYPZ/Screen%20Shot%202014-01-26%20at%2019.02.28.png)
+
+If you don't agree with us, you can use the [ClangFormat Xcode plugin](https://github.com/travisjeffery/ClangFormat-Xcode) to code with your favorite indentation style!
+
+## PR conventions
+If you are thinking about a major change, to speed up the merge talk with the lead developers first. PRs will not be accepted which break the master branch, so make sure to try, in addition to your unit tests, a simple "regression" test: register, send some messages back and forth, view a thread and conversation and make sure every is just as functional as before your PR only more so.
+
+## BitHub
+
+Open Whisper Systems is currently [experimenting](https://whispersystems.org/blog/bithub/) with the funding privacy Free and Open Source software. Payments are opt-in for the `TextSecure-iOS` repo and can be enabled by adding `MONEYMONEY` in a commit message string. For example, this is the current Open WhisperSystems payout per commit, rendered dynamically as an image by the Open WhisperSystems BitHub instance:
+
+[![Bithub Payment Amount](https://bithub.herokuapp.com/v1/status/payment/commit)](https://whispersystems.org/blog/bithub/)
+
+## Contributors
+
+We would like to particularly thank the following contributors:
+
+- Dylan Bourgeois: Substantial UI/UX Improvements
+- Christine Corbett: Lead Developer
+- Alban Diquet: Substantial contributions to the storage infrastructure
+- Frederic Jacobs: Lead Developer
+- Claudiu-Vlad Ursache: UI contributions 
+
+TextSecure 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/TextSecure-iOS/blob/master/Podfile) we use!

Documentation/README.md

@@ -0,0 +1,5 @@
+Protocol descriptions available
+ * https://github.com/WhisperSystems/TextSecure/wiki/ProtocolV2
+ * https://github.com/WhisperSystems/TextSecure-Server/wiki/API-Protocol
+ * https://www.whispersystems.org/blog/advanced-ratcheting/
+ * https://github.com/trevp/axolotl/wiki

Libraries/README.md

@@ -0,0 +1,8 @@
+# Build scripts
+
+You don't need the build scripts provided in this folder to start contributing thanks to the magic of `Cocoapods`. But for security reasons (App Store builds where verifying integrity of dependencies is important) and debugging reasons, we keep the build scripts of this folder.
+
+## [Curve25519 - Donna implementation](https://github.com/agl/curve25519-donna)
+
+## [OpenSSL Website](http://www.openssl.org)
+OpenSSL is currently not used in this project and if it's a dependency we can avoid, that would be better. Because yeah, OpenSSL code ...

Libraries/build-libcurve25519.sh

@@ -0,0 +1,48 @@
+#!/bin/sh
+#  Automatic build script for curve25519-donna for iPhoneOS and iPhoneSimulator
+# Created by Christine Corbett Moran 11/30/2013
+#
+#
+###########################################################################
+#  Change values here													  #
+#																		  #
+SDKVERSION="7.0"														  #
+#																		  #
+# Probably shouldn't need to change anything under here
+
+CURRENTPATH=`pwd`
+CFLAGS="-Wmissing-prototypes -Wdeclaration-after-statement -O2 -Wall"
+ARCHS="i386 armv7 armv7s"
+DEVELOPER=`xcode-select -print-path`
+
+mkdir -p "${CURRENTPATH}/src"
+mkdir -p "${CURRENTPATH}/lib"
+
+cd "${CURRENTPATH}/src/"
+git clone https://github.com/agl/curve25519-donna.git
+cd "${CURRENTPATH}/src/curve25519-donna/"
+
+for ARCH in ${ARCHS}
+do
+	make clean
+	if [ "${ARCH}" == "i386" ];
+	then
+		PLATFORM="iPhoneSimulator"
+	else
+		PLATFORM="iPhoneOS"
+	fi
+	export DEVELOPER_PLATFORM="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer"
+	export SDK="${PLATFORM}${SDKVERSION}.sdk"
+	echo "Building curve25519-donna for ${PLATFORM} ${SDKVERSION} ${ARCH}"
+	export CC="/Applications/Xcode.app/Contents/Developer/usr/bin/gcc -arch ${ARCH} -miphoneos-version-min=7.0 -isysroot ${DEVELOPER_PLATFORM}/SDKs/${SDK}  ${CFLAGS}"
+	mkdir -p "${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk"
+	LOG="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk/curve25519-donna.log"
+	$CC -c curve25519-donna.c -m32  curve25519-donna.c >> "${LOG}" 2>&1
+	ar -rc curve25519-donna.a curve25519-donna.o >> "${LOG}" 2>&1
+	ranlib curve25519-donna.a >> "${LOG}" 2>&1
+	mv curve25519-donna.a ${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk/curve25519-donna.a
+done
+
+echo "Build library for ${ARCHS}..."
+lipo -create ${CURRENTPATH}/bin/iPhoneSimulator${SDKVERSION}-i386.sdk/curve25519-donna.a ${CURRENTPATH}/bin/iPhoneOS${SDKVERSION}-armv7.sdk/curve25519-donna.a ${CURRENTPATH}/bin/iPhoneOS${SDKVERSION}-armv7s.sdk/curve25519-donna.a -output ${CURRENTPATH}/lib/curve25519-donna.a  
+

Libraries/build-libssl.sh

@@ -22,7 +22,7 @@
 #  Change values here													  #
 #																		  #
 VERSION="1.0.1e"													      #
-SDKVERSION="6.1"														  #
+SDKVERSION="7.0"														  #
 #																		  #
 ###########################################################################
 #																		  #
@@ -57,6 +57,9 @@ DEVELOPER=`xcode-select -print-path`
 # mkdir -p "${CURRENTPATH}/lib"
 # 
 # tar zxf openssl-${VERSION}.tar.gz -C "${CURRENTPATH}/src"
+
+mkdir -p "${CURRENTPATH}/lib"
+
 cd "${CURRENTPATH}/src/openssl-${VERSION}"
 
 
@@ -76,11 +79,11 @@ do
 	echo "Building openssl-${VERSION} for ${PLATFORM} ${SDKVERSION} ${ARCH}"
 	echo "Please stand by..."
 
-	export CC="${CROSS_TOP}/usr/bin/gcc -arch ${ARCH}"
+	export CC="/Applications/Xcode.app/Contents/Developer/usr/bin/gcc -arch ${ARCH} -miphoneos-version-min=7.0"
 	mkdir -p "${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk"
 	LOG="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk/build-openssl-${VERSION}.log"
 
-	./Configure iphoneos-cross --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" > "${LOG}" 2>&1
+	./Configure iphoneos-cross --openssldir="z > "${LOG}" 2>&1
 	# add -isysroot to CC=
 	sed -ie "s!^CFLAG=!CFLAG=-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK} !" "Makefile"
 

Podfile

@@ -0,0 +1,37 @@
+platform :ios, '7.0'
+
+link_with ['TextSecureiOS', 'TextSecureiOS Tests']
+
+pod 'RNCryptor',                 '~> 2.1'
+pod 'FMDB',                      '~> 2.3'
+pod 'HockeySDK',                 '~> 3.5.5'
+pod 'libPhoneNumber-iOS',        '~> 0.7.3'
+pod 'AFNetworking',              '~> 2.3.1'
+pod 'SQLCipher', 		 '~> 3.1.0'
+pod 'GoogleProtobuf', 		 '~> 2.5.0'
+pod 'SWTableViewCell',       	 '~> 0.3.0'
+pod 'curve25519-donna',          '~> 1.2.1'
+pod 'UIImage-Categories',        '~> 0.0.1'
+pod 'JSMessagesViewController',  '~> 3.4.4'
+pod 'LBGIFImage',		            '~> 0.0.1'
+pod 'Emoticonizer',		          '~> 1.0.0'
+pod 'InAppSettingsKit',		      '~> 2.1'
+pod 'HKDFKit',                   '~> 0.0.1'
+pod 'RMStepsController',         '~> 1.0.1'
+pod 'Navajo',                    '~> 0.0.1'
+pod 'SocketRocket', :podspec => "Podspecs/SocketRocket.podspec"
+
+link_with ['TextSecureiOS', 'TextSecureiOS Tests']
+post_install do |lib_rep|
+  lib_rep.project.targets.each do |target|
+    if target.name == 'Pods-FMDB'
+      target.build_configurations.each do |config|
+        if config.build_settings['OTHER_CFLAGS'].nil?
+          config.build_settings['OTHER_CFLAGS'] = Array.new
+        end
+        puts "Added -DSQLITE_HAS_CODEC CFlag to #{target.name} - #{config.name}"
+        config.build_settings['OTHER_CFLAGS'].unshift('-DSQLITE_HAS_CODEC')
+      end
+    end
+  end
+end

Podspecs/SocketRocket.podspec

@@ -0,0 +1,14 @@
+Pod::Spec.new do |s|
+  s.name               = 'SocketRocket'
+  s.version            = '0.3.2'
+  s.summary            = 'A conforming WebSocket (RFC 6455) client library.'
+  s.homepage           = 'https://github.com/square/SocketRocket'
+  s.authors            = 'Square'
+  s.license            = 'Apache License, Version 2.0'
+  s.source             = { :git => 'https://github.com/FredericJacobs/SocketRocket.git', :tag => 'v0.3.2' }
+  s.source_files       = 'SocketRocket/*.{h,m,c}'
+  s.requires_arc       = true
+  s.ios.frameworks     = %w{CFNetwork Security}
+  s.osx.frameworks     = %w{CoreServices Security}
+  s.libraries          = 'icucore'
+end

README.md

@@ -1 +1,91 @@
-TextSecure for iOS, currently in prototype stage.
+# TextSecure for iOS
+
+Currently in early development stage. Please see [Contributing](https://github.com/WhisperSystems/TextSecure-iOS/blob/master/CONTRIBUTING.md) for details how best to contribute.
+
+### This is a working directory. TextSecure will be the instant messaging part of [Signal](https://github.com/WhisperSystems/Signal-iOS)
+
+## Temporary notice
+
+The main Cocoapods repo got corrupted. Please [follow these instructions](http://blog.cocoapods.org/Repairing-Our-Broken-Specs-Repository/) for your next `pod update`
+
+## Building
+
+1) Clone the repo to a working directory
+
+2) [CocoaPods](http://cocoapods.org) is used to manage dependencies. Pods are setup easily and are distributed via a ruby gem. Follow the simple instructions on the website to setup. After setup, run the following command from the toplevel directory of TextSecureiOS to download the dependencies for TextSecure iOS:
+
+```
+pod install
+```
+If you are having build issues, first make sure your pods are up to date
+```
+pod update
+pod install
+```
+occasionally, CocoaPods itself will need to be updated. Do this with
+```
+sudo gem update
+```
+
+3) Open the `TextSecureiOS.xcworkspace` in Xcode. **Note that for CocoaPods to work properly it is very important to always open the workspace and not the `.xcodeproj` file.** Build and Run and you are ready to go!
+
+4) Debugging network calls. If you are contributing networked code, PonyDebugger is integrated in Debug mode of the application. Check out https://github.com/square/PonyDebugger#quick-start and easily debug network code from the iOS simulator
+
+### Compile Error when building for 64-bit architecture
+
+Due to an issue in version 2.5.0 of the Google Protobuf Library the compiling fails when building the app for a 64-bit architecture (which is the case for the iPhone 5S)
+
+See the Google-Issue for this: https://code.google.com/p/protobuf/issues/detail?id=575. 
+
+__However the specified Workaround in the Google Issue solves the compile errors__
+
+## Certificate Pinning
+
+TextSecure uses certificate-pinning to avoid (wo)man-in-the-middle attacks. If you use your own server, here are the steps to generate the certificate file. 
+
+1) Use OpenSSL to download the certificate (copy-paste the text between the `BEGIN` and `END` into a `cert.pem` file).
+
+```bash
+openssl s_client -showcerts -connect textsecure-service.whispersystems.org:443 </dev/null
+```
+2) Use OpenSSL to convert this PEM certificate into a DER certificate. 
+
+```bash
+openssl x509 -inform PEM -outform DER -in cert.pem -out cert.der
+```
+
+3) Rename and move `cert.der` to `TextSecureiOS/gcm.textsecure.whispersystems.org.cer`
+
+## Documentation
+
+
+Looking for documentation? Check out the wiki!
+
+https://github.com/WhisperSystems/TextSecure/wiki
+
+## Interoperability 
+The iOS code will be tested to be interoperable with the TextSecure Android push-library branch
+```
+$ git clone https://github.com/WhisperSystems/TextSecure.git
+$ git checkout push-library
+$ gradle build
+$ adb install -r build/apk/TextSecure-debug-unaligned.apk
+```
+You'll need gradle > 1.8 installed on your build machine, as well as the
+"Android Support Repository" and "Google Repository" installed from the
+Android SDK manager on your build machine.
+
+## Cryptography Notice
+
+This distribution includes cryptographic software. The country in which you currently reside may have restrictions on the import, possession, use, and/or re-export to another country, of encryption software. 
+BEFORE using any encryption software, please check your country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted. 
+See <http://www.wassenaar.org/> for more information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and Security (BIS), has classified this software as Export Commodity Control Number (ECCN) 5D002.C.1, which includes information security software using or performing cryptographic functions with asymmetric algorithms. 
+The form and manner of this distribution makes it eligible for export under the License Exception ENC Technology Software Unrestricted (TSU) exception (see the BIS Export Administration Regulations, Section 740.13) for both object code and source code.
+
+## License
+
+Copyright 2013 Whisper Systems
+
+Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html