Revert "renaming"

This reverts commit f264279.
fleupold · Dec 13, 2013 · cf3b75a · cf3b75a
1 parent f264279
commit cf3b75a
Show file tree

Hide file tree

Showing 247 changed files with 6 additions and 10 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/SafeChat/.DS_Store → FBEncryption/.DS_Store b/SafeChat/.DS_Store → FBEncryption/.DS_Store
diff --git a/...hat/AFNetworking/AFHTTPRequestOperation.h → ...ion/AFNetworking/AFHTTPRequestOperation.h b/...hat/AFNetworking/AFHTTPRequestOperation.h → ...ion/AFNetworking/AFHTTPRequestOperation.h
diff --git a/...hat/AFNetworking/AFHTTPRequestOperation.m → ...ion/AFNetworking/AFHTTPRequestOperation.m b/...hat/AFNetworking/AFHTTPRequestOperation.m → ...ion/AFNetworking/AFHTTPRequestOperation.m
diff --git a/...etworking/AFHTTPRequestOperationManager.h → ...etworking/AFHTTPRequestOperationManager.h b/...etworking/AFHTTPRequestOperationManager.h → ...etworking/AFHTTPRequestOperationManager.h
diff --git a/...etworking/AFHTTPRequestOperationManager.m → ...etworking/AFHTTPRequestOperationManager.m b/...etworking/AFHTTPRequestOperationManager.m → ...etworking/AFHTTPRequestOperationManager.m
diff --git a/SafeChat/AFNetworking/AFHTTPSessionManager.h → ...ption/AFNetworking/AFHTTPSessionManager.h b/SafeChat/AFNetworking/AFHTTPSessionManager.h → ...ption/AFNetworking/AFHTTPSessionManager.h
diff --git a/SafeChat/AFNetworking/AFHTTPSessionManager.m → ...ption/AFNetworking/AFHTTPSessionManager.m b/SafeChat/AFNetworking/AFHTTPSessionManager.m → ...ption/AFNetworking/AFHTTPSessionManager.m
diff --git a/...Networking/AFNetworkReachabilityManager.h → ...Networking/AFNetworkReachabilityManager.h b/...Networking/AFNetworkReachabilityManager.h → ...Networking/AFNetworkReachabilityManager.h
diff --git a/...Networking/AFNetworkReachabilityManager.m → ...Networking/AFNetworkReachabilityManager.m b/...Networking/AFNetworkReachabilityManager.m → ...Networking/AFNetworkReachabilityManager.m
diff --git a/SafeChat/AFNetworking/AFNetworking.h → FBEncryption/AFNetworking/AFNetworking.h b/SafeChat/AFNetworking/AFNetworking.h → FBEncryption/AFNetworking/AFNetworking.h
diff --git a/SafeChat/AFNetworking/AFSecurityPolicy.h → FBEncryption/AFNetworking/AFSecurityPolicy.h b/SafeChat/AFNetworking/AFSecurityPolicy.h → FBEncryption/AFNetworking/AFSecurityPolicy.h
diff --git a/SafeChat/AFNetworking/AFSecurityPolicy.m → FBEncryption/AFNetworking/AFSecurityPolicy.m b/SafeChat/AFNetworking/AFSecurityPolicy.m → FBEncryption/AFNetworking/AFSecurityPolicy.m
diff --git a/...t/AFNetworking/AFURLConnectionOperation.h → ...n/AFNetworking/AFURLConnectionOperation.h b/...t/AFNetworking/AFURLConnectionOperation.h → ...n/AFNetworking/AFURLConnectionOperation.h
diff --git a/...t/AFNetworking/AFURLConnectionOperation.m → ...n/AFNetworking/AFURLConnectionOperation.m b/...t/AFNetworking/AFURLConnectionOperation.m → ...n/AFNetworking/AFURLConnectionOperation.m
diff --git a/.../AFNetworking/AFURLRequestSerialization.h → .../AFNetworking/AFURLRequestSerialization.h b/.../AFNetworking/AFURLRequestSerialization.h → .../AFNetworking/AFURLRequestSerialization.h
diff --git a/.../AFNetworking/AFURLRequestSerialization.m → .../AFNetworking/AFURLRequestSerialization.m b/.../AFNetworking/AFURLRequestSerialization.m → .../AFNetworking/AFURLRequestSerialization.m
diff --git a/...AFNetworking/AFURLResponseSerialization.h → ...AFNetworking/AFURLResponseSerialization.h b/...AFNetworking/AFURLResponseSerialization.h → ...AFNetworking/AFURLResponseSerialization.h
diff --git a/...AFNetworking/AFURLResponseSerialization.m → ...AFNetworking/AFURLResponseSerialization.m b/...AFNetworking/AFURLResponseSerialization.m → ...AFNetworking/AFURLResponseSerialization.m
diff --git a/SafeChat/AFNetworking/AFURLSessionManager.h → ...yption/AFNetworking/AFURLSessionManager.h b/SafeChat/AFNetworking/AFURLSessionManager.h → ...yption/AFNetworking/AFURLSessionManager.h
diff --git a/SafeChat/AFNetworking/AFURLSessionManager.m → ...yption/AFNetworking/AFURLSessionManager.m b/SafeChat/AFNetworking/AFURLSessionManager.m → ...yption/AFNetworking/AFURLSessionManager.m
diff --git a/SafeChat/BPAppDelegate.h → FBEncryption/BPAppDelegate.h b/SafeChat/BPAppDelegate.h → FBEncryption/BPAppDelegate.h
diff --git a/SafeChat/BPAppDelegate.m → FBEncryption/BPAppDelegate.m b/SafeChat/BPAppDelegate.m → FBEncryption/BPAppDelegate.m
diff --git a/SafeChat/BPComposeViewController.h → FBEncryption/BPComposeViewController.h b/SafeChat/BPComposeViewController.h → FBEncryption/BPComposeViewController.h
diff --git a/SafeChat/BPComposeViewController.m → FBEncryption/BPComposeViewController.m b/SafeChat/BPComposeViewController.m → FBEncryption/BPComposeViewController.m
diff --git a/SafeChat/BPConfigurationViewController.h → FBEncryption/BPConfigurationViewController.h b/SafeChat/BPConfigurationViewController.h → FBEncryption/BPConfigurationViewController.h
diff --git a/SafeChat/BPConfigurationViewController.m → FBEncryption/BPConfigurationViewController.m b/SafeChat/BPConfigurationViewController.m → FBEncryption/BPConfigurationViewController.m
diff --git a/...Chat/BPConversationDetailViewController.h → ...tion/BPConversationDetailViewController.h b/...Chat/BPConversationDetailViewController.h → ...tion/BPConversationDetailViewController.h
diff --git a/...Chat/BPConversationDetailViewController.m → ...tion/BPConversationDetailViewController.m b/...Chat/BPConversationDetailViewController.m → ...tion/BPConversationDetailViewController.m
diff --git a/...Chat/BPConversationMasterViewController.h → ...tion/BPConversationMasterViewController.h b/...Chat/BPConversationMasterViewController.h → ...tion/BPConversationMasterViewController.h
diff --git a/...Chat/BPConversationMasterViewController.m → ...tion/BPConversationMasterViewController.m b/...Chat/BPConversationMasterViewController.m → ...tion/BPConversationMasterViewController.m
diff --git a/SafeChat/BPEncryptedObject.h → FBEncryption/BPEncryptedObject.h b/SafeChat/BPEncryptedObject.h → FBEncryption/BPEncryptedObject.h
diff --git a/SafeChat/BPEncryptedObject.m → FBEncryption/BPEncryptedObject.m b/SafeChat/BPEncryptedObject.m → FBEncryption/BPEncryptedObject.m
diff --git a/SafeChat/BPFacebookDateFormatter.h → FBEncryption/BPFacebookDateFormatter.h b/SafeChat/BPFacebookDateFormatter.h → FBEncryption/BPFacebookDateFormatter.h
diff --git a/SafeChat/BPFacebookDateFormatter.m → FBEncryption/BPFacebookDateFormatter.m b/SafeChat/BPFacebookDateFormatter.m → FBEncryption/BPFacebookDateFormatter.m
diff --git a/SafeChat/BPFacebookLoginViewController.h → FBEncryption/BPFacebookLoginViewController.h b/SafeChat/BPFacebookLoginViewController.h → FBEncryption/BPFacebookLoginViewController.h
diff --git a/SafeChat/BPFacebookLoginViewController.m → FBEncryption/BPFacebookLoginViewController.m b/SafeChat/BPFacebookLoginViewController.m → FBEncryption/BPFacebookLoginViewController.m
diff --git a/SafeChat/BPFqlMessage.h → FBEncryption/BPFqlMessage.h b/SafeChat/BPFqlMessage.h → FBEncryption/BPFqlMessage.h
diff --git a/SafeChat/BPFqlMessage.m → FBEncryption/BPFqlMessage.m b/SafeChat/BPFqlMessage.m → FBEncryption/BPFqlMessage.m
diff --git a/SafeChat/BPFqlRequestManager.h → FBEncryption/BPFqlRequestManager.h b/SafeChat/BPFqlRequestManager.h → FBEncryption/BPFqlRequestManager.h
diff --git a/SafeChat/BPFqlRequestManager.m → FBEncryption/BPFqlRequestManager.m b/SafeChat/BPFqlRequestManager.m → FBEncryption/BPFqlRequestManager.m
@@ -51,7 +51,7 @@ +(void)requestThreadsBefore: (NSDate *)before
     [operation setCompletionBlockWithSuccess:^(AFHTTPRequestOperation *operation, id responseObject) {
         successBlock(responseObject);
     } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
-        //NSLog(@"%@", fql);
+        NSLog(@"%@", fql);
         failureBlock(error);
     }];
 

diff --git a/SafeChat/BPFqlThread.h → FBEncryption/BPFqlThread.h b/SafeChat/BPFqlThread.h → FBEncryption/BPFqlThread.h
diff --git a/SafeChat/BPFqlThread.m → FBEncryption/BPFqlThread.m b/SafeChat/BPFqlThread.m → FBEncryption/BPFqlThread.m
diff --git a/SafeChat/BPFriend.h → FBEncryption/BPFriend.h b/SafeChat/BPFriend.h → FBEncryption/BPFriend.h
diff --git a/SafeChat/BPFriend.m → FBEncryption/BPFriend.m b/SafeChat/BPFriend.m → FBEncryption/BPFriend.m
diff --git a/SafeChat/BPInboxThread.h → FBEncryption/BPInboxThread.h b/SafeChat/BPInboxThread.h → FBEncryption/BPInboxThread.h
diff --git a/SafeChat/BPInboxThread.m → FBEncryption/BPInboxThread.m b/SafeChat/BPInboxThread.m → FBEncryption/BPInboxThread.m
diff --git a/SafeChat/BPJavascriptRuntime.h → FBEncryption/BPJavascriptRuntime.h b/SafeChat/BPJavascriptRuntime.h → FBEncryption/BPJavascriptRuntime.h
diff --git a/SafeChat/BPJavascriptRuntime.m → FBEncryption/BPJavascriptRuntime.m b/SafeChat/BPJavascriptRuntime.m → FBEncryption/BPJavascriptRuntime.m
diff --git a/SafeChat/BPMessage.h → FBEncryption/BPMessage.h b/SafeChat/BPMessage.h → FBEncryption/BPMessage.h
diff --git a/SafeChat/BPMessage.m → FBEncryption/BPMessage.m b/SafeChat/BPMessage.m → FBEncryption/BPMessage.m
@@ -49,7 +49,7 @@ -(id)init
 
 -(NSString *)text
 {
-    if (_text != nil && [_text rangeOfString: @"SAFECHAT.IM"].location != NSNotFound) {
+    if (_text != nil && [_text rangeOfString: @"BLOCKPRISM.ORG"].location != NSNotFound) {
         _text = [self decryptMessage: _text];
     }
     return _text;
@@ -67,7 +67,7 @@ -(NSString *)decryptMessage: (NSString *)message
     //We break up the message into a submessage for each user and
     //look for the one that is currently logged in.
     BPFriend *me = [BPFriend me];
-    NSArray *submessages = [message componentsSeparatedByString: @"SAFECHAT.IM"];
+    NSArray *submessages = [message componentsSeparatedByString: @"BLOCKPRISM.ORG_"];
     for (NSString *submessage in submessages)
     {
         if ([submessage rangeOfString: me.username].location == NSNotFound)
@@ -104,7 +104,7 @@ -(NSString *)encryptForParticipants: (NSArray *)participants
             continue;
         }
         NSString *cipher = [[BPJavascriptRuntime getInstance] encrypt: self.text withSessionKey:participant.sessionKey];
-        NSString *encryptedPart = [NSString stringWithFormat: @"SAFECHAT.IM_%@@%@@%@", me.username, participant.username, cipher];
+        NSString *encryptedPart = [NSString stringWithFormat: @"BLOCKPRISM.ORG_%@@%@@%@", me.username, participant.username, cipher];
         encryptedMessage = [encryptedMessage stringByAppendingString: encryptedPart];
     }
     self.encrypted = YES;

diff --git a/SafeChat/BPMessageMashupImageView.h → FBEncryption/BPMessageMashupImageView.h b/SafeChat/BPMessageMashupImageView.h → FBEncryption/BPMessageMashupImageView.h
diff --git a/SafeChat/BPMessageMashupImageView.m → FBEncryption/BPMessageMashupImageView.m b/SafeChat/BPMessageMashupImageView.m → FBEncryption/BPMessageMashupImageView.m
diff --git a/SafeChat/BPMessageTableViewCell.h → FBEncryption/BPMessageTableViewCell.h b/SafeChat/BPMessageTableViewCell.h → FBEncryption/BPMessageTableViewCell.h
diff --git a/SafeChat/BPMessageTableViewCell.m → FBEncryption/BPMessageTableViewCell.m b/SafeChat/BPMessageTableViewCell.m → FBEncryption/BPMessageTableViewCell.m
diff --git a/...Chat/BPRecipientSuggestionTableViewCell.h → ...tion/BPRecipientSuggestionTableViewCell.h b/...Chat/BPRecipientSuggestionTableViewCell.h → ...tion/BPRecipientSuggestionTableViewCell.h
diff --git a/...Chat/BPRecipientSuggestionTableViewCell.m → ...tion/BPRecipientSuggestionTableViewCell.m b/...Chat/BPRecipientSuggestionTableViewCell.m → ...tion/BPRecipientSuggestionTableViewCell.m
diff --git a/SafeChat/BPRecipientsTableDataSource.h → FBEncryption/BPRecipientsTableDataSource.h b/SafeChat/BPRecipientsTableDataSource.h → FBEncryption/BPRecipientsTableDataSource.h
diff --git a/SafeChat/BPRecipientsTableDataSource.m → FBEncryption/BPRecipientsTableDataSource.m b/SafeChat/BPRecipientsTableDataSource.m → FBEncryption/BPRecipientsTableDataSource.m
diff --git a/SafeChat/BPServerRequestManager.h → FBEncryption/BPServerRequestManager.h b/SafeChat/BPServerRequestManager.h → FBEncryption/BPServerRequestManager.h
diff --git a/SafeChat/BPServerRequestManager.m → FBEncryption/BPServerRequestManager.m b/SafeChat/BPServerRequestManager.m → FBEncryption/BPServerRequestManager.m
diff --git a/SafeChat/BPThread.h → FBEncryption/BPThread.h b/SafeChat/BPThread.h → FBEncryption/BPThread.h
diff --git a/SafeChat/BPThread.m → FBEncryption/BPThread.m b/SafeChat/BPThread.m → FBEncryption/BPThread.m
diff --git a/SafeChat/Base.lproj/Main.storyboard → FBEncryption/Base.lproj/Main.storyboard b/SafeChat/Base.lproj/Main.storyboard → FBEncryption/Base.lproj/Main.storyboard
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/SafeChat/JSMessagesViewController/.DS_Store → ...yption/JSMessagesViewController/.DS_Store b/SafeChat/JSMessagesViewController/.DS_Store → ...yption/JSMessagesViewController/.DS_Store
diff --git a/...sses/Categories/NSString+JSMessagesView.h → ...sses/Categories/NSString+JSMessagesView.h b/...sses/Categories/NSString+JSMessagesView.h → ...sses/Categories/NSString+JSMessagesView.h
diff --git a/...sses/Categories/NSString+JSMessagesView.m → ...sses/Categories/NSString+JSMessagesView.m b/...sses/Categories/NSString+JSMessagesView.m → ...sses/Categories/NSString+JSMessagesView.m
diff --git a/...sses/Categories/UIButton+JSMessagesView.h → ...sses/Categories/UIButton+JSMessagesView.h b/...sses/Categories/UIButton+JSMessagesView.h → ...sses/Categories/UIButton+JSMessagesView.h
diff --git a/...sses/Categories/UIButton+JSMessagesView.m → ...sses/Categories/UIButton+JSMessagesView.m b/...sses/Categories/UIButton+JSMessagesView.m → ...sses/Categories/UIButton+JSMessagesView.m
diff --git a/...asses/Categories/UIColor+JSMessagesView.h → ...asses/Categories/UIColor+JSMessagesView.h b/...asses/Categories/UIColor+JSMessagesView.h → ...asses/Categories/UIColor+JSMessagesView.h
diff --git a/...asses/Categories/UIColor+JSMessagesView.m → ...asses/Categories/UIColor+JSMessagesView.m b/...asses/Categories/UIColor+JSMessagesView.m → ...asses/Categories/UIColor+JSMessagesView.m
diff --git a/...asses/Categories/UIImage+JSMessagesView.h → ...asses/Categories/UIImage+JSMessagesView.h b/...asses/Categories/UIImage+JSMessagesView.h → ...asses/Categories/UIImage+JSMessagesView.h
diff --git a/...asses/Categories/UIImage+JSMessagesView.m → ...asses/Categories/UIImage+JSMessagesView.m b/...asses/Categories/UIImage+JSMessagesView.m → ...asses/Categories/UIImage+JSMessagesView.m
diff --git a/.../Classes/Factories/JSAvatarImageFactory.h → .../Classes/Factories/JSAvatarImageFactory.h b/.../Classes/Factories/JSAvatarImageFactory.h → .../Classes/Factories/JSAvatarImageFactory.h
diff --git a/.../Classes/Factories/JSAvatarImageFactory.m → .../Classes/Factories/JSAvatarImageFactory.m b/.../Classes/Factories/JSAvatarImageFactory.m → .../Classes/Factories/JSAvatarImageFactory.m
diff --git a/...sses/Factories/JSBubbleImageViewFactory.h → ...sses/Factories/JSBubbleImageViewFactory.h b/...sses/Factories/JSBubbleImageViewFactory.h → ...sses/Factories/JSBubbleImageViewFactory.h
diff --git a/...sses/Factories/JSBubbleImageViewFactory.m → ...sses/Factories/JSBubbleImageViewFactory.m b/...sses/Factories/JSBubbleImageViewFactory.m → ...sses/Factories/JSBubbleImageViewFactory.m
diff --git a/...wController/Classes/JSBubbleMessageCell.h → ...wController/Classes/JSBubbleMessageCell.h b/...wController/Classes/JSBubbleMessageCell.h → ...wController/Classes/JSBubbleMessageCell.h
diff --git a/...wController/Classes/JSBubbleMessageCell.m → ...wController/Classes/JSBubbleMessageCell.m b/...wController/Classes/JSBubbleMessageCell.m → ...wController/Classes/JSBubbleMessageCell.m
diff --git a/...agesViewController/Classes/JSBubbleView.h → ...agesViewController/Classes/JSBubbleView.h b/...agesViewController/Classes/JSBubbleView.h → ...agesViewController/Classes/JSBubbleView.h
diff --git a/...agesViewController/Classes/JSBubbleView.m → ...agesViewController/Classes/JSBubbleView.m b/...agesViewController/Classes/JSBubbleView.m → ...agesViewController/Classes/JSBubbleView.m
diff --git a/...Controller/Classes/JSDismissiveTextView.h → ...Controller/Classes/JSDismissiveTextView.h b/...Controller/Classes/JSDismissiveTextView.h → ...Controller/Classes/JSDismissiveTextView.h
diff --git a/...Controller/Classes/JSDismissiveTextView.m → ...Controller/Classes/JSDismissiveTextView.m b/...Controller/Classes/JSDismissiveTextView.m → ...Controller/Classes/JSDismissiveTextView.m
diff --git a/...ewController/Classes/JSMessageInputView.h → ...ewController/Classes/JSMessageInputView.h b/...ewController/Classes/JSMessageInputView.h → ...ewController/Classes/JSMessageInputView.h
diff --git a/...ewController/Classes/JSMessageInputView.m → ...ewController/Classes/JSMessageInputView.m b/...ewController/Classes/JSMessageInputView.m → ...ewController/Classes/JSMessageInputView.m
diff --git a/...Controller/Classes/JSMessageSoundEffect.h → ...Controller/Classes/JSMessageSoundEffect.h b/...Controller/Classes/JSMessageSoundEffect.h → ...Controller/Classes/JSMessageSoundEffect.h
diff --git a/...Controller/Classes/JSMessageSoundEffect.m → ...Controller/Classes/JSMessageSoundEffect.m b/...Controller/Classes/JSMessageSoundEffect.m → ...Controller/Classes/JSMessageSoundEffect.m
diff --git a/...iewController/Classes/JSMessageTextView.h → ...iewController/Classes/JSMessageTextView.h b/...iewController/Classes/JSMessageTextView.h → ...iewController/Classes/JSMessageTextView.h
diff --git a/...iewController/Classes/JSMessageTextView.m → ...iewController/Classes/JSMessageTextView.m b/...iewController/Classes/JSMessageTextView.m → ...iewController/Classes/JSMessageTextView.m
diff --git a/...roller/Classes/JSMessagesViewController.h → ...roller/Classes/JSMessagesViewController.h b/...roller/Classes/JSMessagesViewController.h → ...roller/Classes/JSMessagesViewController.h
diff --git a/...roller/Classes/JSMessagesViewController.m → ...roller/Classes/JSMessagesViewController.m b/...roller/Classes/JSMessagesViewController.m → ...roller/Classes/JSMessagesViewController.m
diff --git a/...essagesViewController/Resources/.DS_Store → ...essagesViewController/Resources/.DS_Store b/...essagesViewController/Resources/.DS_Store → ...essagesViewController/Resources/.DS_Store
diff --git a/...ViewController/Resources/Images/.DS_Store → ...ViewController/Resources/Images/.DS_Store b/...ViewController/Resources/Images/.DS_Store → ...ViewController/Resources/Images/.DS_Store
diff --git a/...sic-square/bubble-classic-square-blue.png → ...sic-square/bubble-classic-square-blue.png b/...sic-square/bubble-classic-square-blue.png → ...sic-square/bubble-classic-square-blue.png
diff --git a/...-square/[email protected] → ...-square/[email protected] b/...-square/[email protected] → ...-square/[email protected]
diff --git a/...sic-square/bubble-classic-square-gray.png → ...sic-square/bubble-classic-square-gray.png b/...sic-square/bubble-classic-square-gray.png → ...sic-square/bubble-classic-square-gray.png
diff --git a/...-square/[email protected] → ...-square/[email protected] b/...-square/[email protected] → ...-square/[email protected]
diff --git a/...square/bubble-classic-square-selected.png → ...square/bubble-classic-square-selected.png b/...square/bubble-classic-square-selected.png → ...square/bubble-classic-square-selected.png
diff --git a/...are/[email protected] → ...are/[email protected] b/...are/[email protected] → ...are/[email protected]
diff --git a/...es/bubble-classic/bubble-classic-blue.png → ...es/bubble-classic/bubble-classic-blue.png b/...es/bubble-classic/bubble-classic-blue.png → ...es/bubble-classic/bubble-classic-blue.png
diff --git a/...bubble-classic/[email protected] → ...bubble-classic/[email protected] b/...bubble-classic/[email protected] → ...bubble-classic/[email protected]
diff --git a/...es/bubble-classic/bubble-classic-gray.png → ...es/bubble-classic/bubble-classic-gray.png b/...es/bubble-classic/bubble-classic-gray.png → ...es/bubble-classic/bubble-classic-gray.png
diff --git a/...bubble-classic/[email protected] → ...bubble-classic/[email protected] b/...bubble-classic/[email protected] → ...bubble-classic/[email protected]
diff --git a/...s/bubble-classic/bubble-classic-green.png → ...s/bubble-classic/bubble-classic-green.png b/...s/bubble-classic/bubble-classic-green.png → ...s/bubble-classic/bubble-classic-green.png
diff --git a/...ubble-classic/[email protected] → ...ubble-classic/[email protected] b/...ubble-classic/[email protected] → ...ubble-classic/[email protected]
diff --git a/...ubble-classic/bubble-classic-selected.png → ...ubble-classic/bubble-classic-selected.png b/...ubble-classic/bubble-classic-selected.png → ...ubble-classic/bubble-classic-selected.png
diff --git a/...le-classic/[email protected] → ...le-classic/[email protected] b/...le-classic/[email protected] → ...le-classic/[email protected]
diff --git a/.../bubble-classic/bubble-classic-typing.png → .../bubble-classic/bubble-classic-typing.png b/.../bubble-classic/bubble-classic-typing.png → .../bubble-classic/bubble-classic-typing.png
diff --git a/...bble-classic/[email protected] → ...bble-classic/[email protected] b/...bble-classic/[email protected] → ...bble-classic/[email protected]
diff --git a/...nput-bar-classic/input-bar-background.png → ...nput-bar-classic/input-bar-background.png b/...nput-bar-classic/input-bar-background.png → ...nput-bar-classic/input-bar-background.png
diff --git a/...t-bar-classic/[email protected] → ...t-bar-classic/[email protected] b/...t-bar-classic/[email protected] → ...t-bar-classic/[email protected]
diff --git a/...s/input-bar-classic/input-field-cover.png → ...s/input-bar-classic/input-field-cover.png b/...s/input-bar-classic/input-field-cover.png → ...s/input-bar-classic/input-field-cover.png
diff --git a/...nput-bar-classic/[email protected] → ...nput-bar-classic/[email protected] b/...nput-bar-classic/[email protected] → ...nput-bar-classic/[email protected]
diff --git a/...input-bar-classic/send-button-pressed.png → ...input-bar-classic/send-button-pressed.png b/...input-bar-classic/send-button-pressed.png → ...input-bar-classic/send-button-pressed.png
diff --git a/...ut-bar-classic/[email protected] → ...ut-bar-classic/[email protected] b/...ut-bar-classic/[email protected] → ...ut-bar-classic/[email protected]
diff --git a/.../Images/input-bar-classic/send-button.png → .../Images/input-bar-classic/send-button.png b/.../Images/input-bar-classic/send-button.png → .../Images/input-bar-classic/send-button.png
diff --git a/...ages/input-bar-classic/[email protected] → ...ages/input-bar-classic/[email protected] b/...ages/input-bar-classic/[email protected] → ...ages/input-bar-classic/[email protected]
diff --git a/...er/Resources/Sounds/message-received.aiff → ...er/Resources/Sounds/message-received.aiff b/...er/Resources/Sounds/message-received.aiff → ...er/Resources/Sounds/message-received.aiff
diff --git a/...roller/Resources/Sounds/message-sent.aiff → ...roller/Resources/Sounds/message-sent.aiff b/...roller/Resources/Sounds/message-sent.aiff → ...roller/Resources/Sounds/message-sent.aiff
diff --git a/SafeChat/Javascript/ec.js → FBEncryption/Javascript/ec.js b/SafeChat/Javascript/ec.js → FBEncryption/Javascript/ec.js
diff --git a/SafeChat/Javascript/encryption.js → FBEncryption/Javascript/encryption.js b/SafeChat/Javascript/encryption.js → FBEncryption/Javascript/encryption.js
diff --git a/...hat/Javascript/gibberish-aes-1.0.0.min.js → ...ion/Javascript/gibberish-aes-1.0.0.min.js b/...hat/Javascript/gibberish-aes-1.0.0.min.js → ...ion/Javascript/gibberish-aes-1.0.0.min.js
diff --git a/SafeChat/Javascript/jsbn.js → FBEncryption/Javascript/jsbn.js b/SafeChat/Javascript/jsbn.js → FBEncryption/Javascript/jsbn.js
diff --git a/SafeChat/Javascript/jsbn2.js → FBEncryption/Javascript/jsbn2.js b/SafeChat/Javascript/jsbn2.js → FBEncryption/Javascript/jsbn2.js
diff --git a/SafeChat/Javascript/sec.js → FBEncryption/Javascript/sec.js b/SafeChat/Javascript/sec.js → FBEncryption/Javascript/sec.js
diff --git a/SafeChat/Javascript/test.html → FBEncryption/Javascript/test.html b/SafeChat/Javascript/test.html → FBEncryption/Javascript/test.html
diff --git a/...inBindingsController/PDKeychainBindings.h → ...inBindingsController/PDKeychainBindings.h b/...inBindingsController/PDKeychainBindings.h → ...inBindingsController/PDKeychainBindings.h
diff --git a/...inBindingsController/PDKeychainBindings.m → ...inBindingsController/PDKeychainBindings.m b/...inBindingsController/PDKeychainBindings.m → ...inBindingsController/PDKeychainBindings.m
diff --git a/...Controller/PDKeychainBindingsController.h → ...Controller/PDKeychainBindingsController.h b/...Controller/PDKeychainBindingsController.h → ...Controller/PDKeychainBindingsController.h
diff --git a/...Controller/PDKeychainBindingsController.m → ...Controller/PDKeychainBindingsController.m b/...Controller/PDKeychainBindingsController.m → ...Controller/PDKeychainBindingsController.m
diff --git a/SafeChat/STableViewController/STHeaderView.h → ...ption/STableViewController/STHeaderView.h b/SafeChat/STableViewController/STHeaderView.h → ...ption/STableViewController/STHeaderView.h
diff --git a/SafeChat/STableViewController/STHeaderView.m → ...ption/STableViewController/STHeaderView.m b/SafeChat/STableViewController/STHeaderView.m → ...ption/STableViewController/STHeaderView.m
diff --git a/...ableViewController/STableViewController.h → ...ableViewController/STableViewController.h b/...ableViewController/STableViewController.h → ...ableViewController/STableViewController.h
diff --git a/...ableViewController/STableViewController.m → ...ableViewController/STableViewController.m b/...ableViewController/STableViewController.m → ...ableViewController/STableViewController.m
diff --git a/SafeChat/SafeChat.IM-Info.plist → FBEncryption/SafeChat.IM-Info.plist b/SafeChat/SafeChat.IM-Info.plist → FBEncryption/SafeChat.IM-Info.plist
@@ -17,6 +17,7 @@
 			<key>CFBundleIconFiles</key>
 			<array>
 				<string>icon</string>
+				<string>logo_58</string>
 				<string>logo_80</string>
 				<string>logo_120</string>
 				<string>logo</string>
@@ -59,7 +60,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.0</string>
+	<string>1.0</string>
 	<key>FacebookAppID</key>
 	<string>1378001845774632</string>
 	<key>FacebookDisplayName</key>

diff --git a/SafeChat/SafeChat.IM-Prefix.pch → FBEncryption/SafeChat.IM-Prefix.pch b/SafeChat/SafeChat.IM-Prefix.pch → FBEncryption/SafeChat.IM-Prefix.pch
diff --git a/SafeChat/XMPP/.DS_Store → FBEncryption/XMPP/.DS_Store b/SafeChat/XMPP/.DS_Store → FBEncryption/XMPP/.DS_Store
diff --git a/SafeChat/XMPP/FCBaseChatRequestManager.h → FBEncryption/XMPP/FCBaseChatRequestManager.h b/SafeChat/XMPP/FCBaseChatRequestManager.h → FBEncryption/XMPP/FCBaseChatRequestManager.h
diff --git a/SafeChat/XMPP/FCBaseChatRequestManager.m → FBEncryption/XMPP/FCBaseChatRequestManager.m b/SafeChat/XMPP/FCBaseChatRequestManager.m → FBEncryption/XMPP/FCBaseChatRequestManager.m
diff --git a/SafeChat/XMPP/XMPPFramework/.DS_Store → FBEncryption/XMPP/XMPPFramework/.DS_Store b/SafeChat/XMPP/XMPPFramework/.DS_Store → FBEncryption/XMPP/XMPPFramework/.DS_Store
diff --git a/...n/Anonymous/XMPPAnonymousAuthentication.h → ...n/Anonymous/XMPPAnonymousAuthentication.h b/...n/Anonymous/XMPPAnonymousAuthentication.h → ...n/Anonymous/XMPPAnonymousAuthentication.h
diff --git a/...n/Anonymous/XMPPAnonymousAuthentication.m → ...n/Anonymous/XMPPAnonymousAuthentication.m b/...n/Anonymous/XMPPAnonymousAuthentication.m → ...n/Anonymous/XMPPAnonymousAuthentication.m
diff --git a/...gest/XMPPDeprecatedDigestAuthentication.h → ...gest/XMPPDeprecatedDigestAuthentication.h b/...gest/XMPPDeprecatedDigestAuthentication.h → ...gest/XMPPDeprecatedDigestAuthentication.h
diff --git a/...gest/XMPPDeprecatedDigestAuthentication.m → ...gest/XMPPDeprecatedDigestAuthentication.m b/...gest/XMPPDeprecatedDigestAuthentication.m → ...gest/XMPPDeprecatedDigestAuthentication.m
diff --git a/...Plain/XMPPDeprecatedPlainAuthentication.h → ...Plain/XMPPDeprecatedPlainAuthentication.h b/...Plain/XMPPDeprecatedPlainAuthentication.h → ...Plain/XMPPDeprecatedPlainAuthentication.h
diff --git a/...Plain/XMPPDeprecatedPlainAuthentication.m → ...Plain/XMPPDeprecatedPlainAuthentication.m b/...Plain/XMPPDeprecatedPlainAuthentication.m → ...Plain/XMPPDeprecatedPlainAuthentication.m
diff --git a/.../Digest-MD5/XMPPDigestMD5Authentication.h → .../Digest-MD5/XMPPDigestMD5Authentication.h b/.../Digest-MD5/XMPPDigestMD5Authentication.h → .../Digest-MD5/XMPPDigestMD5Authentication.h
diff --git a/.../Digest-MD5/XMPPDigestMD5Authentication.m → .../Digest-MD5/XMPPDigestMD5Authentication.m b/.../Digest-MD5/XMPPDigestMD5Authentication.m → .../Digest-MD5/XMPPDigestMD5Authentication.m
diff --git a/...ntication/Plain/XMPPPlainAuthentication.h → ...ntication/Plain/XMPPPlainAuthentication.h b/...ntication/Plain/XMPPPlainAuthentication.h → ...ntication/Plain/XMPPPlainAuthentication.h
diff --git a/...ntication/Plain/XMPPPlainAuthentication.m → ...ntication/Plain/XMPPPlainAuthentication.m b/...ntication/Plain/XMPPPlainAuthentication.m → ...ntication/Plain/XMPPPlainAuthentication.m
diff --git a/...orm/XMPPXFacebookPlatformAuthentication.h → ...orm/XMPPXFacebookPlatformAuthentication.h b/...orm/XMPPXFacebookPlatformAuthentication.h → ...orm/XMPPXFacebookPlatformAuthentication.h
diff --git a/...orm/XMPPXFacebookPlatformAuthentication.m → ...orm/XMPPXFacebookPlatformAuthentication.m b/...orm/XMPPXFacebookPlatformAuthentication.m → ...orm/XMPPXFacebookPlatformAuthentication.m
diff --git a/...k/Authentication/XMPPSASLAuthentication.h → ...k/Authentication/XMPPSASLAuthentication.h b/...k/Authentication/XMPPSASLAuthentication.h → ...k/Authentication/XMPPSASLAuthentication.h
diff --git a/...PP/XMPPFramework/Categories/NSData+XMPP.h → ...PP/XMPPFramework/Categories/NSData+XMPP.h b/...PP/XMPPFramework/Categories/NSData+XMPP.h → ...PP/XMPPFramework/Categories/NSData+XMPP.h
diff --git a/...PP/XMPPFramework/Categories/NSData+XMPP.m → ...PP/XMPPFramework/Categories/NSData+XMPP.m b/...PP/XMPPFramework/Categories/NSData+XMPP.m → ...PP/XMPPFramework/Categories/NSData+XMPP.m
diff --git a/.../XMPPFramework/Categories/NSNumber+XMPP.h → .../XMPPFramework/Categories/NSNumber+XMPP.h b/.../XMPPFramework/Categories/NSNumber+XMPP.h → .../XMPPFramework/Categories/NSNumber+XMPP.h
diff --git a/.../XMPPFramework/Categories/NSNumber+XMPP.m → .../XMPPFramework/Categories/NSNumber+XMPP.m b/.../XMPPFramework/Categories/NSNumber+XMPP.m → .../XMPPFramework/Categories/NSNumber+XMPP.m
diff --git a/...PFramework/Categories/NSXMLElement+XMPP.h → ...PFramework/Categories/NSXMLElement+XMPP.h b/...PFramework/Categories/NSXMLElement+XMPP.h → ...PFramework/Categories/NSXMLElement+XMPP.h
diff --git a/...PFramework/Categories/NSXMLElement+XMPP.m → ...PFramework/Categories/NSXMLElement+XMPP.m b/...PFramework/Categories/NSXMLElement+XMPP.m → ...PFramework/Categories/NSXMLElement+XMPP.m
diff --git a/SafeChat/XMPP/XMPPFramework/Core/XMPP.h → FBEncryption/XMPP/XMPPFramework/Core/XMPP.h b/SafeChat/XMPP/XMPPFramework/Core/XMPP.h → FBEncryption/XMPP/XMPPFramework/Core/XMPP.h
diff --git a/...hat/XMPP/XMPPFramework/Core/XMPPElement.h → ...ion/XMPP/XMPPFramework/Core/XMPPElement.h b/...hat/XMPP/XMPPFramework/Core/XMPPElement.h → ...ion/XMPP/XMPPFramework/Core/XMPPElement.h
diff --git a/...hat/XMPP/XMPPFramework/Core/XMPPElement.m → ...ion/XMPP/XMPPFramework/Core/XMPPElement.m b/...hat/XMPP/XMPPFramework/Core/XMPPElement.m → ...ion/XMPP/XMPPFramework/Core/XMPPElement.m
diff --git a/SafeChat/XMPP/XMPPFramework/Core/XMPPIQ.h → ...cryption/XMPP/XMPPFramework/Core/XMPPIQ.h b/SafeChat/XMPP/XMPPFramework/Core/XMPPIQ.h → ...cryption/XMPP/XMPPFramework/Core/XMPPIQ.h
diff --git a/SafeChat/XMPP/XMPPFramework/Core/XMPPIQ.m → ...cryption/XMPP/XMPPFramework/Core/XMPPIQ.m b/SafeChat/XMPP/XMPPFramework/Core/XMPPIQ.m → ...cryption/XMPP/XMPPFramework/Core/XMPPIQ.m
diff --git a/...at/XMPP/XMPPFramework/Core/XMPPInternal.h → ...on/XMPP/XMPPFramework/Core/XMPPInternal.h b/...at/XMPP/XMPPFramework/Core/XMPPInternal.h → ...on/XMPP/XMPPFramework/Core/XMPPInternal.h
diff --git a/SafeChat/XMPP/XMPPFramework/Core/XMPPJID.h → ...ryption/XMPP/XMPPFramework/Core/XMPPJID.h b/SafeChat/XMPP/XMPPFramework/Core/XMPPJID.h → ...ryption/XMPP/XMPPFramework/Core/XMPPJID.h
diff --git a/SafeChat/XMPP/XMPPFramework/Core/XMPPJID.m → ...ryption/XMPP/XMPPFramework/Core/XMPPJID.m b/SafeChat/XMPP/XMPPFramework/Core/XMPPJID.m → ...ryption/XMPP/XMPPFramework/Core/XMPPJID.m
diff --git a/...hat/XMPP/XMPPFramework/Core/XMPPLogging.h → ...ion/XMPP/XMPPFramework/Core/XMPPLogging.h b/...hat/XMPP/XMPPFramework/Core/XMPPLogging.h → ...ion/XMPP/XMPPFramework/Core/XMPPLogging.h
diff --git a/...hat/XMPP/XMPPFramework/Core/XMPPMessage.h → ...ion/XMPP/XMPPFramework/Core/XMPPMessage.h b/...hat/XMPP/XMPPFramework/Core/XMPPMessage.h → ...ion/XMPP/XMPPFramework/Core/XMPPMessage.h
diff --git a/...hat/XMPP/XMPPFramework/Core/XMPPMessage.m → ...ion/XMPP/XMPPFramework/Core/XMPPMessage.m b/...hat/XMPP/XMPPFramework/Core/XMPPMessage.m → ...ion/XMPP/XMPPFramework/Core/XMPPMessage.m
diff --git a/...Chat/XMPP/XMPPFramework/Core/XMPPModule.h → ...tion/XMPP/XMPPFramework/Core/XMPPModule.h b/...Chat/XMPP/XMPPFramework/Core/XMPPModule.h → ...tion/XMPP/XMPPFramework/Core/XMPPModule.h
diff --git a/...Chat/XMPP/XMPPFramework/Core/XMPPModule.m → ...tion/XMPP/XMPPFramework/Core/XMPPModule.m b/...Chat/XMPP/XMPPFramework/Core/XMPPModule.m → ...tion/XMPP/XMPPFramework/Core/XMPPModule.m
diff --git a/...Chat/XMPP/XMPPFramework/Core/XMPPParser.h → ...tion/XMPP/XMPPFramework/Core/XMPPParser.h b/...Chat/XMPP/XMPPFramework/Core/XMPPParser.h → ...tion/XMPP/XMPPFramework/Core/XMPPParser.h
diff --git a/...Chat/XMPP/XMPPFramework/Core/XMPPParser.m → ...tion/XMPP/XMPPFramework/Core/XMPPParser.m b/...Chat/XMPP/XMPPFramework/Core/XMPPParser.m → ...tion/XMPP/XMPPFramework/Core/XMPPParser.m
diff --git a/...at/XMPP/XMPPFramework/Core/XMPPPresence.h → ...on/XMPP/XMPPFramework/Core/XMPPPresence.h b/...at/XMPP/XMPPFramework/Core/XMPPPresence.h → ...on/XMPP/XMPPFramework/Core/XMPPPresence.h
diff --git a/...at/XMPP/XMPPFramework/Core/XMPPPresence.m → ...on/XMPP/XMPPFramework/Core/XMPPPresence.m b/...at/XMPP/XMPPFramework/Core/XMPPPresence.m → ...on/XMPP/XMPPFramework/Core/XMPPPresence.m
diff --git a/...Chat/XMPP/XMPPFramework/Core/XMPPStream.h → ...tion/XMPP/XMPPFramework/Core/XMPPStream.h b/...Chat/XMPP/XMPPFramework/Core/XMPPStream.h → ...tion/XMPP/XMPPFramework/Core/XMPPStream.h
diff --git a/...Chat/XMPP/XMPPFramework/Core/XMPPStream.m → ...tion/XMPP/XMPPFramework/Core/XMPPStream.m b/...Chat/XMPP/XMPPFramework/Core/XMPPStream.m → ...tion/XMPP/XMPPFramework/Core/XMPPStream.m
diff --git a/...hat/XMPP/XMPPFramework/Utilities/DDList.h → ...ion/XMPP/XMPPFramework/Utilities/DDList.h b/...hat/XMPP/XMPPFramework/Utilities/DDList.h → ...ion/XMPP/XMPPFramework/Utilities/DDList.h
diff --git a/...hat/XMPP/XMPPFramework/Utilities/DDList.m → ...ion/XMPP/XMPPFramework/Utilities/DDList.m b/...hat/XMPP/XMPPFramework/Utilities/DDList.m → ...ion/XMPP/XMPPFramework/Utilities/DDList.m
diff --git a/...ramework/Utilities/GCDMulticastDelegate.h → ...ramework/Utilities/GCDMulticastDelegate.h b/...ramework/Utilities/GCDMulticastDelegate.h → ...ramework/Utilities/GCDMulticastDelegate.h
diff --git a/...ramework/Utilities/GCDMulticastDelegate.m → ...ramework/Utilities/GCDMulticastDelegate.m b/...ramework/Utilities/GCDMulticastDelegate.m → ...ramework/Utilities/GCDMulticastDelegate.m
diff --git a/...work/Utilities/RFImageToDataTransformer.h → ...work/Utilities/RFImageToDataTransformer.h b/...work/Utilities/RFImageToDataTransformer.h → ...work/Utilities/RFImageToDataTransformer.h
diff --git a/...work/Utilities/RFImageToDataTransformer.m → ...work/Utilities/RFImageToDataTransformer.m b/...work/Utilities/RFImageToDataTransformer.m → ...work/Utilities/RFImageToDataTransformer.m
diff --git a/...P/XMPPFramework/Utilities/XMPPIDTracker.h → ...P/XMPPFramework/Utilities/XMPPIDTracker.h b/...P/XMPPFramework/Utilities/XMPPIDTracker.h → ...P/XMPPFramework/Utilities/XMPPIDTracker.h
diff --git a/...P/XMPPFramework/Utilities/XMPPIDTracker.m → ...P/XMPPFramework/Utilities/XMPPIDTracker.m b/...P/XMPPFramework/Utilities/XMPPIDTracker.m → ...P/XMPPFramework/Utilities/XMPPIDTracker.m
diff --git a/...XMPPFramework/Utilities/XMPPSRVResolver.h → ...XMPPFramework/Utilities/XMPPSRVResolver.h b/...XMPPFramework/Utilities/XMPPSRVResolver.h → ...XMPPFramework/Utilities/XMPPSRVResolver.h
diff --git a/...XMPPFramework/Utilities/XMPPSRVResolver.m → ...XMPPFramework/Utilities/XMPPSRVResolver.m b/...XMPPFramework/Utilities/XMPPSRVResolver.m → ...XMPPFramework/Utilities/XMPPSRVResolver.m
diff --git a/.../XMPPFramework/Utilities/XMPPStringPrep.h → .../XMPPFramework/Utilities/XMPPStringPrep.h b/.../XMPPFramework/Utilities/XMPPStringPrep.h → .../XMPPFramework/Utilities/XMPPStringPrep.h
diff --git a/.../XMPPFramework/Utilities/XMPPStringPrep.m → .../XMPPFramework/Utilities/XMPPStringPrep.m b/.../XMPPFramework/Utilities/XMPPStringPrep.m → .../XMPPFramework/Utilities/XMPPStringPrep.m
diff --git a/SafeChat/XMPP/XMPPFramework/Vendor/.DS_Store → ...ption/XMPP/XMPPFramework/Vendor/.DS_Store b/SafeChat/XMPP/XMPPFramework/Vendor/.DS_Store → ...ption/XMPP/XMPPFramework/Vendor/.DS_Store
diff --git a/.../Vendor/CocoaAsyncSocket/GCDAsyncSocket.h → .../Vendor/CocoaAsyncSocket/GCDAsyncSocket.h b/.../Vendor/CocoaAsyncSocket/GCDAsyncSocket.h → .../Vendor/CocoaAsyncSocket/GCDAsyncSocket.h
diff --git a/.../Vendor/CocoaAsyncSocket/GCDAsyncSocket.m → .../Vendor/CocoaAsyncSocket/GCDAsyncSocket.m b/.../Vendor/CocoaAsyncSocket/GCDAsyncSocket.m → .../Vendor/CocoaAsyncSocket/GCDAsyncSocket.m
diff --git a/...ramework/Vendor/CocoaLumberjack/.DS_Store → ...ramework/Vendor/CocoaLumberjack/.DS_Store b/...ramework/Vendor/CocoaLumberjack/.DS_Store → ...ramework/Vendor/CocoaLumberjack/.DS_Store
diff --git a/...work/Vendor/CocoaLumberjack/DDASLLogger.h → ...work/Vendor/CocoaLumberjack/DDASLLogger.h b/...work/Vendor/CocoaLumberjack/DDASLLogger.h → ...work/Vendor/CocoaLumberjack/DDASLLogger.h
diff --git a/...work/Vendor/CocoaLumberjack/DDASLLogger.m → ...work/Vendor/CocoaLumberjack/DDASLLogger.m b/...work/Vendor/CocoaLumberjack/DDASLLogger.m → ...work/Vendor/CocoaLumberjack/DDASLLogger.m
diff --git a/...ocoaLumberjack/DDAbstractDatabaseLogger.h → ...ocoaLumberjack/DDAbstractDatabaseLogger.h b/...ocoaLumberjack/DDAbstractDatabaseLogger.h → ...ocoaLumberjack/DDAbstractDatabaseLogger.h
diff --git a/...ocoaLumberjack/DDAbstractDatabaseLogger.m → ...ocoaLumberjack/DDAbstractDatabaseLogger.m b/...ocoaLumberjack/DDAbstractDatabaseLogger.m → ...ocoaLumberjack/DDAbstractDatabaseLogger.m
diff --git a/...ork/Vendor/CocoaLumberjack/DDFileLogger.h → ...ork/Vendor/CocoaLumberjack/DDFileLogger.h b/...ork/Vendor/CocoaLumberjack/DDFileLogger.h → ...ork/Vendor/CocoaLumberjack/DDFileLogger.h
diff --git a/...ork/Vendor/CocoaLumberjack/DDFileLogger.m → ...ork/Vendor/CocoaLumberjack/DDFileLogger.m b/...ork/Vendor/CocoaLumberjack/DDFileLogger.m → ...ork/Vendor/CocoaLumberjack/DDFileLogger.m
diff --git a/...PFramework/Vendor/CocoaLumberjack/DDLog.h → ...PFramework/Vendor/CocoaLumberjack/DDLog.h b/...PFramework/Vendor/CocoaLumberjack/DDLog.h → ...PFramework/Vendor/CocoaLumberjack/DDLog.h
diff --git a/...PFramework/Vendor/CocoaLumberjack/DDLog.m → ...PFramework/Vendor/CocoaLumberjack/DDLog.m b/...PFramework/Vendor/CocoaLumberjack/DDLog.m → ...PFramework/Vendor/CocoaLumberjack/DDLog.m
diff --git a/...work/Vendor/CocoaLumberjack/DDTTYLogger.h → ...work/Vendor/CocoaLumberjack/DDTTYLogger.h b/...work/Vendor/CocoaLumberjack/DDTTYLogger.h → ...work/Vendor/CocoaLumberjack/DDTTYLogger.h
diff --git a/...work/Vendor/CocoaLumberjack/DDTTYLogger.m → ...work/Vendor/CocoaLumberjack/DDTTYLogger.m b/...work/Vendor/CocoaLumberjack/DDTTYLogger.m → ...work/Vendor/CocoaLumberjack/DDTTYLogger.m
diff --git a/...ck/Extensions/ContextFilterLogFormatter.h → ...ck/Extensions/ContextFilterLogFormatter.h b/...ck/Extensions/ContextFilterLogFormatter.h → ...ck/Extensions/ContextFilterLogFormatter.h
diff --git a/...ck/Extensions/ContextFilterLogFormatter.m → ...ck/Extensions/ContextFilterLogFormatter.m b/...ck/Extensions/ContextFilterLogFormatter.m → ...ck/Extensions/ContextFilterLogFormatter.m
diff --git a/...ck/Extensions/DispatchQueueLogFormatter.h → ...ck/Extensions/DispatchQueueLogFormatter.h b/...ck/Extensions/DispatchQueueLogFormatter.h → ...ck/Extensions/DispatchQueueLogFormatter.h
diff --git a/...ck/Extensions/DispatchQueueLogFormatter.m → ...ck/Extensions/DispatchQueueLogFormatter.m b/...ck/Extensions/DispatchQueueLogFormatter.m → ...ck/Extensions/DispatchQueueLogFormatter.m
diff --git a/...dor/CocoaLumberjack/Extensions/README.txt → ...dor/CocoaLumberjack/Extensions/README.txt b/...dor/CocoaLumberjack/Extensions/README.txt → ...dor/CocoaLumberjack/Extensions/README.txt
diff --git a/...PP/XMPPFramework/Vendor/KissXML/.DS_Store → ...PP/XMPPFramework/Vendor/KissXML/.DS_Store b/...PP/XMPPFramework/Vendor/KissXML/.DS_Store → ...PP/XMPPFramework/Vendor/KissXML/.DS_Store
diff --git a/...endor/KissXML/Categories/NSString+DDXML.h → ...endor/KissXML/Categories/NSString+DDXML.h b/...endor/KissXML/Categories/NSString+DDXML.h → ...endor/KissXML/Categories/NSString+DDXML.h
diff --git a/...endor/KissXML/Categories/NSString+DDXML.m → ...endor/KissXML/Categories/NSString+DDXML.m b/...endor/KissXML/Categories/NSString+DDXML.m → ...endor/KissXML/Categories/NSString+DDXML.m
diff --git a/...XMPP/XMPPFramework/Vendor/KissXML/DDXML.h → ...XMPP/XMPPFramework/Vendor/KissXML/DDXML.h b/...XMPP/XMPPFramework/Vendor/KissXML/DDXML.h → ...XMPP/XMPPFramework/Vendor/KissXML/DDXML.h
diff --git a/...PFramework/Vendor/KissXML/DDXMLDocument.h → ...PFramework/Vendor/KissXML/DDXMLDocument.h b/...PFramework/Vendor/KissXML/DDXMLDocument.h → ...PFramework/Vendor/KissXML/DDXMLDocument.h
diff --git a/...PFramework/Vendor/KissXML/DDXMLDocument.m → ...PFramework/Vendor/KissXML/DDXMLDocument.m b/...PFramework/Vendor/KissXML/DDXMLDocument.m → ...PFramework/Vendor/KissXML/DDXMLDocument.m
diff --git a/...PPFramework/Vendor/KissXML/DDXMLElement.h → ...PPFramework/Vendor/KissXML/DDXMLElement.h b/...PPFramework/Vendor/KissXML/DDXMLElement.h → ...PPFramework/Vendor/KissXML/DDXMLElement.h
diff --git a/...PPFramework/Vendor/KissXML/DDXMLElement.m → ...PPFramework/Vendor/KissXML/DDXMLElement.m b/...PPFramework/Vendor/KissXML/DDXMLElement.m → ...PPFramework/Vendor/KissXML/DDXMLElement.m
diff --git a/.../XMPPFramework/Vendor/KissXML/DDXMLNode.h → .../XMPPFramework/Vendor/KissXML/DDXMLNode.h b/.../XMPPFramework/Vendor/KissXML/DDXMLNode.h → .../XMPPFramework/Vendor/KissXML/DDXMLNode.h
diff --git a/.../XMPPFramework/Vendor/KissXML/DDXMLNode.m → .../XMPPFramework/Vendor/KissXML/DDXMLNode.m b/.../XMPPFramework/Vendor/KissXML/DDXMLNode.m → .../XMPPFramework/Vendor/KissXML/DDXMLNode.m
diff --git a/...ork/Vendor/KissXML/Private/DDXMLPrivate.h → ...ork/Vendor/KissXML/Private/DDXMLPrivate.h b/...ork/Vendor/KissXML/Private/DDXMLPrivate.h → ...ork/Vendor/KissXML/Private/DDXMLPrivate.h
diff --git a/...MPP/XMPPFramework/Vendor/libidn/.DS_Store → ...MPP/XMPPFramework/Vendor/libidn/.DS_Store b/...MPP/XMPPFramework/Vendor/libidn/.DS_Store → ...MPP/XMPPFramework/Vendor/libidn/.DS_Store
diff --git a/...PPFramework/Vendor/libidn/build-libidn.sh → ...PPFramework/Vendor/libidn/build-libidn.sh b/...PPFramework/Vendor/libidn/build-libidn.sh → ...PPFramework/Vendor/libidn/build-libidn.sh
diff --git a/...MPP/XMPPFramework/Vendor/libidn/idn-int.h → ...MPP/XMPPFramework/Vendor/libidn/idn-int.h b/...MPP/XMPPFramework/Vendor/libidn/idn-int.h → ...MPP/XMPPFramework/Vendor/libidn/idn-int.h
diff --git a/...XMPP/XMPPFramework/Vendor/libidn/libidn.a → ...XMPP/XMPPFramework/Vendor/libidn/libidn.a b/...XMPP/XMPPFramework/Vendor/libidn/libidn.a → ...XMPP/XMPPFramework/Vendor/libidn/libidn.a
diff --git a/.../XMPPFramework/Vendor/libidn/stringprep.h → .../XMPPFramework/Vendor/libidn/stringprep.h b/.../XMPPFramework/Vendor/libidn/stringprep.h → .../XMPPFramework/Vendor/libidn/stringprep.h
diff --git a/SafeChat/defaultUserIcon.png → FBEncryption/defaultUserIcon.png b/SafeChat/defaultUserIcon.png → FBEncryption/defaultUserIcon.png
diff --git a/SafeChat/en.lproj/InfoPlist.strings → FBEncryption/en.lproj/InfoPlist.strings b/SafeChat/en.lproj/InfoPlist.strings → FBEncryption/en.lproj/InfoPlist.strings
diff --git a/SafeChat/icon.png → FBEncryption/icon.png b/SafeChat/icon.png → FBEncryption/icon.png
diff --git a/SafeChat/ionicons/.DS_Store → FBEncryption/ionicons/.DS_Store b/SafeChat/ionicons/.DS_Store → FBEncryption/ionicons/.DS_Store
diff --git a/SafeChat/ionicons/IonIcons.h → FBEncryption/ionicons/IonIcons.h b/SafeChat/ionicons/IonIcons.h → FBEncryption/ionicons/IonIcons.h
diff --git a/SafeChat/ionicons/IonIcons.m → FBEncryption/ionicons/IonIcons.m b/SafeChat/ionicons/IonIcons.m → FBEncryption/ionicons/IonIcons.m
diff --git a/SafeChat/ionicons/LICENSE → FBEncryption/ionicons/LICENSE b/SafeChat/ionicons/LICENSE → FBEncryption/ionicons/LICENSE
diff --git a/SafeChat/ionicons/README.md → FBEncryption/ionicons/README.md b/SafeChat/ionicons/README.md → FBEncryption/ionicons/README.md
diff --git a/SafeChat/ionicons/ionicons-codes.h → FBEncryption/ionicons/ionicons-codes.h b/SafeChat/ionicons/ionicons-codes.h → FBEncryption/ionicons/ionicons-codes.h
diff --git a/SafeChat/ionicons/ionicons.ttf → FBEncryption/ionicons/ionicons.ttf b/SafeChat/ionicons/ionicons.ttf → FBEncryption/ionicons/ionicons.ttf
diff --git a/SafeChat/lock_closed.png → FBEncryption/lock_closed.png b/SafeChat/lock_closed.png → FBEncryption/lock_closed.png
diff --git a/SafeChat/logo_120.png → FBEncryption/logo_120.png b/SafeChat/logo_120.png → FBEncryption/logo_120.png
diff --git a/SafeChat/logo_80.png → FBEncryption/logo_80.png b/SafeChat/logo_80.png → FBEncryption/logo_80.png
diff --git a/SafeChat/main.m → FBEncryption/main.m b/SafeChat/main.m → FBEncryption/main.m
diff --git a/SafeChat/splash.png → FBEncryption/splash.png b/SafeChat/splash.png → FBEncryption/splash.png
diff --git a/SafeChat/splash_small.png → FBEncryption/splash_small.png b/SafeChat/splash_small.png → FBEncryption/splash_small.png
diff --git a/SafeChatTests/FBEncryptionTests.m → FBEncryptionTests/FBEncryptionTests.m b/SafeChatTests/FBEncryptionTests.m → FBEncryptionTests/FBEncryptionTests.m
diff --git a/SafeChatTests/SafeChat.IMTests-Info.plist → ...cryptionTests/SafeChat.IMTests-Info.plist b/SafeChatTests/SafeChat.IMTests-Info.plist → ...cryptionTests/SafeChat.IMTests-Info.plist
diff --git a/SafeChatTests/en.lproj/InfoPlist.strings → FBEncryptionTests/en.lproj/InfoPlist.strings b/SafeChatTests/en.lproj/InfoPlist.strings → FBEncryptionTests/en.lproj/InfoPlist.strings
diff --git a/...oj/project.xcworkspace/xcuserdata/felixleupold.xcuserdatad/UserInterfaceState.xcuserstate b/...oj/project.xcworkspace/xcuserdata/felixleupold.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/SafeChat.IM.xcodeproj/xcuserdata/felixleupold.xcuserdatad/xcschemes/xcschememanagement.plist b/SafeChat.IM.xcodeproj/xcuserdata/felixleupold.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -9,11 +9,6 @@
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
-		<key>SafeChat.IM.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>1</integer>
-		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>