Skip to content

Commit 46d1bf7

Browse files
Update old Xcode project reference for IPA upload only in ABP framework
1 parent 66aa882 commit 46d1bf7

File tree

14 files changed

+42
-49
lines changed

14 files changed

+42
-49
lines changed

AppBox.xcodeproj/project.pbxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@
227227
E16BB8C420285A38002E9B5A /* SelectAccountCellView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SelectAccountCellView.m; sourceTree = "<group>"; };
228228
E16BB8C7202873FA002E9B5A /* AccountCellView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AccountCellView.h; sourceTree = "<group>"; };
229229
E16BB8C8202873FA002E9B5A /* AccountCellView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AccountCellView.m; sourceTree = "<group>"; };
230-
E178C9891E95067F008D2CAF /* appbox.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = appbox.plist; sourceTree = "<group>"; };
231230
E18186CC1E8A3BC00002509F /* PreferencesTabViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreferencesTabViewController.h; sourceTree = "<group>"; };
232231
E18186CD1E8A3BC00002509F /* PreferencesTabViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PreferencesTabViewController.m; sourceTree = "<group>"; };
233232
E18186D41E8A45C30002509F /* PreferencesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreferencesViewController.h; sourceTree = "<group>"; };
@@ -583,7 +582,6 @@
583582
E16437D61D743A4E00CE8B7E /* main.m */,
584583
E16437E31D743A4E00CE8B7E /* Info.plist */,
585584
E13946131DF2AFFF00B3FAD0 /* AppBoxPrefixHeader.pch */,
586-
E178C9891E95067F008D2CAF /* appbox.plist */,
587585
);
588586
name = "Supporting Files";
589587
sourceTree = "<group>";

AppBox/Common/UploadManager/UploadManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ -(void)handleSharedURLResult:(NSString *)url{
713713
-(void)createUniqueShortSharableUrl{
714714
//Create Short URL
715715
weakify(self);
716-
[[TinyURL shared] shortenURLForProject:self.ipaUploadInfo.abpProject completion:^(NSURL *shortURL, NSError *error) {
716+
[[TinyURL shared] shortenURLWithIPAUploadInfo:self.ipaUploadInfo.abpIPAUploadInfo completion:^(NSURL *shortURL, NSError *error) {
717717
strongify(self);
718718
dispatch_async(dispatch_get_main_queue(), ^{
719719
if (error) {

AppBox/Model/IPAInfoModel/IPAUploadInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
@property(nonatomic, retain) NSNumber *ipaFileSize;
2323
@property(nonatomic, retain) NSString *miniOSVersion;
2424
@property(nonatomic, retain) NSString *supportedDevice;
25-
@property(nonatomic, retain, readonly) ABPProject *abpProject;
25+
@property(nonatomic, retain, readonly) ABPIPAUploadInfo *abpIPAUploadInfo;
2626

2727
//Local URLS
2828
@property(nonatomic, retain) NSURL *ipaFullPath;

AppBox/Model/IPAInfoModel/IPAUploadInfo.m

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -87,28 +87,28 @@ - (NSString *)uuid{
8787
return _uuid;
8888
}
8989

90-
-(ABPProject *)abpProject{
91-
ABPProject *project = [[ABPProject alloc] init];
92-
[project setName:self.name];
93-
[project setVersion:self.version];
94-
[project setBuild:self.build];
95-
[project setIdentifer:self.identifer];
96-
[project setBuildType:self.buildType];
97-
[project setIpaFileSize:self.ipaFileSize];
98-
[project setMiniOSVersion:self.miniOSVersion];
99-
[project setSupportedDevice:self.supportedDevice];
100-
101-
[project setIsKeepSameLinkEnabled:self.isKeepSameLinkEnabled];
102-
[project setUniquelinkShareableURL:self.uniquelinkShareableURL];
103-
104-
[project setDbAppInfoJSONFullPath:self.dbAppInfoJSONFullPath];
105-
[project setAppShortShareableURL:self.appShortShareableURL];
106-
107-
[project setEmails:self.emails];
108-
[project setPersonalMessage:self.personalMessage];
109-
[project setDbManager:[Common currentDBManager]];
110-
111-
return project;
90+
-(ABPIPAUploadInfo *)abpIPAUploadInfo{
91+
ABPIPAUploadInfo *ipaUploadInfo = [[ABPIPAUploadInfo alloc] init];
92+
[ipaUploadInfo setName:self.name];
93+
[ipaUploadInfo setVersion:self.version];
94+
[ipaUploadInfo setBuild:self.build];
95+
[ipaUploadInfo setIdentifer:self.identifer];
96+
[ipaUploadInfo setBuildType:self.buildType];
97+
[ipaUploadInfo setIpaFileSize:self.ipaFileSize];
98+
[ipaUploadInfo setMiniOSVersion:self.miniOSVersion];
99+
[ipaUploadInfo setSupportedDevice:self.supportedDevice];
100+
101+
[ipaUploadInfo setIsKeepSameLinkEnabled:self.isKeepSameLinkEnabled];
102+
[ipaUploadInfo setUniquelinkShareableURL:self.uniquelinkShareableURL];
103+
104+
[ipaUploadInfo setDbAppInfoJSONFullPath:self.dbAppInfoJSONFullPath];
105+
[ipaUploadInfo setAppShortShareableURL:self.appShortShareableURL];
106+
107+
[ipaUploadInfo setEmails:self.emails];
108+
[ipaUploadInfo setPersonalMessage:self.personalMessage];
109+
[ipaUploadInfo setDbManager:[Common currentDBManager]];
110+
111+
return ipaUploadInfo;
112112
}
113113

114114
//MARK: - Setter

AppBox/ViewController/HomeViewController/HomeViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ -(void)shareURLOnSlackMSTeamChannel {
456456
-(void)shareURLOnEmailComplition:(void (^) (BOOL success))completion {
457457
if (textFieldEmail.stringValue.length > 0 && [MailHandler isAllValidEmail:textFieldEmail.stringValue]) {
458458
[self showStatus:@"Sending Mail..." andShowProgressBar:YES withProgress:-1];
459-
[MailGun sendMailWithProject:self.ipaUploadInfo.abpProject complition:^(BOOL success, NSError *error) {
459+
[MailGun sendMailWithIPAUploadInfo:self.ipaUploadInfo.abpIPAUploadInfo complition:^(BOOL success, NSError *error) {
460460
dispatch_async(dispatch_get_main_queue(), ^{
461461
if (success) {
462462
[ABHudViewController showStatus:@"Mail Sent" forSuccess:YES onView:self.view];

AppBox/ViewController/PreferencesViewController/EmailPreferencesViewController/EmailPreferencesViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ - (IBAction)sendTestMailButtonTapped:(NSButton *)sender {
6464
//send mail
6565
[ABHudViewController showStatus:@"Sending Test Mail" onView:self.view];
6666
weakify(self);
67-
[MailGun sendMailWithProject:ipaUploadInfo.abpProject complition:^(BOOL success, NSError *error) {
67+
[MailGun sendMailWithIPAUploadInfo:ipaUploadInfo.abpIPAUploadInfo complition:^(BOOL success, NSError *error) {
6868
dispatch_async(dispatch_get_main_queue(), ^{
6969
strongify(self);
7070
[ABHudViewController hideAllHudFromView:self.view after:0];
-237 KB
Binary file not shown.

Frameworks/ABPrivate.framework/Versions/A/Headers/ABPProject.h renamed to Frameworks/ABPrivate.framework/Versions/A/Headers/ABPIPAUploadInfo.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// ABPProject.h
2+
// ABPIPAUploadInfo.h
33
// ABPrivate
44
//
55
// Created by Vineet Choudhary on 25/04/18.
@@ -9,9 +9,9 @@
99
#import <Foundation/Foundation.h>
1010
#import "DBManager.h"
1111

12-
@interface ABPProject : NSObject
12+
@interface ABPIPAUploadInfo : NSObject
1313

14-
//Project Basic Properties
14+
//Basic Properties
1515
@property(nonatomic, retain) NSString *name;
1616
@property(nonatomic, retain) NSString *version;
1717
@property(nonatomic, retain) NSString *build;
@@ -21,7 +21,6 @@
2121
@property(nonatomic, retain) NSNumber *ipaFileSize;
2222
@property(nonatomic, retain) NSString *miniOSVersion;
2323
@property(nonatomic, retain) NSString *supportedDevice;
24-
@property(nonatomic, retain) NSString *selectedSchemes;
2524

2625
//UniqueLink.json
2726
@property(nonatomic, assign) BOOL isKeepSameLinkEnabled;
@@ -33,10 +32,7 @@
3332

3433
//Emails
3534
@property(nonatomic, retain) NSString *emails;
36-
@property(nonatomic, assign) BOOL isBuildsuccess;
37-
@property(nonatomic, retain) NSString *subjectPrefix;
3835
@property(nonatomic, retain) NSString *personalMessage;
39-
@property(nonatomic, retain) NSString *appStoreMessage;
4036

4137
//Client
4238
@property(nonatomic, retain) DBManager *dbManager;

Frameworks/ABPrivate.framework/Versions/A/Headers/ABPrivate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ FOUNDATION_EXPORT const unsigned char ABPrivateVersionString[];
1919
#import "MailGun.h"
2020
#import "TinyURL.h"
2121
#import "DBManager.h"
22-
#import "ABPProject.h"
22+
#import "ABPIPAUploadInfo.h"
2323

Frameworks/ABPrivate.framework/Versions/A/Headers/DBManager.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
@property(nonatomic, strong) NSString *version;
1616
@property(nonatomic, strong) NSString *userId;
1717

18-
+(NSString *)gaKey;
1918
-(NSString *)getDBKey;
2019
-(void)registerUserId:(NSString *)userId;
2120
@end

0 commit comments

Comments
 (0)