Skip to content

Commit a088266

Browse files
Merge pull request #18 from vineetchoudhary/development
Fixes
2 parents 1b15c38 + d633614 commit a088266

2 files changed

Lines changed: 14 additions & 12 deletions

File tree

AppBox/Info.plist

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>0.9.5</string>
20+
<string>0.9.6</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleURLTypes</key>
@@ -30,6 +30,7 @@
3030
<key>CFBundleURLSchemes</key>
3131
<array>
3232
<string>db-86tfx5bu3356fqo</string>
33+
<string>db-mzwu8mq9xdtilpr</string>
3334
</array>
3435
</dict>
3536
</array>

AppBox/ViewController/HomeViewController/HomeViewController.m

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@ - (void)viewDidLoad {
3838
//setup initial value
3939
[pathBuild setURL:[NSURL URLWithString:[@"~/Desktop" stringByExpandingTildeInPath]]];
4040
[project setBuildDirectory: pathBuild.URL];
41-
42-
//setup team id
43-
[comboTeamId removeAllItems];
44-
[allTeamIds enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
45-
[comboTeamId addItemWithObjectValue:[obj valueForKey:abFullName]];
46-
}];
47-
48-
[self updateViewState];
4941
}
5042

5143
- (void)viewWillAppear{
@@ -105,7 +97,7 @@ - (IBAction)comboBuildTypeValueChanged:(NSComboBox *)sender {
10597
//IPA File Path Handler
10698
- (IBAction)ipaFilePathHandle:(NSPathControl *)sender {
10799
if (![project.fullPath isEqual:sender.URL]){
108-
project.ipaFullPath = sender.URL;
100+
project.ipaFullPath = sender.URL.filePathURL;
109101
[self updateViewState];
110102
}
111103
}
@@ -388,6 +380,7 @@ - (void)getIPAInfoFromLocalURL:(NSURL *)ipaFileURL{
388380
}];
389381
}else{
390382
[[AppDelegate appDelegate] addSessionLog:[NSString stringWithFormat:@"\n\n======\nFile Not Exist - %@\n======\n\n",fromPath]];
383+
[self viewStateForProgressFinish:YES];
391384
}
392385
}
393386

@@ -662,7 +655,14 @@ -(void)viewStateForProgressFinish:(BOOL)finish{
662655

663656
//team id combo
664657
[comboTeamId setEnabled:finish];
665-
if (finish && comboTeamId.indexOfSelectedItem >= 0) [comboTeamId deselectItemAtIndex:comboTeamId.indexOfSelectedItem];
658+
if (finish){
659+
//setup team id
660+
[comboTeamId removeAllItems];
661+
[comboTeamId setStringValue:abEmptyString];
662+
[allTeamIds enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
663+
[comboTeamId addItemWithObjectValue:[obj valueForKey:abFullName]];
664+
}];
665+
}
666666

667667
//build type combo
668668
[comboBuildType setEnabled:finish];
@@ -672,6 +672,7 @@ -(void)viewStateForProgressFinish:(BOOL)finish{
672672
[comboBuildScheme setEnabled:finish];
673673
if (finish){
674674
if (comboBuildScheme.indexOfSelectedItem >= 0){
675+
[comboBuildScheme setStringValue:abEmptyString];
675676
[comboBuildScheme deselectItemAtIndex:comboBuildType.indexOfSelectedItem];
676677
}
677678
[comboBuildScheme removeAllItems];
@@ -685,7 +686,7 @@ -(void)viewStateForProgressFinish:(BOOL)finish{
685686
[textFieldMessage setEnabled:(finish && buttonSendMail.state == NSOnState)];
686687

687688
//action button
688-
[buttonAction setEnabled:finish];
689+
[self updateViewState];
689690
}
690691

691692
-(void)resetBuildOptions{

0 commit comments

Comments
 (0)