extracting ipa after clicking upload or archive

Author: vineetchoudhary

AppBox/ViewController/HomeViewController/HomeViewController.m

@@ -44,7 +44,7 @@ - (void)viewWillAppear{
     if (![[DBSession sharedSession] isLinked]) {
         [self performSegueWithIdentifier:@"DropBoxLogin" sender:self];
     }else{
-        [self progressCompletedViewState];
+        [self viewStateForProgress:YES];
     }
 }
 
@@ -98,26 +98,13 @@ - (IBAction)ipaFilePathHandle:(NSPathControl *)sender {
     if (![project.fullPath isEqual:sender.URL]){
         project.ipaFullPath = sender.URL;
         [self updateViewState];
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [self getIPAInfoFromLocalURL:project.ipaFullPath];
-        });
     }
 }
 
 - (IBAction)buttonUniqueLinkTapped:(NSButton *)sender{
     //NOT required
 }
 
-#pragma mark → Final Action Button (Build/IPA)
-//Build Button Action
-- (IBAction)actionButtonTapped:(NSButton *)sender {
-    if (project.fullPath){
-        [project setIsBuildOnly:NO];
-        [self runBuildScript];
-    }else if (project.ipaFullPath){
-        [self uploadIPAFileWithLocalURL:project.ipaFullPath];
-    }
-}
 
 #pragma mark → Mail Controls Action
 //Send mail option
@@ -149,6 +136,21 @@ - (IBAction)textFieldDevMessageValueChanged:(NSTextField *)sender {
     [UserData setUserMessage:sender.stringValue];
 }
 
+#pragma mark → Final Action Button (Build/IPA)
+//Build Button Action
+- (IBAction)actionButtonTapped:(NSButton *)sender {
+    if (![sender.title.lowercaseString isEqualToString:@"stop"]){
+        if (project.fullPath){
+            [project setIsBuildOnly:NO];
+            [self runBuildScript];
+        }else if (project.ipaFullPath){
+            [self uploadIPAFileWithLocalURL:project.ipaFullPath];
+        }
+        [self viewStateForProgress:NO];
+    }else{
+        [Common showAlertWithTitle:@"AppBox" andMessage:@"Comming Soon... You can quit and start again :D !!"];
+    }
+}
 
 #pragma mark - NSTask (Scheme, TeamId and Archive) -
 #pragma mark → Task
@@ -274,6 +276,7 @@ - (void)captureStandardOutputWithTask:(NSTask *)task{
                 } else {
                     [pipe.fileHandleForReading waitForDataInBackgroundAndNotify];
                 }
+                [self viewStateForProgress:YES];
             }
 
             //Handle Build Response
@@ -336,19 +339,29 @@ - (void)getIPAInfoFromLocalURL:(NSURL *)ipaFileURL{
             [[AppDelegate appDelegate] addSessionLog:[NSString stringWithFormat:@"%@-%@",[NSNumber numberWithLong:entryNumber], [NSNumber numberWithLong:total]]];
         } completionHandler:^(NSString * _Nonnull path, BOOL succeeded, NSError * _Nonnull error) {
             if (error) {
-                [self progressCompletedViewState];
+                [self viewStateForProgress:YES];
                 [Common showAlertWithTitle:@"AppBox - Error" andMessage:error.localizedDescription];
                 return;
             }
+            
             //get info.plist
             [project setIpaInfoPlist: [NSDictionary dictionaryWithContentsOfFile:[NSTemporaryDirectory() stringByAppendingPathComponent:infoPlistPath]]];
             if (project.ipaInfoPlist == nil) {
-                [self progressCompletedViewState];
+                [self viewStateForProgress:YES];
                 [Common showAlertWithTitle:@"AppBox - Error" andMessage:@"AppBox can't able to find Info.plist in you IPA."];
                 return;
             }
-            [textFieldBundleIdentifier setStringValue: project.identifer];
+            
+            //set dropbox folder name
+            if (textFieldBundleIdentifier.stringValue.length == 0){
+                [textFieldBundleIdentifier setStringValue: project.identifer];
+            }
             [self showStatus:@"Ready to upload..." andShowProgressBar:NO withProgress:-1];
+            
+            //upload ipa file directly if archive and ipa selected
+            if (tabView.tabViewItems.firstObject.tabState == NSSelectedTab){
+                [self uploadIPAFileWithLocalURL:project.ipaFullPath];
+            }
         }];
     }else{
         [[AppDelegate appDelegate] addSessionLog:[NSString stringWithFormat:@"\n\n======\nFile Not Exist - %@\n======\n\n",fromPath]];
@@ -360,6 +373,7 @@ -(void)uploadIPAFileWithLocalURL:(NSURL *)ipaURL{
         [Common showAlertWithTitle:@"IPA File Missing" andMessage:@"Please select the IPA file and try again."];
         return;
     }
+    [self getIPAInfoFromLocalURL:project.ipaFullPath];
     if(![textFieldBundleIdentifier.stringValue isEqualToString:project.identifer] && textFieldBundleIdentifier.stringValue.length>0){
         NSString *bundlePath = [NSString stringWithFormat:@"/%@",textFieldBundleIdentifier.stringValue];
         bundlePath = [bundlePath stringByReplacingOccurrencesOfString:@" " withString:@""];
@@ -471,7 +485,7 @@ -(void)restClient:(DBRestClient*)client loadFileFailedWithError:(NSError*)error{
 //Upload File
 -(void)restClient:(DBRestClient *)client uploadFileFailedWithError:(NSError *)error{
     [Common showAlertWithTitle:@"Error" andMessage:error.localizedDescription];
-    [self progressCompletedViewState];
+    [self viewStateForProgress:YES];;
 }
 
 -(void)restClient:(DBRestClient *)client uploadedFile:(NSString *)destPath from:(NSString *)srcPath metadata:(DBMetadata *)metadata{
@@ -507,7 +521,7 @@ -(void)restClient:(DBRestClient *)client uploadProgress:(CGFloat)progress forFil
 //Shareable Link
 -(void)restClient:(DBRestClient *)restClient loadSharableLinkFailedWithError:(NSError *)error{
     [Common showAlertWithTitle:@"Error" andMessage:error.localizedDescription];
-    [self progressCompletedViewState];
+    [self viewStateForProgress:YES];
 }
 
 -(void)restClient:(DBRestClient *)restClientLocal loadedSharableLink:(NSString *)link forFile:(NSString *)path{
@@ -547,7 +561,7 @@ -(void)restClient:(DBRestClient *)restClientLocal loadedSharableLink:(NSString *
 #pragma mark → Dropbox Helper
 - (void)authHelperStateChangedNotification:(NSNotification *)notification {
     if ([[DBSession sharedSession] isLinked]) {
-        [self progressCompletedViewState];
+        [self viewStateForProgress:YES];
     }
 }
 
@@ -593,8 +607,24 @@ -(void)createManifestShortSharableUrl{
 
 
 #pragma mark - Controller Helpers -
--(void)progressCompletedViewState{
 
+-(void)viewStateForProgress:(BOOL)finish{
+//    [pathBuild setEnabled:finish];
+//    [pathIPAFile setEnabled:finish];
+//    [pathProject setEnabled:finish];
+//    [comboTeamId setEnabled:finish];
+//    [comboBuildType setEnabled:finish];
+//    [comboBuildScheme setEnabled:finish];
+//    [buttonSendMail setEnabled:finish];
+//    [buttonUniqueLink setEnabled:finish];
+//    [textFieldBundleIdentifier setEnabled:finish];
+//    [textFieldEmail setEnabled:finish];
+//    [textFieldMessage setEnabled:finish];
+//    if (finish){
+//        [self updateViewState];
+//    }else{
+//        [buttonAction setTitle:@"Stop"];
+//    }
 }
 
 -(void)resetBuildOptions{
@@ -630,10 +660,10 @@ -(void)updateViewState{
     BOOL enable = ((comboBuildScheme.stringValue != nil && comboBuildType.stringValue.length > 0 && //build scheme
                     comboBuildType.stringValue != nil && comboBuildType.stringValue.length > 0 && //build type
                     comboTeamId.stringValue != nil && comboTeamId.stringValue.length > 0 && //team id
-                    tabView.selectedTabViewItem.tabState == NSSelectedTab) ||
+                    tabView.tabViewItems.firstObject.tabState == NSSelectedTab) ||
 
                    //if ipa selected
-                   (project.ipaFullPath != nil && tabView.selectedTabViewItem.tabState == NSSelectedTab));
+                   (project.ipaFullPath != nil && tabView.tabViewItems.lastObject.tabState == NSSelectedTab));
     [buttonAction setEnabled:enable];
     [buttonAction setTitle:(tabView.selectedTabViewItem.label)];
 
@@ -692,7 +722,7 @@ -(void)showURL{
     }else{
         [self performSegueWithIdentifier:@"ShowLink" sender:self];
     }
-    [self progressCompletedViewState];
+    [self viewStateForProgress:YES];
 }
 
 -(void)prepareForSegue:(NSStoryboardSegue *)segue sender:(id)sender{

AppBox/ViewController/MailViewController/MailViewController.m

@@ -41,8 +41,10 @@ - (void)webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(We
         [self.delegate mailViewLoadedWithWebView:sender];
 
     }else if ([title isEqualToString:@"MailSent"]){
-        [self.delegate mailSentWithWebView:sender];
-        [self dismissViewController:self];
+        if (self.presentingViewController != nil){
+            [self.delegate mailSentWithWebView:sender];
+            [self dismissViewController:self];            
+        }
 
     }else if ([title isEqualToString:@"InvalidPerameter"]){
         [self.delegate invalidPerametersWithWebView:sender];