Skip to content

Commit f5cf50d

Browse files
Merge pull request #245 from getappbox/develop
Develop->Master
2 parents fb98da3 + a0b29ed commit f5cf50d

26 files changed

Lines changed: 233 additions & 120 deletions

File tree

AppBox.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,7 @@
12531253
LD_DYLIB_INSTALL_NAME = "";
12541254
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
12551255
MACOSX_DEPLOYMENT_TARGET = 10.11;
1256-
MARKETING_VERSION = 3.0.1;
1256+
MARKETING_VERSION = 3.1.0;
12571257
PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
12581258
PRODUCT_NAME = "$(TARGET_NAME)";
12591259
USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
@@ -1299,7 +1299,7 @@
12991299
LD_DYLIB_INSTALL_NAME = "";
13001300
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
13011301
MACOSX_DEPLOYMENT_TARGET = 10.11;
1302-
MARKETING_VERSION = 3.0.1;
1302+
MARKETING_VERSION = 3.1.0;
13031303
PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
13041304
PRODUCT_NAME = "$(TARGET_NAME)";
13051305
USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";

AppBox/AppDelegate.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
@property (nonatomic) BOOL isInternetConnected;
2929
@property (nonatomic, weak) IBOutlet NSMenuItem *dropboxLogoutButton;
3030
@property (nonatomic, weak) IBOutlet NSMenuItem *dropboxSpaceButton;
31+
@property (nonatomic, weak) IBOutlet NSMenuItem *dropboxAccountButton;
32+
@property (nonatomic, weak) IBOutlet NSMenuItem *dropboxNameButton;
3133

3234
@end
3335

AppBox/AppDelegate.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ -(void)openFileWithPath:(NSString *)filePath{
8989
}
9090
}
9191

92-
#pragma mark - Default Application
92+
//MARK: - Default Application
9393
-(BOOL)setAppBoxAsDefualt{
9494
OSStatus returnStatus = LSSetDefaultRoleHandlerForContentType(CFSTR("com.apple.iTunes.ipa"), kLSRolesAll, (__bridge CFStringRef) [[NSBundle mainBundle] bundleIdentifier]);
9595
if (returnStatus != 0) {
@@ -99,7 +99,7 @@ -(BOOL)setAppBoxAsDefualt{
9999
return YES;
100100
}
101101

102-
#pragma mark - AppDelegate Helper
102+
//MARK: - AppDelegate Helper
103103

104104
+(AppDelegate *)appDelegate{
105105
return ((AppDelegate *)[[NSApplication sharedApplication] delegate]);
@@ -154,12 +154,12 @@ -(void)handleIPAAtPath:(NSString *)ipaPath {
154154
}
155155
}
156156

157-
#pragma mark - Notification Center Delegate
157+
//MARK: - Notification Center Delegate
158158
-(void)userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification {
159159
[center removeDeliveredNotification:notification];
160160
}
161161

162-
#pragma mark - Core Data stack
162+
//MARK: - Core Data stack
163163

164164
@synthesize persistentStoreCoordinator = _persistentStoreCoordinator;
165165
@synthesize managedObjectModel = _managedObjectModel;
@@ -251,7 +251,7 @@ - (NSManagedObjectContext *)managedObjectContext {
251251
return _managedObjectContext;
252252
}
253253

254-
#pragma mark - Core Data Saving and Undo support
254+
//MARK: - Core Data Saving and Undo support
255255

256256
- (void)saveCoreDataChanges{
257257
// Performs the save action for the application, which is to send the save: message to the application's managed object context. Any encountered errors are presented to the user.

AppBox/Common/CIProjectBuilder/CIProjectBuilder.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ @implementation CIProjectBuilder{
3535

3636
}
3737

38-
#pragma mark - IPA
38+
//MARK: - IPA
3939
+ (XCProject *)xcProjectWithIPAPath:(NSString *)ipaPath {
4040
XCProject *project = [[XCProject alloc] initEmpty];
4141
project.ipaFullPath = [NSURL fileURLWithPath:ipaPath];
@@ -44,7 +44,7 @@ + (XCProject *)xcProjectWithIPAPath:(NSString *)ipaPath {
4444
}
4545

4646

47-
#pragma mark - Common Arguments
47+
//MARK: - Common Arguments
4848
+(void)setCommonArgumentsToProject:(XCProject *)project {
4949
NSArray *arguments = [[NSProcessInfo processInfo] arguments];
5050
[ABLog log:@"All Command Line Arguments = %@",arguments];

AppBox/Common/Common.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ +(NSError *)errorWithDesc:(NSString *)error andCode:(NSInteger)code{
3232
return [NSError errorWithDomain:NSCocoaErrorDomain code:code userInfo:errorInfo];
3333
}
3434

35-
#pragma mark - Notifications
35+
//MARK: - Notifications
3636
+ (NSModalResponse)showAlertWithTitle:(NSString *)title andMessage:(NSString *)message{
3737
[[AppDelegate appDelegate] addSessionLog:[NSString stringWithFormat:@"ALERT -\nTitle - %@ Message - %@", title, message]];
3838
NSAlert *alert = [[NSAlert alloc] init];

AppBox/Common/KeychainHandler/KeychainHandler.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
@implementation KeychainHandler
1414

15-
#pragma mark - ITC Accounts
15+
//MARK: - ITC Accounts
1616
+ (NSArray *)getAllITCAccounts {
1717
NSMutableArray *filteredITCAccounts = [[NSMutableArray alloc] init];
1818
// NSArray *itcAccounts = [SAMKeychain accountsForService:abiTunesConnectService];
@@ -24,7 +24,7 @@ + (NSArray *)getAllITCAccounts {
2424
return filteredITCAccounts;
2525
}
2626

27-
#pragma mark - Keychain
27+
//MARK: - Keychain
2828

2929
+(NSString *)errorMessageForStatus:(OSStatus)status {
3030
CFStringRef errorMessage = SecCopyErrorMessageString(status, NULL);
@@ -33,7 +33,7 @@ +(NSString *)errorMessageForStatus:(OSStatus)status {
3333
}
3434

3535

36-
#pragma mark - Remove All Cache, Cookies and Credentials
36+
//MARK: - Remove All Cache, Cookies and Credentials
3737
+ (void)removeAllStoredCredentials{
3838
// Delete any cached URLrequests!
3939
NSURLCache *sharedCache = [NSURLCache sharedURLCache];

AppBox/Common/LogManager/ABLog.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@implementation ABLog
1212

1313
+(void)log:(NSString *)format, ...{
14-
if (![UserData debugLog]) {
14+
if ([UserData debugLog]) {
1515
va_list args;
1616
va_start(args, format);
1717
NSLogv(format, args);

AppBox/Common/MailHandler/MailHandler.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
@implementation MailHandler
1212

13-
#pragma mark - Check Valid Email
13+
//MARK: - Check Valid Email
1414
+ (BOOL)isValidEmail:(NSString *)checkString{
1515
NSString *stricterFilterString = @"^[A-Z0-9a-z\\._%+-]+@([A-Za-z0-9-]+\\.)+[A-Za-z]{2,4}$";
1616
NSPredicate *emailTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", stricterFilterString];
@@ -27,7 +27,7 @@ + (void)showInvalidEmailAddressAlert{
2727
[Common showAlertWithTitle:@"Invalid email address" andMessage:@"The email address entered was invalid. Please reenter it (Example: username@example.com).\n\nFor multiple email please enter like (username@example.com,username2@example.com,username@example2.com)."];
2828
}
2929

30-
#pragma mark - Parse customised message with project details
30+
//MARK: - Parse customised message with project details
3131
+ (NSString *)parseMessage:(NSString *)message forProject:(XCProject *)project {
3232
NSString *messageCopy = message.copy;
3333
messageCopy = [messageCopy stringByReplacingOccurrencesOfString:@"{BUILD_NAME}" withString:project.name];

AppBox/Common/UpdateHandler/UpdateHandler.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
@implementation UpdateHandler
1212

13-
#pragma mark - Check for update
13+
//MARK: - Check for update
1414

1515
+ (void)showUpdateAlertWithUpdateURL:(NSURL *)url{
1616
NSAlert *alert = [[NSAlert alloc] init];

AppBox/Common/UploadManager/UploadManager.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ typedef void(^CompletionBlock)(void);
4141
- (void)uploadIPAFile:(NSURL *)ipaFileURL;
4242
- (void)uploadIPAFileWithoutUnzip:(NSURL *)ipaURL;
4343

44-
- (void)deleteBuildFromDropbox;
44+
- (void)deleteBuildFromDashboard;
45+
- (void)deleteBuildFromDropboxAndDashboard;
4546

4647
@end

0 commit comments

Comments
 (0)