Merge pull request #218 from vineetchoudhary/develop

Fixed unable to install app
getappbox · Mar 2, 2021 · 8b6fbba · 8b6fbba
2 parents 04bfb22 + 296541a
commit 8b6fbba
Show file tree

Hide file tree

Showing 799 changed files with 80,374 additions and 50,523 deletions.
diff --git a/AppBox.xcodeproj/project.pbxproj b/AppBox.xcodeproj/project.pbxproj
@@ -1696,7 +1696,7 @@
 				LD_DYLIB_INSTALL_NAME = "";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 2.9.1;
+				MARKETING_VERSION = 2.9.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
@@ -1740,7 +1740,7 @@
 				LD_DYLIB_INSTALL_NAME = "";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
-				MARKETING_VERSION = 2.9.1;
+				MARKETING_VERSION = 2.9.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";

diff --git a/AppBox.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/AppBox.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>
diff --git a/AppBox/AppDelegate.m b/AppBox/AppDelegate.m
@@ -19,8 +19,8 @@ - (void)awakeFromNib{
     //Init AppCenter
     [[NSUserDefaults standardUserDefaults] registerDefaults: @{ @"NSApplicationCrashOnExceptions": @YES }];
     NSString *appCenter = [[[NSBundle mainBundle] infoDictionary] valueForKey:@"AppCenter"];
-    [MSAppCenter start:appCenter withServices: @[[MSAnalytics class], [MSCrashes class]]];
-    [MSCrashes notifyWithUserConfirmation: MSUserConfirmationAlways];
+    [MSACAppCenter start:appCenter withServices: @[[MSACAnalytics class], [MSACCrashes class]]];
+    [MSACCrashes notifyWithUserConfirmation: MSACUserConfirmationAlways];
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {

diff --git a/AppBox/Common/Constants.h b/AppBox/Common/Constants.h
@@ -12,6 +12,7 @@
 //Base URL's
 #define abGitHubReleaseBaseURL @"https://github.com/vineetchoudhary/AppBox-iOSAppsWirelessInstallation/releases/tag/"
 #define abDropBoxAppBaseURL @"https://www.dropbox.com/home/Apps/AppBox%20-%20Build%2C%20Test%20and%20Distribute%20iOS%20Apps"
+#define abDropBoxDirectDownload @"https://dl.dropboxusercontent.com"
 
 //Other URL's
 #define abDefaultLatestDownloadURL @"https://getappbox.com/download"

diff --git a/AppBox/Common/EventTracker/EventTracker.h b/AppBox/Common/EventTracker/EventTracker.h
@@ -50,6 +50,6 @@ typedef enum : NSUInteger {
 +(void)logEventWithType:(LogEventTypes)eventType;
 +(void)logExceptionEvent:(NSException *)exception;
 +(void)logEventSettingWithType:(LogEventSettingTypes)eventType andSettings:(NSDictionary *)currentSetting;
-+(void)logEventWithName:(NSString *)eventName customAttributes:(NSDictionary *)attributes flags:(MSFlags)flags;
++(void)logEventWithName:(NSString *)eventName customAttributes:(NSDictionary *)attributes flags:(MSACFlags)flags;
 
 @end
diff --git a/AppBox/Common/EventTracker/EventTracker.m b/AppBox/Common/EventTracker/EventTracker.m
@@ -11,111 +11,111 @@
 @implementation EventTracker
 
 +(void)logScreen:(NSString *)name{
-    [MSAnalytics trackEvent:[NSString stringWithFormat:@"Screen-%@", name]];
+    [MSACAnalytics trackEvent:[NSString stringWithFormat:@"Screen-%@", name]];
 }
 
-+(void)logEventWithName:(NSString *)eventName customAttributes:(NSDictionary *)attributes flags:(MSFlags)flags {
-    [MSAnalytics trackEvent:eventName withProperties:attributes flags:flags];
++(void)logEventWithName:(NSString *)eventName customAttributes:(NSDictionary *)attributes flags:(MSACFlags)flags {
+    [MSACAnalytics trackEvent:eventName withProperties:attributes flags:flags];
 }
 
 +(void)logEventWithType:(LogEventTypes)eventType{
     switch (eventType) {
         case LogEventTypeCopyToClipboard:{
             NSString *name = @"Copy to Clipboard";
-            [EventTracker logEventWithName:name customAttributes:nil flags:MSFlagsDefault];
+            [EventTracker logEventWithName:name customAttributes:nil flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeCopyToClipboardFromDashboard:{
             NSString *name = @"Copy to Clipboard from Dashboard";
-            [EventTracker logEventWithName:name customAttributes:nil flags:MSFlagsDefault];
+            [EventTracker logEventWithName:name customAttributes:nil flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeUpdateExternalLink:{
-            [EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Update"} flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Update"} flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeUploadWithCustomBDFolderName:{
-            [EventTracker logEventWithName:@"DB Folder Name" customAttributes:@{@"Custom Name":@"YES"} flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"DB Folder Name" customAttributes:@{@"Custom Name":@"YES"} flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeUploadWithDefaultDBFolderName:{
-            [EventTracker logEventWithName:@"DB Folder Name" customAttributes:@{@"Custom Name":@"NO"} flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"DB Folder Name" customAttributes:@{@"Custom Name":@"NO"} flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeShortURLFailedInFirstRequest:{
-            [EventTracker logEventWithName:@"Short URL Failed" customAttributes:@{@"Request No":@"1"} flags:MSFlagsNormal];
+            [EventTracker logEventWithName:@"Short URL Failed" customAttributes:@{@"Request No":@"1"} flags:MSACFlagsNormal];
         }break;
 
         case LogEventTypeShortURLFailedInSecondRequest:{
-            [EventTracker logEventWithName:@"Short URL Failed" customAttributes:@{@"Request No":@"2"} flags:MSFlagsCritical];
+            [EventTracker logEventWithName:@"Short URL Failed" customAttributes:@{@"Request No":@"2"} flags:MSACFlagsCritical];
         }break;
 
         case LogEventTypeShortURLSuccessInFirstRequest:{
-            [EventTracker logEventWithName:@"Short URL Success" customAttributes:@{@"Request No":@"1"} flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"Short URL Success" customAttributes:@{@"Request No":@"1"} flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeShortURLSuccessInSecondRequest:{
-            [EventTracker logEventWithName:@"Short URL Success" customAttributes:@{@"Request No":@"2"} flags:MSFlagsCritical];
+            [EventTracker logEventWithName:@"Short URL Success" customAttributes:@{@"Request No":@"2"} flags:MSACFlagsCritical];
         }break;
 
         case LogEventTypeShortURLElseBlockExecuted: {
-            [EventTracker logEventWithName:@"Short URL Else Block Executed" customAttributes:@{@"Request No":@"1"} flags:MSFlagsCritical];
+            [EventTracker logEventWithName:@"Short URL Else Block Executed" customAttributes:@{@"Request No":@"1"} flags:MSACFlagsCritical];
         }break;
 
         case LogEventTypeExternalLinkHelp:{
-            [EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Help"} flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Help"} flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeExternalLinkTwitter:{
-            [EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Twitter"} flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Twitter"} flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeExternalLinkReleaseNote:{
-            [EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Release Notes"} flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Release Notes"} flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeExternalLinkLicense:{
-            [EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"License"} flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"License"} flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeAuthDropbox:{
-            [EventTracker logEventWithName:@"Authenticating Dropbox Start" customAttributes:nil  flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"Authenticating Dropbox Start" customAttributes:nil  flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeExitWithoutAuth:{
-            [EventTracker logEventWithName:@"AppBox terminated before Dropbox LoggedIN :(" customAttributes:nil flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"AppBox terminated before Dropbox LoggedIN :(" customAttributes:nil flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeAuthDropboxSuccess: {
-            [EventTracker logEventWithName:@"Authenticating Dropbox Success" customAttributes:nil flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"Authenticating Dropbox Success" customAttributes:nil flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeAuthDropboxError: {
-            [EventTracker logEventWithName:@"Authenticating Dropbox Error" customAttributes:nil flags:MSFlagsCritical];
+            [EventTracker logEventWithName:@"Authenticating Dropbox Error" customAttributes:nil flags:MSACFlagsCritical];
         }break;
 
         case LogEventTypeAuthDropboxCanceled: {
-            [EventTracker logEventWithName:@"Authenticating Dropbox Canceled" customAttributes:nil flags:MSFlagsNormal];
+            [EventTracker logEventWithName:@"Authenticating Dropbox Canceled" customAttributes:nil flags:MSACFlagsNormal];
         }break;
 
         case LogEventTypeExternalLinkKeepSameLink:{
-            [EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Keep Same Link"} flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"External Links" customAttributes:@{@"Title":@"Keep Same Link"} flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeDeleteBuild:{
-            [EventTracker logEventWithName:@"Build Deleted" customAttributes:nil flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"Build Deleted" customAttributes:nil flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeOpenInFinder:{
-            [EventTracker logEventWithName:@"Open In Finder" customAttributes:nil flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"Open In Finder" customAttributes:nil flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeOpenInDropbox:{
-            [EventTracker logEventWithName:@"Open In Dropbox" customAttributes:nil flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"Open In Dropbox" customAttributes:nil flags:MSACFlagsDefault];
         }break;
 
         case LogEventTypeOpenDashboardFromShowLink:{
-            [EventTracker logEventWithName:@"Dashboard open from Show Link" customAttributes:nil flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"Dashboard open from Show Link" customAttributes:nil flags:MSACFlagsDefault];
         }break;
 
 
@@ -127,15 +127,15 @@ +(void)logEventWithType:(LogEventTypes)eventType{
 +(void)logEventSettingWithType:(LogEventSettingTypes)eventType andSettings:(NSDictionary *)currentSetting{
     switch (eventType) {
         case LogEventSettingTypeUploadIPA:{
-            [EventTracker logEventWithName:@"Upload IPA" customAttributes:currentSetting flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"Upload IPA" customAttributes:currentSetting flags:MSACFlagsDefault];
         }break;
 
         case LogEventSettingTypeArchiveAndUpload: {
-            [EventTracker logEventWithName:@"Archive and Upload IPA" customAttributes:currentSetting flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"Archive and Upload IPA" customAttributes:currentSetting flags:MSACFlagsDefault];
         }break;
 
         case LogEventSettingTypeUploadIPASuccess: {
-            [EventTracker logEventWithName:@"IPA Uploaded Success" customAttributes:currentSetting flags:MSFlagsDefault];
+            [EventTracker logEventWithName:@"IPA Uploaded Success" customAttributes:currentSetting flags:MSACFlagsDefault];
         }break;
 
         default:
@@ -147,7 +147,7 @@ +(void)logExceptionEvent:(NSException *)exception {
     [EventTracker logEventWithName:@"Exception"
                   customAttributes:@{ @"debug description": exception.debugDescription,
                                       @"stack": exception.callStackSymbols }
-                             flags:MSFlagsCritical];
+                             flags:MSACFlagsCritical];
 }
 
 +(void)logAppBoxVersion {
@@ -156,6 +156,6 @@ +(void)logAppBoxVersion {
                   customAttributes:@{ @"Version": dbManager.version,
                                       @"Name": dbManager.appName,
                                       @"Identifier": dbManager.bundleId }
-                             flags:MSFlagsDefault];
+                             flags:MSACFlagsDefault];
 }
 @end
diff --git a/AppBox/Common/UploadManager/UploadManager.m b/AppBox/Common/UploadManager/UploadManager.m
@@ -482,7 +482,7 @@ -(void)dbUploadLargeFile:(NSString *)file to:(NSString *)path mode:(DBFILESWrite
     nextChunkToUpload = [fileHandle readDataOfLength:chunkSize];
     fileCommitInfo = [[DBFILESCommitInfo alloc] initWithPath:path mode:mode autorename:@NO clientModified:nil mute:@NO propertyGroups:nil strictConflict:@NO];
 
-    [[[[DBClientsManager authorizedClient].filesRoutes uploadSessionStartData:nextChunkToUpload] setResponseBlock:^(DBFILESUploadSessionStartResult * _Nullable result, DBNilObject * _Nullable routeError, DBRequestError * _Nullable networkError) {
+    [[[[DBClientsManager authorizedClient].filesRoutes uploadSessionStartData:nextChunkToUpload] setResponseBlock:^(DBFILESUploadSessionStartResult * _Nullable result, DBFILESUploadSessionStartError * _Nullable routeError, DBRequestError * _Nullable networkError) {
         if (result) {
             sessionId = result.sessionId;
             offset += nextChunkToUpload.length;
@@ -651,7 +651,9 @@ -(void)handleSharedURLResult:(NSString *)url{
     if (self.dbFileType == DBFileTypeIPA) {
         NSString *shareableLink = url;
         if(!self.project.distributeOverLocalNetwork){
-            shareableLink = [url stringByReplacingCharactersInRange:NSMakeRange(url.length-1, 1) withString:@"1"];
+            shareableLink = [shareableLink stringByReplacingOccurrencesOfString:@"https://www.dropbox.com" withString:abDropBoxDirectDownload];
+            shareableLink = [shareableLink stringByReplacingOccurrencesOfString:@"https://dropbox.com" withString:abDropBoxDirectDownload];
+            shareableLink = [shareableLink substringToIndex:shareableLink.length-5];
         }
         self.project.ipaFileDBShareableURL = [NSURL URLWithString:shareableLink];
         [self.project createManifestWithIPAURL:self.project.ipaFileDBShareableURL completion:^(NSURL *manifestURL) {

diff --git a/AppBox/ViewController/ShowLinkViewController/ShowLinkViewController.h b/AppBox/ViewController/ShowLinkViewController/ShowLinkViewController.h
@@ -15,6 +15,8 @@
     IBOutlet NSTextField *textFieldHint;
     IBOutlet NSTextField *textFieldAppLink;
     IBOutlet NSButton *buttonCopyToClipboard;
+    __weak IBOutlet NSLayoutConstraint *linkHeightConstraint;
+    __weak IBOutlet NSLayoutConstraint *linkHintHeightConstraint;
 }
 
 @property(nonatomic, strong) XCProject *project;

diff --git a/AppBox/ViewController/ShowLinkViewController/ShowLinkViewController.m b/AppBox/ViewController/ShowLinkViewController/ShowLinkViewController.m
@@ -21,7 +21,15 @@ - (void)viewDidLoad {
     [super viewDidLoad];
     [EventTracker logScreen:@"AppBox ShareLink"];
     [textFieldAppLink setStringValue: self.project.appShortShareableURL.stringValue];
-    [textFieldHint setStringValue: ([self.project.appShortShareableURL isEqualTo:self.project.appLongShareableURL]) ? LongURLUserHint : ShortURLUserHint];
+    if ([self.project.appShortShareableURL isEqualTo:self.project.appLongShareableURL]) {
+        [textFieldHint setStringValue:LongURLUserHint];
+        [linkHeightConstraint setConstant:70];
+        [linkHintHeightConstraint setConstant:40];
+    } else {
+        [textFieldHint setStringValue:ShortURLUserHint];
+        [linkHeightConstraint setConstant:30];
+        [linkHintHeightConstraint setConstant:20];
+    }
 
     //Save Project Details
     [Project addProjectWithXCProject:self.project andSaveDetails:SaveUploadDetails];