Skip to content

Commit 87a89f2

Browse files
Merge pull request #12 from vineetchoudhary/development
Development
2 parents 80bcb95 + 021aa41 commit 87a89f2

File tree

14 files changed

+501
-306
lines changed

14 files changed

+501
-306
lines changed

AppBox.xcodeproj/project.pbxproj

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
E188EA181D78570800EBCA52 /* ISO8601.framework in Copy Files (1 item) */ = {isa = PBXBuildFile; fileRef = E188EA151D7856D200EBCA52 /* ISO8601.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3939
E18DCB171DFE729300BD7F11 /* MailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E18DCB161DFE729300BD7F11 /* MailViewController.m */; };
4040
E18DCB1D1DFED95000BD7F11 /* UserData.m in Sources */ = {isa = PBXBuildFile; fileRef = E18DCB1C1DFED95000BD7F11 /* UserData.m */; };
41+
E1A3965D1E040C9E0065FC7F /* NetworkHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = E1A3965C1E040C9E0065FC7F /* NetworkHandler.m */; };
42+
E1A3965E1E04123E0065FC7F /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E1C148731E027A6100EE637F /* AFNetworking.framework */; };
43+
E1A3965F1E04123E0065FC7F /* AFNetworking.framework in Copy Files (1 item) */ = {isa = PBXBuildFile; fileRef = E1C148731E027A6100EE637F /* AFNetworking.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4144
E1C148741E027A6100EE637F /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E1C148731E027A6100EE637F /* AFNetworking.framework */; };
4245
E1CFC65E1D7E7FEA005872BE /* Common.m in Sources */ = {isa = PBXBuildFile; fileRef = E1CFC65D1D7E7FEA005872BE /* Common.m */; };
4346
E1FB91D91D78055200F8DF46 /* ZipArchive.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E1FB91D81D78055200F8DF46 /* ZipArchive.framework */; };
@@ -52,6 +55,7 @@
5255
dstSubfolderSpec = 10;
5356
files = (
5457
E188EA181D78570800EBCA52 /* ISO8601.framework in Copy Files (1 item) */,
58+
E1A3965F1E04123E0065FC7F /* AFNetworking.framework in Copy Files (1 item) */,
5559
E188EA171D78570300EBCA52 /* CMDQueryStringSerialization.framework in Copy Files (1 item) */,
5660
E1FB91DA1D78087A00F8DF46 /* ZipArchive.framework in Copy Files (1 item) */,
5761
E16438A61D746A2F00CE8B7E /* DropboxOSX.framework in Copy Files (1 item) */,
@@ -107,6 +111,8 @@
107111
E18DCB161DFE729300BD7F11 /* MailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MailViewController.m; sourceTree = "<group>"; };
108112
E18DCB1B1DFED95000BD7F11 /* UserData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserData.h; sourceTree = "<group>"; };
109113
E18DCB1C1DFED95000BD7F11 /* UserData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserData.m; sourceTree = "<group>"; };
114+
E1A3965B1E040C9E0065FC7F /* NetworkHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkHandler.h; sourceTree = "<group>"; };
115+
E1A3965C1E040C9E0065FC7F /* NetworkHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetworkHandler.m; sourceTree = "<group>"; };
110116
E1C148731E027A6100EE637F /* AFNetworking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AFNetworking.framework; sourceTree = "<group>"; };
111117
E1CFC65C1D7E7FEA005872BE /* Common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Common.h; sourceTree = "<group>"; };
112118
E1CFC65D1D7E7FEA005872BE /* Common.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Common.m; sourceTree = "<group>"; };
@@ -128,6 +134,7 @@
128134
E16437F91D743D4500CE8B7E /* DropboxOSX.framework in Frameworks */,
129135
E1FB91D91D78055200F8DF46 /* ZipArchive.framework in Frameworks */,
130136
E188EA161D7856D200EBCA52 /* ISO8601.framework in Frameworks */,
137+
E1A3965E1E04123E0065FC7F /* AFNetworking.framework in Frameworks */,
131138
);
132139
runOnlyForDeploymentPostprocessing = 0;
133140
};
@@ -337,6 +344,8 @@
337344
E16018F11DEC0EB700E3A377 /* Constants.h */,
338345
E18DCB1B1DFED95000BD7F11 /* UserData.h */,
339346
E18DCB1C1DFED95000BD7F11 /* UserData.m */,
347+
E1A3965B1E040C9E0065FC7F /* NetworkHandler.h */,
348+
E1A3965C1E040C9E0065FC7F /* NetworkHandler.m */,
340349
);
341350
path = Common;
342351
sourceTree = "<group>";
@@ -418,6 +427,7 @@
418427
E188EA121D78485900EBCA52 /* Tiny.m in Sources */,
419428
E16437DD1D743A4E00CE8B7E /* AppBox.xcdatamodeld in Sources */,
420429
E16437D71D743A4E00CE8B7E /* main.m in Sources */,
430+
E1A3965D1E040C9E0065FC7F /* NetworkHandler.m in Sources */,
421431
E16018F01DEC0BC200E3A377 /* DropboxViewController.m in Sources */,
422432
E16437D41D743A4E00CE8B7E /* AppDelegate.m in Sources */,
423433
E18DCB171DFE729300BD7F11 /* MailViewController.m in Sources */,

AppBox/AppBoxPrefixHeader.pch

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#import "Constants.h"
2323
#import "XCProject.h"
2424
#import "AppDelegate.h"
25+
#import "NetworkHandler.h"
2526

2627

2728
#endif /* AppBoxPrefixHeader_pch */

AppBox/AppDelegate.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
#import <Cocoa/Cocoa.h>
10+
#import <Foundation/Foundation.h>
1011

1112
@interface AppDelegate : NSObject <NSApplicationDelegate, NSUserNotificationCenterDelegate>
1213

AppBox/AppDelegate.m

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,30 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
2020
NSUserNotificationCenter *center = [NSUserNotificationCenter defaultUserNotificationCenter];
2121
[center setDelegate:self];
2222
self.sessionLog = [[NSMutableString alloc] init];
23+
24+
//Start monitoring internet connection
25+
[[AFNetworkReachabilityManager sharedManager] setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) {
26+
if (status == AFNetworkReachabilityStatusNotReachable){
27+
[Common showAlertWithTitle:@"Error" andMessage:AFStringFromNetworkReachabilityStatus(status)];
28+
}
29+
}];
30+
[[AFNetworkReachabilityManager sharedManager] startMonitoring];
31+
32+
//Check for update
33+
[Common isNewVersionAvailableCompletion:^(bool available, NSURL *url) {
34+
if (available){
35+
NSAlert *alert = [[NSAlert alloc] init];
36+
[alert setMessageText: @"New Version Available - AppBox"];
37+
[alert setInformativeText:@"A newer version of the \"AppBox\" is available. Do you want to update it? \n\n\n"];
38+
[alert setAlertStyle:NSInformationalAlertStyle];
39+
[alert setDelegate:self];
40+
[alert addButtonWithTitle:@"YES"];
41+
[alert addButtonWithTitle:@"NO"];
42+
if ([alert runModal] == NSAlertFirstButtonReturn){
43+
[[NSWorkspace sharedWorkspace] openURL:url];
44+
}
45+
}
46+
}];
2347
}
2448

2549
- (void)applicationWillTerminate:(NSNotification *)aNotification {
@@ -37,7 +61,7 @@ +(AppDelegate *)appDelegate{
3761
}
3862

3963
-(void)addSessionLog:(NSString *)sessionLog{
40-
[_sessionLog appendFormat: @"\n%@", sessionLog];
64+
[_sessionLog appendFormat: @"\n\n%@ - %@",[NSDate date],sessionLog];
4165
[[NSNotificationCenter defaultCenter] postNotificationName:SessionLogUpdated object:nil];
4266
}
4367

0 commit comments

Comments
 (0)