Skip to content

Commit

Permalink
Merge pull request ChatSecure#338 from ChatSecure/hold2record
Browse files Browse the repository at this point in the history
Hold to record Audio
  • Loading branch information
chrisballinger committed Apr 16, 2015
2 parents c500dc3 + d1ce43a commit dced1b1
Show file tree
Hide file tree
Showing 25 changed files with 817 additions and 453 deletions.
48 changes: 40 additions & 8 deletions ChatSecure.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,12 @@
6336209C1A76E88C006E8739 /* OTRVideoItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 6336209B1A76E88C006E8739 /* OTRVideoItem.m */; };
6336209F1A76E89A006E8739 /* OTRAudioItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 6336209E1A76E89A006E8739 /* OTRAudioItem.m */; };
633AF2FA1A7C3DBC0030A3FF /* OTRAudioSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 633AF2F91A7C3DBC0030A3FF /* OTRAudioSessionManager.m */; };
6353AC2D1AD5E32000753B83 /* OTRAudioTrashView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6353AC2C1AD5E32000753B83 /* OTRAudioTrashView.m */; };
6354BBE41A96C67400E8EBAC /* OTRMediaFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6354BBE31A96C67400E8EBAC /* OTRMediaFileManager.m */; };
6396AFA01A169D54009F3E6C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6396AF9F1A169D54009F3E6C /* main.m */; };
6396AFBA1A169D54009F3E6C /* ChatSecureTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6396AFB91A169D54009F3E6C /* ChatSecureTests.m */; };
639CDD8E1AD71BC4009BAABC /* OTRCircleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 639CDD8D1AD71BC4009BAABC /* OTRCircleView.m */; };
639CDD911AD74419009BAABC /* OTRTouchAndHoldGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = 639CDD901AD74419009BAABC /* OTRTouchAndHoldGestureRecognizer.m */; };
63C4BCCC1A1E9B9F001696CD /* ChatSecure.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 63C4BCC81A1E9B9F001696CD /* ChatSecure.xcdatamodeld */; };
63C4BD0F1A1E9BE1001696CD /* OTRManagedAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C4BCCF1A1E9BE1001696CD /* OTRManagedAccount.m */; };
63C4BD101A1E9BE1001696CD /* OTRManagedBuddy.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C4BCD11A1E9BE1001696CD /* OTRManagedBuddy.m */; };
Expand Down Expand Up @@ -168,11 +171,12 @@
63CFB1041ABA492600A8D27E /* OTRFacebookOAuthXMPPAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 63CFB1031ABA492600A8D27E /* OTRFacebookOAuthXMPPAccount.m */; };
63D184861A2D3F2400334CD8 /* OTRNotificationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63D184851A2D3F2400334CD8 /* OTRNotificationController.m */; };
63D27FC51A6DC51C00EC251A /* OTRMediaItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 63D27FC41A6DC51C00EC251A /* OTRMediaItem.m */; };
63D58C261A8C154D003C5A2D /* OTRAudioRecorderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63D58C251A8C154D003C5A2D /* OTRAudioRecorderViewController.m */; };
63D64D661A2FBA8C00E21F77 /* OTRToastOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 63D64D651A2FBA8C00E21F77 /* OTRToastOptions.m */; };
63DDD8B01A9D3C0400C0A918 /* OTRMediaServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 63DDD8AF1A9D3C0400C0A918 /* OTRMediaServer.m */; };
63DDD8B51A9E94B700C0A918 /* OTRMediaTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 63DDD8B41A9E94B700C0A918 /* OTRMediaTests.m */; };
63DDD8BA1A9E9BD900C0A918 /* samples in Resources */ = {isa = PBXBuildFile; fileRef = 63DDD8B91A9E9BD900C0A918 /* samples */; };
63EA4CF91ACC81C800B19E12 /* OTRMessagesHoldTalkViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63EA4CF81ACC81C800B19E12 /* OTRMessagesHoldTalkViewController.m */; };
63EA4CFD1ACC96AB00B19E12 /* OTRHoldToTalkView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63EA4CFC1ACC96AB00B19E12 /* OTRHoldToTalkView.m */; };
63F0FF641A798D8E001F0C99 /* OTRAudioControlsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63F0FF631A798D8E001F0C99 /* OTRAudioControlsView.m */; };
63F6E1911A69B9BA0011E6F7 /* OTRAttachmentPicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 63F6E1901A69B9BA0011E6F7 /* OTRAttachmentPicker.m */; };
63FA548B1A7ACA2F00F2AEBB /* OTRPlayPauseProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63FA548A1A7ACA2F00F2AEBB /* OTRPlayPauseProgressView.m */; };
Expand Down Expand Up @@ -462,6 +466,8 @@
6336209E1A76E89A006E8739 /* OTRAudioItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRAudioItem.m; sourceTree = "<group>"; };
633AF2F81A7C3DBB0030A3FF /* OTRAudioSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRAudioSessionManager.h; sourceTree = "<group>"; };
633AF2F91A7C3DBC0030A3FF /* OTRAudioSessionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRAudioSessionManager.m; sourceTree = "<group>"; };
6353AC2B1AD5E32000753B83 /* OTRAudioTrashView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRAudioTrashView.h; sourceTree = "<group>"; };
6353AC2C1AD5E32000753B83 /* OTRAudioTrashView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRAudioTrashView.m; sourceTree = "<group>"; };
6354BBE21A96C67400E8EBAC /* OTRMediaFileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRMediaFileManager.h; sourceTree = "<group>"; };
6354BBE31A96C67400E8EBAC /* OTRMediaFileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRMediaFileManager.m; sourceTree = "<group>"; };
6396AF9A1A169D54009F3E6C /* ChatSecure.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ChatSecure.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -470,6 +476,10 @@
6396AFB31A169D54009F3E6C /* ChatSecureTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ChatSecureTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6396AFB81A169D54009F3E6C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6396AFB91A169D54009F3E6C /* ChatSecureTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ChatSecureTests.m; sourceTree = "<group>"; };
639CDD8C1AD71BC4009BAABC /* OTRCircleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRCircleView.h; sourceTree = "<group>"; };
639CDD8D1AD71BC4009BAABC /* OTRCircleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRCircleView.m; sourceTree = "<group>"; };
639CDD8F1AD74419009BAABC /* OTRTouchAndHoldGestureRecognizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRTouchAndHoldGestureRecognizer.h; sourceTree = "<group>"; };
639CDD901AD74419009BAABC /* OTRTouchAndHoldGestureRecognizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRTouchAndHoldGestureRecognizer.m; sourceTree = "<group>"; };
63C4BCC91A1E9B9F001696CD /* ChatSecure 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "ChatSecure 2.xcdatamodel"; sourceTree = "<group>"; };
63C4BCCA1A1E9B9F001696CD /* ChatSecure 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "ChatSecure 3.xcdatamodel"; sourceTree = "<group>"; };
63C4BCCB1A1E9B9F001696CD /* ChatSecure.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = ChatSecure.xcdatamodel; sourceTree = "<group>"; };
Expand Down Expand Up @@ -545,8 +555,6 @@
63D184851A2D3F2400334CD8 /* OTRNotificationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRNotificationController.m; sourceTree = "<group>"; };
63D27FC31A6DC51C00EC251A /* OTRMediaItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRMediaItem.h; sourceTree = "<group>"; };
63D27FC41A6DC51C00EC251A /* OTRMediaItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRMediaItem.m; sourceTree = "<group>"; };
63D58C241A8C154D003C5A2D /* OTRAudioRecorderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRAudioRecorderViewController.h; sourceTree = "<group>"; };
63D58C251A8C154D003C5A2D /* OTRAudioRecorderViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRAudioRecorderViewController.m; sourceTree = "<group>"; };
63D64D641A2FBA8C00E21F77 /* OTRToastOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRToastOptions.h; sourceTree = "<group>"; };
63D64D651A2FBA8C00E21F77 /* OTRToastOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRToastOptions.m; sourceTree = "<group>"; };
63DC0EB31A1ABC86002C9598 /* OTR_Codesigning.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = OTR_Codesigning.xcconfig; path = configurations/OTR_Codesigning.xcconfig; sourceTree = "<group>"; };
Expand All @@ -556,6 +564,10 @@
63DDD8AF1A9D3C0400C0A918 /* OTRMediaServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRMediaServer.m; sourceTree = "<group>"; };
63DDD8B41A9E94B700C0A918 /* OTRMediaTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRMediaTests.m; sourceTree = "<group>"; };
63DDD8B91A9E9BD900C0A918 /* samples */ = {isa = PBXFileReference; lastKnownFileType = folder; path = samples; sourceTree = "<group>"; };
63EA4CF71ACC81C800B19E12 /* OTRMessagesHoldTalkViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRMessagesHoldTalkViewController.h; sourceTree = "<group>"; };
63EA4CF81ACC81C800B19E12 /* OTRMessagesHoldTalkViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRMessagesHoldTalkViewController.m; sourceTree = "<group>"; };
63EA4CFB1ACC96AB00B19E12 /* OTRHoldToTalkView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRHoldToTalkView.h; sourceTree = "<group>"; };
63EA4CFC1ACC96AB00B19E12 /* OTRHoldToTalkView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRHoldToTalkView.m; sourceTree = "<group>"; };
63F0FF621A798D8E001F0C99 /* OTRAudioControlsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRAudioControlsView.h; sourceTree = "<group>"; };
63F0FF631A798D8E001F0C99 /* OTRAudioControlsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRAudioControlsView.m; sourceTree = "<group>"; };
63F6E18F1A69B9BA0011E6F7 /* OTRAttachmentPicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRAttachmentPicker.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -889,10 +901,7 @@
633106311A16D1A300C17BAE /* OTRLanguageListSettingViewController.m */,
633106321A16D1A300C17BAE /* OTRListSettingViewController.h */,
633106331A16D1A300C17BAE /* OTRListSettingViewController.m */,
633106341A16D1A300C17BAE /* OTRMessagesViewController.h */,
633106351A16D1A300C17BAE /* OTRMessagesViewController.m */,
63D58C241A8C154D003C5A2D /* OTRAudioRecorderViewController.h */,
63D58C251A8C154D003C5A2D /* OTRAudioRecorderViewController.m */,
63EA4CFA1ACC931200B19E12 /* Messages View Controller */,
633106361A16D1A300C17BAE /* OTRNewAccountViewController.h */,
633106371A16D1A300C17BAE /* OTRNewAccountViewController.m */,
633106381A16D1A300C17BAE /* OTRNewBuddyViewController.h */,
Expand Down Expand Up @@ -950,6 +959,14 @@
633106741A16D1A300C17BAE /* OTRSocialButtonsView.m */,
633106751A16D1A300C17BAE /* OTRTitleSubtitleView.h */,
633106761A16D1A300C17BAE /* OTRTitleSubtitleView.m */,
63EA4CFB1ACC96AB00B19E12 /* OTRHoldToTalkView.h */,
63EA4CFC1ACC96AB00B19E12 /* OTRHoldToTalkView.m */,
6353AC2B1AD5E32000753B83 /* OTRAudioTrashView.h */,
6353AC2C1AD5E32000753B83 /* OTRAudioTrashView.m */,
639CDD8C1AD71BC4009BAABC /* OTRCircleView.h */,
639CDD8D1AD71BC4009BAABC /* OTRCircleView.m */,
639CDD8F1AD74419009BAABC /* OTRTouchAndHoldGestureRecognizer.h */,
639CDD901AD74419009BAABC /* OTRTouchAndHoldGestureRecognizer.m */,
);
path = Views;
sourceTree = "<group>";
Expand Down Expand Up @@ -1149,6 +1166,17 @@
name = Configurations;
sourceTree = "<group>";
};
63EA4CFA1ACC931200B19E12 /* Messages View Controller */ = {
isa = PBXGroup;
children = (
633106341A16D1A300C17BAE /* OTRMessagesViewController.h */,
633106351A16D1A300C17BAE /* OTRMessagesViewController.m */,
63EA4CF71ACC81C800B19E12 /* OTRMessagesHoldTalkViewController.h */,
63EA4CF81ACC81C800B19E12 /* OTRMessagesHoldTalkViewController.m */,
);
name = "Messages View Controller";
sourceTree = "<group>";
};
63FA54921A7C127F00F2AEBB /* AudioBubble Views */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1409,7 +1437,6 @@
63C4BD1C1A1E9BE1001696CD /* OTRvCardAvatar.m in Sources */,
63C4BD281A1E9BE1001696CD /* _OTRManagedOscarAccount.m in Sources */,
633107031A16D1A300C17BAE /* OTRFingerprintsViewController.m in Sources */,
63D58C261A8C154D003C5A2D /* OTRAudioRecorderViewController.m in Sources */,
6331068C1A16D1A300C17BAE /* OTRSettingsManager.m in Sources */,
6331070C1A16D1A300C17BAE /* OTRQRCodeViewController.m in Sources */,
6331067B1A16D1A300C17BAE /* UIImage+ChatSecure.m in Sources */,
Expand All @@ -1422,10 +1449,13 @@
633106D71A16D1A300C17BAE /* OTRXMPPBuddy.m in Sources */,
63C4BD111A1E9BE1001696CD /* OTRManagedEncryptionStatusMessage.m in Sources */,
633106861A16D1A300C17BAE /* OTRProtocolManager.m in Sources */,
63EA4CFD1ACC96AB00B19E12 /* OTRHoldToTalkView.m in Sources */,
6331067A1A16D1A300C17BAE /* UIActivityViewController+ChatSecure.m in Sources */,
63C4BD261A1E9BE1001696CD /* _OTRManagedMessageAndStatus.m in Sources */,
633106921A16D1A300C17BAE /* OTRXMPPTorManager.m in Sources */,
6353AC2D1AD5E32000753B83 /* OTRAudioTrashView.m in Sources */,
633106CA1A16D1A300C17BAE /* OTRValueSetting.m in Sources */,
639CDD911AD74419009BAABC /* OTRTouchAndHoldGestureRecognizer.m in Sources */,
633106B71A16D1A300C17BAE /* OTRActivityItemProvider.m in Sources */,
633106811A16D1A300C17BAE /* OTREncryptionManager.m in Sources */,
633106E21A16D1A300C17BAE /* OTRCertificatePinning.m in Sources */,
Expand Down Expand Up @@ -1462,6 +1492,7 @@
633106F41A16D1A300C17BAE /* OTRXMPPLoginViewController.m in Sources */,
63C4BCCC1A1E9B9F001696CD /* ChatSecure.xcdatamodeld in Sources */,
63D184861A2D3F2400334CD8 /* OTRNotificationController.m in Sources */,
639CDD8E1AD71BC4009BAABC /* OTRCircleView.m in Sources */,
63FA54911A7B2C2E00F2AEBB /* OTRPauseView.m in Sources */,
633106F71A16D1A300C17BAE /* OTRAcknowledgementsViewController.m in Sources */,
63C4BD1D1A1E9BE1001696CD /* OTRvCardTemp.m in Sources */,
Expand All @@ -1479,6 +1510,7 @@
633106911A16D1A300C17BAE /* OTRXMPPProxyStream.m in Sources */,
633106C01A16D1A300C17BAE /* OTRFeedbackSetting.m in Sources */,
63C4BD1F1A1E9BE1001696CD /* _OTRManagedAccount.m in Sources */,
63EA4CF91ACC81C800B19E12 /* OTRMessagesHoldTalkViewController.m in Sources */,
633106B81A16D1A300C17BAE /* OTRDomainCellInfo.m in Sources */,
633107111A16D1A300C17BAE /* OTRSubscriptionRequestsViewController.m in Sources */,
633106BF1A16D1A300C17BAE /* OTRDoubleSetting.m in Sources */,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0610"
LastUpgradeVersion = "0630"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Binary file modified ChatSecure/Base.lproj/Localizable.strings
Binary file not shown.
3 changes: 3 additions & 0 deletions ChatSecure/Classes/Controllers/OTRAudioSessionManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@

@protocol OTRAudioSessionManagerDelegate <NSObject>

@optional
- (void)audioSession:(OTRAudioSessionManager *)audioSessionManager didFinishWithError:(NSError *)error;
- (void)audioSessionDidStartPlaying:(OTRAudioSessionManager *)sessionManager;

- (void)audioSession:(OTRAudioSessionManager *)audioSessionManager didUpdateRecordingDecibel:(double)decibel;
@end

@interface OTRAudioSessionManager : NSObject
Expand Down
17 changes: 17 additions & 0 deletions ChatSecure/Classes/Controllers/OTRAudioSessionManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ @interface OTRAudioSessionManager () <AVAudioRecorderDelegate>
@property (nonatomic, strong) AVAudioRecorder *currentRecorder;
@property (nonatomic, strong) AVPlayer *currentPlayer;

@property (nonatomic, strong) NSTimer *recordDecibelTimer;

@end

@implementation OTRAudioSessionManager
Expand Down Expand Up @@ -133,21 +135,36 @@ - (void)recordAudioToURL:(NSURL *)url error:(NSError **)error
}

self.currentRecorder = [self audioRecorderWithURL:url error:error];

if (error) {
return;
}

self.currentRecorder.meteringEnabled = YES;
self.recordDecibelTimer = [NSTimer scheduledTimerWithTimeInterval:0.03 target:self selector:@selector(updateDecibelRecording:) userInfo:nil repeats:YES];

[self.currentRecorder record];
}

- (void)stopRecording
{
[self.recordDecibelTimer invalidate];
self.recordDecibelTimer = nil;
[self.currentRecorder stop];
self.currentRecorder = nil;
[self deactivateSession:nil];

}

- (void)updateDecibelRecording:(id)sender
{
[self.currentRecorder updateMeters];
double decibles = [self.currentRecorder averagePowerForChannel:0];
if ([self.delegate respondsToSelector:@selector(audioSession:didUpdateRecordingDecibel:)]) {
[self.delegate audioSession:self didUpdateRecordingDecibel:decibles];
}
}

- (NSTimeInterval)currentTimeRecordTime
{
if (self.currentRecorder) {
Expand Down
2 changes: 1 addition & 1 deletion ChatSecure/Classes/Controllers/OTREncryptionManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#import "OTRUtilities.h"
#import "Strings.h"
#import "OTRAppDelegate.h"
#import "OTRMessagesViewController.h"
#import "OTRMessagesHoldTalkViewController.h"
#import "UIViewController+ChatSecure.h"
#import "OTRImageItem.h"
#import "OTRAudioItem.h"
Expand Down
4 changes: 2 additions & 2 deletions ChatSecure/Classes/OTRAppDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
#import "HockeySDK.h"

@class OTRSettingsViewController;
@class OTRMessagesViewController;
@class OTRMessagesHoldTalkViewController;
@class OTRConversationViewController;

@interface OTRAppDelegate : UIResponder <UIApplicationDelegate, BITHockeyManagerDelegate>

@property (nonatomic, strong) UIWindow *window;
@property (nonatomic, strong) OTRSettingsViewController *settingsViewController;
@property (nonatomic, strong) OTRMessagesViewController *messagesViewController;
@property (nonatomic, strong) OTRMessagesHoldTalkViewController *messagesViewController;
@property (nonatomic, strong) OTRConversationViewController *conversationViewController;

@property (nonatomic, strong) NSTimer *backgroundTimer;
Expand Down
4 changes: 2 additions & 2 deletions ChatSecure/Classes/OTRAppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#import "OTRConversationViewController.h"

#import "OTRMessagesViewController.h"
#import "OTRMessagesHoldTalkViewController.h"
#import "Strings.h"
#import "OTRSettingsViewController.h"
#import "OTRSettingsManager.h"
Expand Down Expand Up @@ -91,7 +91,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(

self.settingsViewController = [[OTRSettingsViewController alloc] init];
self.conversationViewController = [[OTRConversationViewController alloc] init];
self.messagesViewController = [OTRMessagesViewController messagesViewController];
self.messagesViewController = [OTRMessagesHoldTalkViewController messagesViewController];

if ([OTRDatabaseManager existsYapDatabase] && ![[OTRDatabaseManager sharedInstance] hasPassphrase]) {
// user needs to enter password for current database
Expand Down

This file was deleted.

Loading

0 comments on commit dced1b1

Please sign in to comment.