Merge pull request #245 from getappbox/develop

Develop->Master

Author: vineetchoudhary

AppBox.xcodeproj/project.pbxproj

@@ -1253,7 +1253,7 @@
 				LD_DYLIB_INSTALL_NAME = "";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 3.0.1;
+				MARKETING_VERSION = 3.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
@@ -1299,7 +1299,7 @@
 				LD_DYLIB_INSTALL_NAME = "";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 3.0.1;
+				MARKETING_VERSION = 3.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";

AppBox/AppDelegate.h

@@ -28,6 +28,8 @@
 @property (nonatomic) BOOL isInternetConnected;
 @property (nonatomic, weak) IBOutlet NSMenuItem *dropboxLogoutButton;
 @property (nonatomic, weak) IBOutlet NSMenuItem *dropboxSpaceButton;
+@property (nonatomic, weak) IBOutlet NSMenuItem *dropboxAccountButton;
+@property (nonatomic, weak) IBOutlet NSMenuItem *dropboxNameButton;
 
 @end
 

AppBox/AppDelegate.m

@@ -89,7 +89,7 @@ -(void)openFileWithPath:(NSString *)filePath{
     }
 }
 
-#pragma mark - Default Application
+//MARK: - Default Application
 -(BOOL)setAppBoxAsDefualt{
     OSStatus returnStatus = LSSetDefaultRoleHandlerForContentType(CFSTR("com.apple.iTunes.ipa"), kLSRolesAll, (__bridge CFStringRef) [[NSBundle mainBundle] bundleIdentifier]);
     if (returnStatus != 0) {
@@ -99,7 +99,7 @@ -(BOOL)setAppBoxAsDefualt{
     return YES;
 }
 
-#pragma mark - AppDelegate Helper
+//MARK: - AppDelegate Helper
 
 +(AppDelegate *)appDelegate{
     return ((AppDelegate *)[[NSApplication sharedApplication] delegate]);
@@ -154,12 +154,12 @@ -(void)handleIPAAtPath:(NSString *)ipaPath {
     }
 }
 
-#pragma mark - Notification Center Delegate
+//MARK: - Notification Center Delegate
 -(void)userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification {
     [center removeDeliveredNotification:notification];
 }
 
-#pragma mark - Core Data stack
+//MARK: - Core Data stack
 
 @synthesize persistentStoreCoordinator = _persistentStoreCoordinator;
 @synthesize managedObjectModel = _managedObjectModel;
@@ -251,7 +251,7 @@ - (NSManagedObjectContext *)managedObjectContext {
     return _managedObjectContext;
 }
 
-#pragma mark - Core Data Saving and Undo support
+//MARK: - Core Data Saving and Undo support
 
 - (void)saveCoreDataChanges{
     // 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

@@ -35,7 +35,7 @@ @implementation CIProjectBuilder{
 
 }
 
-#pragma mark - IPA
+//MARK: - IPA
 + (XCProject *)xcProjectWithIPAPath:(NSString *)ipaPath {
     XCProject *project = [[XCProject alloc] initEmpty];
     project.ipaFullPath = [NSURL fileURLWithPath:ipaPath];
@@ -44,7 +44,7 @@ + (XCProject *)xcProjectWithIPAPath:(NSString *)ipaPath {
 }
 
 
-#pragma mark - Common Arguments
+//MARK: - Common Arguments
 +(void)setCommonArgumentsToProject:(XCProject *)project {
     NSArray *arguments = [[NSProcessInfo processInfo] arguments];
     [ABLog log:@"All Command Line Arguments = %@",arguments];

AppBox/Common/Common.m

@@ -32,7 +32,7 @@ +(NSError *)errorWithDesc:(NSString *)error andCode:(NSInteger)code{
     return [NSError errorWithDomain:NSCocoaErrorDomain code:code userInfo:errorInfo];
 }
 
-#pragma mark - Notifications
+//MARK: - Notifications
 + (NSModalResponse)showAlertWithTitle:(NSString *)title andMessage:(NSString *)message{
     [[AppDelegate appDelegate] addSessionLog:[NSString stringWithFormat:@"ALERT -\nTitle - %@ Message - %@", title, message]];
     NSAlert *alert = [[NSAlert alloc] init];

AppBox/Common/KeychainHandler/KeychainHandler.m

@@ -12,7 +12,7 @@
 
 @implementation KeychainHandler
 
-#pragma mark - ITC Accounts
+//MARK: - ITC Accounts
 + (NSArray *)getAllITCAccounts {
     NSMutableArray *filteredITCAccounts = [[NSMutableArray alloc] init];
 //    NSArray *itcAccounts = [SAMKeychain accountsForService:abiTunesConnectService];
@@ -24,7 +24,7 @@ + (NSArray *)getAllITCAccounts {
     return filteredITCAccounts;
 }
 
-#pragma mark - Keychain
+//MARK: - Keychain
 
 +(NSString *)errorMessageForStatus:(OSStatus)status {
     CFStringRef errorMessage = SecCopyErrorMessageString(status, NULL);
@@ -33,7 +33,7 @@ +(NSString *)errorMessageForStatus:(OSStatus)status {
 }
 
 
-#pragma mark - Remove All Cache, Cookies and Credentials
+//MARK: - Remove All Cache, Cookies and Credentials
 + (void)removeAllStoredCredentials{
     // Delete any cached URLrequests!
     NSURLCache *sharedCache = [NSURLCache sharedURLCache];

AppBox/Common/LogManager/ABLog.m

@@ -11,7 +11,7 @@
 @implementation ABLog
 
 +(void)log:(NSString *)format, ...{
-    if (![UserData debugLog]) {
+    if ([UserData debugLog]) {
         va_list args;
         va_start(args, format);
         NSLogv(format, args);

AppBox/Common/MailHandler/MailHandler.m

@@ -10,7 +10,7 @@
 
 @implementation MailHandler
 
-#pragma mark - Check Valid Email
+//MARK: - Check Valid Email
 + (BOOL)isValidEmail:(NSString *)checkString{
     NSString *stricterFilterString = @"^[A-Z0-9a-z\\._%+-]+@([A-Za-z0-9-]+\\.)+[A-Za-z]{2,4}$";
     NSPredicate *emailTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", stricterFilterString];
@@ -27,7 +27,7 @@ + (void)showInvalidEmailAddressAlert{
     [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)."];
 }
 
-#pragma mark - Parse customised message with project details
+//MARK: - Parse customised message with project details
 + (NSString *)parseMessage:(NSString *)message forProject:(XCProject *)project {
     NSString *messageCopy = message.copy;
     messageCopy = [messageCopy stringByReplacingOccurrencesOfString:@"{BUILD_NAME}" withString:project.name];

AppBox/Common/UpdateHandler/UpdateHandler.m

@@ -10,7 +10,7 @@
 
 @implementation UpdateHandler
 
-#pragma mark - Check for update
+//MARK: - Check for update
 
 + (void)showUpdateAlertWithUpdateURL:(NSURL *)url{
     NSAlert *alert = [[NSAlert alloc] init];

AppBox/Common/UploadManager/UploadManager.h

@@ -41,6 +41,7 @@ typedef void(^CompletionBlock)(void);
 - (void)uploadIPAFile:(NSURL *)ipaFileURL;
 - (void)uploadIPAFileWithoutUnzip:(NSURL *)ipaURL;
 
-- (void)deleteBuildFromDropbox;
+- (void)deleteBuildFromDashboard;
+- (void)deleteBuildFromDropboxAndDashboard;
 
 @end