Skip to content

Commit 3529ea4

Browse files
committed
Minor formatting changes
1 parent 6fc2699 commit 3529ea4

File tree

3 files changed

+43
-43
lines changed

3 files changed

+43
-43
lines changed

Authentication/X-Facebook-Platform/XMPPXFacebookPlatformAuthentication.m

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,6 @@
2222
static char facebookAppIdKey;
2323

2424
@interface XMPPXFacebookPlatformAuthentication ()
25-
26-
- (NSDictionary *)dictionaryFromChallenge:(NSXMLElement *)challenge;
27-
- (NSString *)base64EncodedFullResponse;
28-
29-
@end
30-
31-
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
32-
#pragma mark -
33-
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
34-
35-
@implementation XMPPXFacebookPlatformAuthentication
3625
{
3726
#if __has_feature(objc_arc_weak)
3827
__weak XMPPStream *xmppStream;
@@ -48,6 +37,17 @@ @implementation XMPPXFacebookPlatformAuthentication
4837
NSString *method;
4938
}
5039

40+
- (NSDictionary *)dictionaryFromChallenge:(NSXMLElement *)challenge;
41+
- (NSString *)base64EncodedFullResponse;
42+
43+
@end
44+
45+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
46+
#pragma mark -
47+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
48+
49+
@implementation XMPPXFacebookPlatformAuthentication
50+
5151
+ (NSString *)mechanismName
5252
{
5353
return @"X-FACEBOOK-PLATFORM";

Xcode/DesktopXMPP/AppDelegate.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
@interface AppDelegate : NSObject
88
{
9-
__strong XMPPStream *xmppStream;
10-
__strong XMPPReconnect *xmppReconnect;
11-
__strong XMPPRoster *xmppRoster;
12-
__strong XMPPRosterMemoryStorage *xmppRosterStorage;
13-
__strong XMPPCapabilities *xmppCapabilities;
14-
__strong XMPPCapabilitiesCoreDataStorage *xmppCapabilitiesStorage;
15-
__strong XMPPPing *xmppPing;
16-
__strong XMPPTime *xmppTime;
9+
XMPPStream *xmppStream;
10+
XMPPReconnect *xmppReconnect;
11+
XMPPRoster *xmppRoster;
12+
XMPPRosterMemoryStorage *xmppRosterStorage;
13+
XMPPCapabilities *xmppCapabilities;
14+
XMPPCapabilitiesCoreDataStorage *xmppCapabilitiesStorage;
15+
XMPPPing *xmppPing;
16+
XMPPTime *xmppTime;
1717

1818
NSMutableArray *turnSockets;
1919

Xcode/DesktopXMPP/AppDelegate.m

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,19 @@ - (id)init
2121
{
2222
if ((self = [super init]))
2323
{
24+
//
2425
// Configure logging framework
26+
//
27+
// The XMPPFramework uses the CocoaLumberjack framework to provide fast & flexible logging.
28+
// There's tons of information about Lumberjack online:
29+
// https://github.com/robbiehanson/CocoaLumberjack
30+
// https://github.com/robbiehanson/CocoaLumberjack/wiki
31+
//
32+
// But this one line is all we need to configure the logging framework to dump to the Xcode console.
2533

2634
[DDLog addLogger:[DDTTYLogger sharedInstance]];
2735

28-
// Initialize variables
36+
// Initialize xmpp stream and modules
2937

3038
xmppStream = [[XMPPStream alloc] init];
3139

@@ -43,6 +51,21 @@ - (id)init
4351
// xmppPing = [[XMPPPing alloc] init];
4452
// xmppTime = [[XMPPTime alloc] init];
4553

54+
// Activate xmpp modules
55+
56+
[xmppReconnect activate:xmppStream];
57+
[xmppRoster activate:xmppStream];
58+
[xmppCapabilities activate:xmppStream];
59+
[xmppPing activate:xmppStream];
60+
[xmppTime activate:xmppStream];
61+
62+
// Add ourself as a delegate to anything we may be interested in
63+
64+
[xmppReconnect addDelegate:self delegateQueue:dispatch_get_main_queue()];
65+
[xmppCapabilities addDelegate:self delegateQueue:dispatch_get_main_queue()];
66+
67+
// Initialize other stuff
68+
4669
turnSockets = [[NSMutableArray alloc] init];
4770
}
4871
return self;
@@ -52,34 +75,11 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
5275
{
5376
DDLogInfo(@"%@: %@", THIS_FILE, THIS_METHOD);
5477

55-
[xmppStream addDelegate:self delegateQueue:dispatch_get_main_queue()];
56-
57-
// Activate xmpp modules
58-
59-
[xmppReconnect activate:xmppStream];
60-
[xmppRoster activate:xmppStream];
61-
[xmppCapabilities activate:xmppStream];
62-
[xmppPing activate:xmppStream];
63-
[xmppTime activate:xmppStream];
64-
65-
// Add ourself as a delegate to anything we may be interested in
66-
67-
// [xmppStream addDelegate:self delegateQueue:dispatch_get_main_queue()];
68-
[xmppReconnect addDelegate:self delegateQueue:dispatch_get_main_queue()];
69-
[xmppCapabilities addDelegate:self delegateQueue:dispatch_get_main_queue()];
70-
[xmppPing addDelegate:self delegateQueue:dispatch_get_main_queue()];
71-
[xmppTime addDelegate:self delegateQueue:dispatch_get_main_queue()];
72-
7378
// Start the GUI stuff
7479

7580
[rosterController displaySignInSheet];
7681
}
7782

78-
- (void)xmppStream:(XMPPStream *)sender didRegisterModule:(id)module
79-
{
80-
DDLogVerbose(@"%@: xmppStream:didRegisterModule: %@", THIS_FILE, module);
81-
}
82-
8383
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
8484
#pragma mark XEP-0065 Support
8585
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)