Skip to content

Commit 8b6fbba

Browse files
vineetchoudharyvineetchoudhary
authored
Merge pull request #218 from vineetchoudhary/develop
Fixed unable to install app
2 parents 04bfb22 + 296541a commit 8b6fbba

File tree

799 files changed

+80374
-50523
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

799 files changed

+80374
-50523
lines changed

‎AppBox.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1696,7 +1696,7 @@
16961696
LD_DYLIB_INSTALL_NAME = "";
16971697
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
16981698
MACOSX_DEPLOYMENT_TARGET = 10.11;
1699-
MARKETING_VERSION = 2.9.1;
1699+
MARKETING_VERSION = 2.9.5;
17001700
PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
17011701
PRODUCT_NAME = "$(TARGET_NAME)";
17021702
USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
@@ -1740,7 +1740,7 @@
17401740
LD_DYLIB_INSTALL_NAME = "";
17411741
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
17421742
MACOSX_DEPLOYMENT_TARGET = 10.11;
1743-
MARKETING_VERSION = 2.9.1;
1743+
MARKETING_VERSION = 2.9.5;
17441744
PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
17451745
PRODUCT_NAME = "$(TARGET_NAME)";
17461746
USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";

‎AppBox.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>PreviewsEnabled</key>
6+
<false/>
7+
</dict>
8+
</plist>

‎AppBox/AppDelegate.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ - (void)awakeFromNib{
1919
//Init AppCenter
2020
[[NSUserDefaults standardUserDefaults] registerDefaults: @{ @"NSApplicationCrashOnExceptions": @YES }];
2121
NSString *appCenter = [[[NSBundle mainBundle] infoDictionary] valueForKey:@"AppCenter"];
22-
[MSAppCenter start:appCenter withServices: @[[MSAnalytics class], [MSCrashes class]]];
23-
[MSCrashes notifyWithUserConfirmation: MSUserConfirmationAlways];
22+
[MSACAppCenter start:appCenter withServices: @[[MSACAnalytics class], [MSACCrashes class]]];
23+
[MSACCrashes notifyWithUserConfirmation: MSACUserConfirmationAlways];
2424
}
2525

2626
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {

‎AppBox/Common/Constants.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
//Base URL's
1313
#define abGitHubReleaseBaseURL @"https://github.com/vineetchoudhary/AppBox-iOSAppsWirelessInstallation/releases/tag/"
1414
#define abDropBoxAppBaseURL @"https://www.dropbox.com/home/Apps/AppBox%20-%20Build%2C%20Test%20and%20Distribute%20iOS%20Apps"
15+
#define abDropBoxDirectDownload @"https://dl.dropboxusercontent.com"
1516

1617
//Other URL's
1718
#define abDefaultLatestDownloadURL @"https://getappbox.com/download"

‎AppBox/Common/EventTracker/EventTracker.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ typedef enum : NSUInteger {
5050
+(void)logEventWithType:(LogEventTypes)eventType;
5151
+(void)logExceptionEvent:(NSException *)exception;
5252
+(void)logEventSettingWithType:(LogEventSettingTypes)eventType andSettings:(NSDictionary *)currentSetting;
53-
+(void)logEventWithName:(NSString *)eventName customAttributes:(NSDictionary *)attributes flags:(MSFlags)flags;
53+
+(void)logEventWithName:(NSString *)eventName customAttributes:(NSDictionary *)attributes flags:(MSACFlags)flags;
5454

5555
@end

‎AppBox/Common/EventTracker/EventTracker.m‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,111 +11,111 @@
1111
@implementation EventTracker
1212

1313
+(void)logScreen:(NSString *)name{
14-
[MSAnalytics trackEvent:[NSString stringWithFormat:@"Screen-%@", name]];
14+
[MSACAnalytics trackEvent:[NSString stringWithFormat:@"Screen-%@", name]];
1515
}
1616

17-
+(void)logEventWithName:(NSString *)eventName customAttributes:(NSDictionary *)attributes flags:(MSFlags)flags {
18-
[MSAnalytics trackEvent:eventName withProperties:attributes flags:flags];
17+
+(void)logEventWithName:(NSString *)eventName customAttributes:(NSDictionary *)attributes flags:(MSACFlags)flags {
18+
[MSACAnalytics trackEvent:eventName withProperties:attributes flags:flags];
1919
}
2020

2121
+(void)logEventWithType:(LogEventTypes)eventType{
2222
switch (eventType) {
2323
case LogEventTypeCopyToClipboard:{
2424
NSString *name = @"Copy to Clipboard";
25-
[EventTracker logEventWithName:name customAttributes:nil flags:MSFlagsDefault];
25+
[EventTracker logEventWithName:name customAttributes:nil flags:MSACFlagsDefault];
2626
}break;
2727

2828
case LogEventTypeCopyToClipboardFromDashboard:{
2929
NSString *name = @"Copy to Clipboard from Dashboard";
30-
[EventTracker logEventWithName:name customAttributes:nil flags:MSFlagsDefault];
30+
[EventTracker logEventWithName:name customAttributes:nil flags:MSACFlagsDefault];
3131
}break;
3232

3333
case LogEventTypeUpdateExternalLink:{
34-
[EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Update"} flags:MSFlagsDefault];
34+
[EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Update"} flags:MSACFlagsDefault];
3535
}break;
3636

3737
case LogEventTypeUploadWithCustomBDFolderName:{
38-
[EventTracker logEventWithName:@"DB Folder Name" customAttributes:@{@"Custom Name":@"YES"} flags:MSFlagsDefault];
38+
[EventTracker logEventWithName:@"DB Folder Name" customAttributes:@{@"Custom Name":@"YES"} flags:MSACFlagsDefault];
3939
}break;
4040

4141
case LogEventTypeUploadWithDefaultDBFolderName:{
42-
[EventTracker logEventWithName:@"DB Folder Name" customAttributes:@{@"Custom Name":@"NO"} flags:MSFlagsDefault];
42+
[EventTracker logEventWithName:@"DB Folder Name" customAttributes:@{@"Custom Name":@"NO"} flags:MSACFlagsDefault];
4343
}break;
4444

4545
case LogEventTypeShortURLFailedInFirstRequest:{
46-
[EventTracker logEventWithName:@"Short URL Failed" customAttributes:@{@"Request No":@"1"} flags:MSFlagsNormal];
46+
[EventTracker logEventWithName:@"Short URL Failed" customAttributes:@{@"Request No":@"1"} flags:MSACFlagsNormal];
4747
}break;
4848

4949
case LogEventTypeShortURLFailedInSecondRequest:{
50-
[EventTracker logEventWithName:@"Short URL Failed" customAttributes:@{@"Request No":@"2"} flags:MSFlagsCritical];
50+
[EventTracker logEventWithName:@"Short URL Failed" customAttributes:@{@"Request No":@"2"} flags:MSACFlagsCritical];
5151
}break;
5252

5353
case LogEventTypeShortURLSuccessInFirstRequest:{
54-
[EventTracker logEventWithName:@"Short URL Success" customAttributes:@{@"Request No":@"1"} flags:MSFlagsDefault];
54+
[EventTracker logEventWithName:@"Short URL Success" customAttributes:@{@"Request No":@"1"} flags:MSACFlagsDefault];
5555
}break;
5656

5757
case LogEventTypeShortURLSuccessInSecondRequest:{
58-
[EventTracker logEventWithName:@"Short URL Success" customAttributes:@{@"Request No":@"2"} flags:MSFlagsCritical];
58+
[EventTracker logEventWithName:@"Short URL Success" customAttributes:@{@"Request No":@"2"} flags:MSACFlagsCritical];
5959
}break;
6060

6161
case LogEventTypeShortURLElseBlockExecuted: {
62-
[EventTracker logEventWithName:@"Short URL Else Block Executed" customAttributes:@{@"Request No":@"1"} flags:MSFlagsCritical];
62+
[EventTracker logEventWithName:@"Short URL Else Block Executed" customAttributes:@{@"Request No":@"1"} flags:MSACFlagsCritical];
6363
}break;
6464

6565
case LogEventTypeExternalLinkHelp:{
66-
[EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Help"} flags:MSFlagsDefault];
66+
[EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Help"} flags:MSACFlagsDefault];
6767
}break;
6868

6969
case LogEventTypeExternalLinkTwitter:{
70-
[EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Twitter"} flags:MSFlagsDefault];
70+
[EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Twitter"} flags:MSACFlagsDefault];
7171
}break;
7272

7373
case LogEventTypeExternalLinkReleaseNote:{
74-
[EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Release Notes"} flags:MSFlagsDefault];
74+
[EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Release Notes"} flags:MSACFlagsDefault];
7575
}break;
7676

7777
case LogEventTypeExternalLinkLicense:{
78-
[EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"License"} flags:MSFlagsDefault];
78+
[EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"License"} flags:MSACFlagsDefault];
7979
}break;
8080

8181
case LogEventTypeAuthDropbox:{
82-
[EventTracker logEventWithName:@"Authenticating Dropbox Start" customAttributes:nil flags:MSFlagsDefault];
82+
[EventTracker logEventWithName:@"Authenticating Dropbox Start" customAttributes:nil flags:MSACFlagsDefault];
8383
}break;
8484

8585
case LogEventTypeExitWithoutAuth:{
86-
[EventTracker logEventWithName:@"AppBox terminated before Dropbox LoggedIN :(" customAttributes:nil flags:MSFlagsDefault];
86+
[EventTracker logEventWithName:@"AppBox terminated before Dropbox LoggedIN :(" customAttributes:nil flags:MSACFlagsDefault];
8787
}break;
8888

8989
case LogEventTypeAuthDropboxSuccess: {
90-
[EventTracker logEventWithName:@"Authenticating Dropbox Success" customAttributes:nil flags:MSFlagsDefault];
90+
[EventTracker logEventWithName:@"Authenticating Dropbox Success" customAttributes:nil flags:MSACFlagsDefault];
9191
}break;
9292

9393
case LogEventTypeAuthDropboxError: {
94-
[EventTracker logEventWithName:@"Authenticating Dropbox Error" customAttributes:nil flags:MSFlagsCritical];
94+
[EventTracker logEventWithName:@"Authenticating Dropbox Error" customAttributes:nil flags:MSACFlagsCritical];
9595
}break;
9696

9797
case LogEventTypeAuthDropboxCanceled: {
98-
[EventTracker logEventWithName:@"Authenticating Dropbox Canceled" customAttributes:nil flags:MSFlagsNormal];
98+
[EventTracker logEventWithName:@"Authenticating Dropbox Canceled" customAttributes:nil flags:MSACFlagsNormal];
9999
}break;
100100

101101
case LogEventTypeExternalLinkKeepSameLink:{
102-
[EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Keep Same Link"} flags:MSFlagsDefault];
102+
[EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Keep Same Link"} flags:MSACFlagsDefault];
103103
}break;
104104

105105
case LogEventTypeDeleteBuild:{
106-
[EventTracker logEventWithName:@"Build Deleted" customAttributes:nil flags:MSFlagsDefault];
106+
[EventTracker logEventWithName:@"Build Deleted" customAttributes:nil flags:MSACFlagsDefault];
107107
}break;
108108

109109
case LogEventTypeOpenInFinder:{
110-
[EventTracker logEventWithName:@"Open In Finder" customAttributes:nil flags:MSFlagsDefault];
110+
[EventTracker logEventWithName:@"Open In Finder" customAttributes:nil flags:MSACFlagsDefault];
111111
}break;
112112

113113
case LogEventTypeOpenInDropbox:{
114-
[EventTracker logEventWithName:@"Open In Dropbox" customAttributes:nil flags:MSFlagsDefault];
114+
[EventTracker logEventWithName:@"Open In Dropbox" customAttributes:nil flags:MSACFlagsDefault];
115115
}break;
116116

117117
case LogEventTypeOpenDashboardFromShowLink:{
118-
[EventTracker logEventWithName:@"Dashboard open from Show Link" customAttributes:nil flags:MSFlagsDefault];
118+
[EventTracker logEventWithName:@"Dashboard open from Show Link" customAttributes:nil flags:MSACFlagsDefault];
119119
}break;
120120

121121

@@ -127,15 +127,15 @@ +(void)logEventWithType:(LogEventTypes)eventType{
127127
+(void)logEventSettingWithType:(LogEventSettingTypes)eventType andSettings:(NSDictionary *)currentSetting{
128128
switch (eventType) {
129129
case LogEventSettingTypeUploadIPA:{
130-
[EventTracker logEventWithName:@"Upload IPA" customAttributes:currentSetting flags:MSFlagsDefault];
130+
[EventTracker logEventWithName:@"Upload IPA" customAttributes:currentSetting flags:MSACFlagsDefault];
131131
}break;
132132

133133
case LogEventSettingTypeArchiveAndUpload: {
134-
[EventTracker logEventWithName:@"Archive and Upload IPA" customAttributes:currentSetting flags:MSFlagsDefault];
134+
[EventTracker logEventWithName:@"Archive and Upload IPA" customAttributes:currentSetting flags:MSACFlagsDefault];
135135
}break;
136136

137137
case LogEventSettingTypeUploadIPASuccess: {
138-
[EventTracker logEventWithName:@"IPA Uploaded Success" customAttributes:currentSetting flags:MSFlagsDefault];
138+
[EventTracker logEventWithName:@"IPA Uploaded Success" customAttributes:currentSetting flags:MSACFlagsDefault];
139139
}break;
140140

141141
default:
@@ -147,7 +147,7 @@ +(void)logExceptionEvent:(NSException *)exception {
147147
[EventTracker logEventWithName:@"Exception"
148148
customAttributes:@{ @"debug description": exception.debugDescription,
149149
@"stack": exception.callStackSymbols }
150-
flags:MSFlagsCritical];
150+
flags:MSACFlagsCritical];
151151
}
152152

153153
+(void)logAppBoxVersion {
@@ -156,6 +156,6 @@ +(void)logAppBoxVersion {
156156
customAttributes:@{ @"Version": dbManager.version,
157157
@"Name": dbManager.appName,
158158
@"Identifier": dbManager.bundleId }
159-
flags:MSFlagsDefault];
159+
flags:MSACFlagsDefault];
160160
}
161161
@end

‎AppBox/Common/UploadManager/UploadManager.m‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ -(void)dbUploadLargeFile:(NSString *)file to:(NSString *)path mode:(DBFILESWrite
482482
nextChunkToUpload = [fileHandle readDataOfLength:chunkSize];
483483
fileCommitInfo = [[DBFILESCommitInfo alloc] initWithPath:path mode:mode autorename:@NO clientModified:nil mute:@NO propertyGroups:nil strictConflict:@NO];
484484

485-
[[[[DBClientsManager authorizedClient].filesRoutes uploadSessionStartData:nextChunkToUpload] setResponseBlock:^(DBFILESUploadSessionStartResult * _Nullable result, DBNilObject * _Nullable routeError, DBRequestError * _Nullable networkError) {
485+
[[[[DBClientsManager authorizedClient].filesRoutes uploadSessionStartData:nextChunkToUpload] setResponseBlock:^(DBFILESUploadSessionStartResult * _Nullable result, DBFILESUploadSessionStartError * _Nullable routeError, DBRequestError * _Nullable networkError) {
486486
if (result) {
487487
sessionId = result.sessionId;
488488
offset += nextChunkToUpload.length;
@@ -651,7 +651,9 @@ -(void)handleSharedURLResult:(NSString *)url{
651651
if (self.dbFileType == DBFileTypeIPA) {
652652
NSString *shareableLink = url;
653653
if(!self.project.distributeOverLocalNetwork){
654-
shareableLink = [url stringByReplacingCharactersInRange:NSMakeRange(url.length-1, 1) withString:@"1"];
654+
shareableLink = [shareableLink stringByReplacingOccurrencesOfString:@"https://www.dropbox.com" withString:abDropBoxDirectDownload];
655+
shareableLink = [shareableLink stringByReplacingOccurrencesOfString:@"https://dropbox.com" withString:abDropBoxDirectDownload];
656+
shareableLink = [shareableLink substringToIndex:shareableLink.length-5];
655657
}
656658
self.project.ipaFileDBShareableURL = [NSURL URLWithString:shareableLink];
657659
[self.project createManifestWithIPAURL:self.project.ipaFileDBShareableURL completion:^(NSURL *manifestURL) {

‎AppBox/ViewController/ShowLinkViewController/ShowLinkViewController.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
IBOutlet NSTextField *textFieldHint;
1616
IBOutlet NSTextField *textFieldAppLink;
1717
IBOutlet NSButton *buttonCopyToClipboard;
18+
__weak IBOutlet NSLayoutConstraint *linkHeightConstraint;
19+
__weak IBOutlet NSLayoutConstraint *linkHintHeightConstraint;
1820
}
1921

2022
@property(nonatomic, strong) XCProject *project;

‎AppBox/ViewController/ShowLinkViewController/ShowLinkViewController.m‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,15 @@ - (void)viewDidLoad {
2121
[super viewDidLoad];
2222
[EventTracker logScreen:@"AppBox ShareLink"];
2323
[textFieldAppLink setStringValue: self.project.appShortShareableURL.stringValue];
24-
[textFieldHint setStringValue: ([self.project.appShortShareableURL isEqualTo:self.project.appLongShareableURL]) ? LongURLUserHint : ShortURLUserHint];
24+
if ([self.project.appShortShareableURL isEqualTo:self.project.appLongShareableURL]) {
25+
[textFieldHint setStringValue:LongURLUserHint];
26+
[linkHeightConstraint setConstant:70];
27+
[linkHintHeightConstraint setConstant:40];
28+
} else {
29+
[textFieldHint setStringValue:ShortURLUserHint];
30+
[linkHeightConstraint setConstant:30];
31+
[linkHintHeightConstraint setConstant:20];
32+
}
2533

2634
//Save Project Details
2735
[Project addProjectWithXCProject:self.project andSaveDetails:SaveUploadDetails];

0 commit comments

Comments
 (0)