keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Laying ground for signup flow refactoring

Browse Source
pull/1/head
Frederic Jacobs 11 years ago
parent 43af8c18e3
commit b9907b9a32
6 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File

2
Podfile
Unescape Escape View File

@ -6,7 +6,7 @@ link_with ["Signal", "SignalTests"]
pod 'UICKeyChainStore', :podspec => 'Podspecs/UICKeyChainStore.podspec' pod 'UICKeyChainStore', :podspec => 'Podspecs/UICKeyChainStore.podspec'
pod 'SocketRocket', :git => 'https://github.com/square/SocketRocket.git', :commit => 'd0585af165' pod 'SocketRocket', :git => 'https://github.com/square/SocketRocket.git', :commit => 'd0585af165'
pod 'OpenSSL', '~> 1.0.109' pod 'OpenSSL', '~> 1.0.110'
pod 'libPhoneNumber-iOS', '~> 0.7' pod 'libPhoneNumber-iOS', '~> 0.7'
pod 'AxolotlKit', '~> 0.1' pod 'AxolotlKit', '~> 0.1'
pod 'PastelogKit', '~> 1.2' pod 'PastelogKit', '~> 1.2'

6
Podfile.lock
Unescape Escape View File

@ -39,7 +39,7 @@ PODS:
- Mantle (1.5.1): - Mantle (1.5.1):
- Mantle/extobjc (= 1.5.1) - Mantle/extobjc (= 1.5.1)
- Mantle/extobjc (1.5.1) - Mantle/extobjc (1.5.1)
- OpenSSL (1.0.109) - OpenSSL (1.0.110)
- PastelogKit (1.2): - PastelogKit (1.2):
- CocoaLumberjack (~> 1.9) - CocoaLumberjack (~> 1.9)
- ProtocolBuffers (1.9.2) - ProtocolBuffers (1.9.2)
@ -64,7 +64,7 @@ DEPENDENCIES:
- JSQMessagesViewController (from `https://github.com/dtsbourg/JSQMessagesViewController`, branch `JSignalQ`) - JSQMessagesViewController (from `https://github.com/dtsbourg/JSQMessagesViewController`, branch `JSignalQ`)
- libPhoneNumber-iOS (~> 0.7) - libPhoneNumber-iOS (~> 0.7)
- Mantle (~> 1.5) - Mantle (~> 1.5)
- OpenSSL (~> 1.0.109) - OpenSSL (~> 1.0.110)
- PastelogKit (~> 1.2) - PastelogKit (~> 1.2)
- SocketRocket (from `https://github.com/square/SocketRocket.git`, commit `d0585af165`) - SocketRocket (from `https://github.com/square/SocketRocket.git`, commit `d0585af165`)
- TwistedOakCollapsingFutures (~> 1.0) - TwistedOakCollapsingFutures (~> 1.0)
@ -100,7 +100,7 @@ SPEC CHECKSUMS:
JSQSystemSoundPlayer: c98443b1cbb3b45db09d0d3d6c2355cf78294981 JSQSystemSoundPlayer: c98443b1cbb3b45db09d0d3d6c2355cf78294981
libPhoneNumber-iOS: 98fc07d70c8fdb5e6a8e3442c37e97353065c20e libPhoneNumber-iOS: 98fc07d70c8fdb5e6a8e3442c37e97353065c20e
Mantle: d7c5ac734579ec751c58fecbf56189853056c58c Mantle: d7c5ac734579ec751c58fecbf56189853056c58c
OpenSSL: 4810adf5c99b0e2cd20670a11a987c805e8a521c OpenSSL: 72a82aa51b056ae5833307a3fef9b571f38ce11c
PastelogKit: 8bab71b1d187617a83e7124cffe9eb1a600e6695 PastelogKit: 8bab71b1d187617a83e7124cffe9eb1a600e6695
ProtocolBuffers: a834d6fe4ae0cc94d081b864e4948bdd483ad228 ProtocolBuffers: a834d6fe4ae0cc94d081b864e4948bdd483ad228
SocketRocket: 9cbe08469513356cddc0afcab1ff160bd190296a SocketRocket: 9cbe08469513356cddc0afcab1ff160bd190296a

2
Signal/Signal-Info.plist
Unescape Escape View File

@ -48,8 +48,6 @@
<string>remote-notification</string> <string>remote-notification</string>
<string>voip</string> <string>voip</string>
</array> </array>
<key>UILaunchStoryboardName</key>
<string>Storyboard</string>
<key>UIRequiredDeviceCapabilities</key> <key>UIRequiredDeviceCapabilities</key>
<array> <array>
<string>armv7</string> <string>armv7</string>

19
Signal/src/AppDelegate.m
Unescape Escape View File

@ -12,6 +12,7 @@
#import "PriorityQueue.h" #import "PriorityQueue.h"
#import "RecentCallManager.h" #import "RecentCallManager.h"
#import "Release.h" #import "Release.h"
#import "TSAccountManager.h"
#import "Util.h" #import "Util.h"
#import "VersionMigrations.h" #import "VersionMigrations.h"
@ -163,22 +164,20 @@
} onThread:NSThread.mainThread untilCancelled:nil]; } onThread:NSThread.mainThread untilCancelled:nil];
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Storyboard" bundle:nil]; UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Storyboard" bundle:[NSBundle mainBundle]];
InitialViewController *viewControllerForNewUser = [storyboard instantiateViewControllerWithIdentifier:@"UserInitialViewController"]; UIViewController *viewController;
UITabBarController *viewController = [storyboard instantiateViewControllerWithIdentifier:@"UserInitialViewController"]; if (![TSAccountManager isRegistered]) {
viewController = [storyboard instantiateViewControllerWithIdentifier:@"RegisterInitialViewController"];
BOOL isNewUser = NO; } else{
if (isNewUser) { viewController = [storyboard instantiateViewControllerWithIdentifier:@"UserInitialViewController"];
self.window.rootViewController = viewControllerForNewUser;
} else {
self.window.rootViewController = viewController;
} }
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
self.window.rootViewController = viewController;
[self.window makeKeyAndVisible]; [self.window makeKeyAndVisible];
return YES; return YES;
} }

12
Signal/src/Storyboard/Storyboard.storyboard
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14A388a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="kts-vO-ui1"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="kts-vO-ui1">
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
<capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/> <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
@ -15,7 +15,7 @@
<viewControllerLayoutGuide type="bottom" id="7uh-gm-z8v"/> <viewControllerLayoutGuide type="bottom" id="7uh-gm-z8v"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="EFA-Fu-XJm"> <view key="view" contentMode="scaleToFill" id="EFA-Fu-XJm">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <rect key="frame" x="0.0" y="0.0" width="600" height="551"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="PaA-ol-uQT"> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="PaA-ol-uQT">
@ -117,7 +117,7 @@
<viewControllerLayoutGuide type="bottom" id="stV-ob-KSQ"/> <viewControllerLayoutGuide type="bottom" id="stV-ob-KSQ"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="5r3-kq-bbI"> <view key="view" contentMode="scaleToFill" id="5r3-kq-bbI">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <rect key="frame" x="0.0" y="0.0" width="600" height="551"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view> </view>
@ -1428,7 +1428,7 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
<objects> <objects>
<tableViewController id="6mY-1Q-YBT" customClass="ContactsTableViewController" sceneMemberID="viewController"> <tableViewController id="6mY-1Q-YBT" customClass="ContactsTableViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="GqA-oC-CJa"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="GqA-oC-CJa">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <rect key="frame" x="0.0" y="0.0" width="600" height="551"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<connections> <connections>
@ -1456,7 +1456,7 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
<objects> <objects>
<tableViewController id="0XE-hu-8cu" customClass="ContactDetailTableViewController" sceneMemberID="viewController"> <tableViewController id="0XE-hu-8cu" customClass="ContactDetailTableViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="default" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="150" sectionHeaderHeight="22" sectionFooterHeight="22" id="RoU-YO-d5P"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="default" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="150" sectionHeaderHeight="22" sectionFooterHeight="22" id="RoU-YO-d5P">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <rect key="frame" x="0.0" y="0.0" width="600" height="551"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/> <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
@ -2435,7 +2435,7 @@ Lorem ipsum : Quick explanation of Fingerprints</string>
<objects> <objects>
<tableViewController id="n1f-7Y-906" customClass="SettingsTableViewController" sceneMemberID="viewController"> <tableViewController id="n1f-7Y-906" customClass="SettingsTableViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="FhQ-dM-1mj"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="FhQ-dM-1mj">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <rect key="frame" x="0.0" y="0.0" width="600" height="551"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
<view key="tableFooterView" contentMode="scaleToFill" id="Ezq-Cw-na2"> <view key="tableFooterView" contentMode="scaleToFill" id="Ezq-Cw-na2">

2
Signal/test/textsecure/TSStorageIdentityKeyStoreTests.m
Unescape Escape View File

@ -9,6 +9,7 @@
#import <XCTest/XCTest.h> #import <XCTest/XCTest.h>
#import <25519/Curve25519.h> #import <25519/Curve25519.h>
#import "TSStorageManager.h"
#import "TSStorageManager+IdentityKeyStore.h" #import "TSStorageManager+IdentityKeyStore.h"
#import "SecurityUtils.h" #import "SecurityUtils.h"
@ -20,6 +21,7 @@
- (void)setUp { - (void)setUp {
[super setUp]; [super setUp];
[[TSStorageManager sharedManager] purgeCollection:@"TSStorageManagerTrustedKeysCollection"];
// Put setup code here. This method is called before the invocation of each test method in the class. // Put setup code here. This method is called before the invocation of each test method in the class.
} }

Write Preview
Loading…
Cancel
Save