Merge pull request #270 from getappbox/dev

Release 3.4.0

Author: vineetchoudhary

AppBox.xcodeproj/project.pbxproj

@@ -29,6 +29,7 @@
 		DB425C051F8A517D008CB032 /* DefaultSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = DB425C041F8A517D008CB032 /* DefaultSettings.m */; };
 		DB53856A2083622A004BFC84 /* NSURL+URL.m in Sources */ = {isa = PBXBuildFile; fileRef = DB5385692083622A004BFC84 /* NSURL+URL.m */; };
 		DB53856E20838913004BFC84 /* DragDropView.m in Sources */ = {isa = PBXBuildFile; fileRef = DB53856D20838913004BFC84 /* DragDropView.m */; };
+		DB5C5A4F2D00BA9C000C4A20 /* NSException+Description.m in Sources */ = {isa = PBXBuildFile; fileRef = DB5C5A4E2D00BA9C000C4A20 /* NSException+Description.m */; };
 		DB6F784F215D459A00C77966 /* AppBoxColors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DB6F784E215D459A00C77966 /* AppBoxColors.xcassets */; };
 		DB831BCB1FF6B5780065B646 /* ABHudViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DB831BC91FF6B5780065B646 /* ABHudViewController.m */; };
 		DB831BCC1FF6B5780065B646 /* ABHudViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DB831BCA1FF6B5780065B646 /* ABHudViewController.xib */; };
@@ -193,6 +194,8 @@
 		DB5385692083622A004BFC84 /* NSURL+URL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSURL+URL.m"; sourceTree = "<group>"; };
 		DB53856C20838913004BFC84 /* DragDropView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DragDropView.h; sourceTree = "<group>"; };
 		DB53856D20838913004BFC84 /* DragDropView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DragDropView.m; sourceTree = "<group>"; };
+		DB5C5A4D2D00BA9C000C4A20 /* NSException+Description.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSException+Description.h"; sourceTree = "<group>"; };
+		DB5C5A4E2D00BA9C000C4A20 /* NSException+Description.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSException+Description.m"; sourceTree = "<group>"; };
 		DB6F784E215D459A00C77966 /* AppBoxColors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = AppBoxColors.xcassets; sourceTree = "<group>"; };
 		DB831BC81FF6B5780065B646 /* ABHudViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ABHudViewController.h; sourceTree = "<group>"; };
 		DB831BC91FF6B5780065B646 /* ABHudViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ABHudViewController.m; sourceTree = "<group>"; };
@@ -354,6 +357,8 @@
 				DB1C84402079F54E007AC74C /* NSString+String.m */,
 				DB5385682083622A004BFC84 /* NSURL+URL.h */,
 				DB5385692083622A004BFC84 /* NSURL+URL.m */,
+				DB5C5A4D2D00BA9C000C4A20 /* NSException+Description.h */,
+				DB5C5A4E2D00BA9C000C4A20 /* NSException+Description.m */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -980,11 +985,17 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-AppBox/Pods-AppBox-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack/CocoaLumberjackPrivacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/ObjectiveDropboxOfficial/ObjectiveDropboxPrivacyInfo.bundle",
 				"${PODS_ROOT}/SAMKeychain/Support/SAMKeychain.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive/SSZipArchive.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CocoaLumberjackPrivacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ObjectiveDropboxPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SAMKeychain.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SSZipArchive.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -1031,6 +1042,7 @@
 				DB358B6C216FB1AC0080CAC0 /* Project+CoreDataProperties.m in Sources */,
 				DB358B6B216FB1AC0080CAC0 /* UploadRecord+CoreDataProperties.m in Sources */,
 				DB358B68216FB1AC0080CAC0 /* ProvisionedDevice+CoreDataClass.m in Sources */,
+				DB5C5A4F2D00BA9C000C4A20 /* NSException+Description.m in Sources */,
 				DB8CE5F81FF77199003FEB65 /* DisabledView.m in Sources */,
 				DB358B6A216FB1AC0080CAC0 /* ProvisionedDevice+CoreDataProperties.m in Sources */,
 				E1902B531E16617B00C3E0F6 /* NetworkHandler.m in Sources */,
@@ -1225,10 +1237,11 @@
 					"\"${PODS_ROOT}/Headers/Public/Crashlytics\"",
 				);
 				INFOPLIST_FILE = AppBox/Info.plist;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
 				LD_DYLIB_INSTALL_NAME = "";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 3.3.0;
+				MACOSX_DEPLOYMENT_TARGET = 12.4;
+				MARKETING_VERSION = 3.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
@@ -1272,10 +1285,11 @@
 					"\"${PODS_ROOT}/Headers/Public/Crashlytics\"",
 				);
 				INFOPLIST_FILE = AppBox/Info.plist;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
 				LD_DYLIB_INSTALL_NAME = "";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 3.3.0;
+				MACOSX_DEPLOYMENT_TARGET = 12.4;
+				MARKETING_VERSION = 3.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";

AppBox.xcodeproj/xcshareddata/xcschemes/AppBox.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1410"
+   LastUpgradeVersion = "1610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

AppBox/AppBox.xcdatamodeld/AppBox4.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="18154" systemVersion="20G95" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23507" systemVersion="24B91" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
     <entity name="AppBoxService" representedClassName="AppBoxService" syncable="YES">
         <attribute name="accountAccessKey" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="accountEmail" optional="YES" attributeType="String" syncable="YES"/>
@@ -9,15 +9,15 @@
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
         <relationship name="uploadRecords" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="UploadRecord" inverseName="service" inverseEntity="UploadRecord" syncable="YES"/>
     </entity>
-    <entity name="Project" representedClassName="Project" syncable="YES">
+    <entity name="Project" representedClassName="ABProject" syncable="YES">
         <attribute name="bundleIdentifier" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
         <relationship name="uploadRecords" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="UploadRecord" inverseName="project" inverseEntity="UploadRecord" syncable="YES"/>
     </entity>
-    <entity name="ProvisionedDevice" representedClassName="ProvisionedDevice" syncable="YES">
+    <entity name="ProvisionedDevice" representedClassName="ABProvisionedDevice" syncable="YES">
         <attribute name="deviceId" optional="YES" attributeType="String" syncable="YES"/>
     </entity>
-    <entity name="ProvisioningProfile" representedClassName="ProvisioningProfile" syncable="YES">
+    <entity name="ProvisioningProfile" representedClassName="ABProvisioningProfile" syncable="YES">
         <attribute name="buildType" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="createDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="expirationDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
@@ -27,7 +27,7 @@
         <relationship name="provisionedDevices" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="ProvisionedDevice" syncable="YES"/>
         <relationship name="uploadRecord" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="UploadRecord" inverseName="provisioningProfile" inverseEntity="UploadRecord" syncable="YES"/>
     </entity>
-    <entity name="UploadRecord" representedClassName="UploadRecord" syncable="YES">
+    <entity name="UploadRecord" representedClassName="ABUploadRecord" syncable="YES">
         <attribute name="build" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="buildType" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="datetime" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
@@ -50,11 +50,4 @@
         <relationship name="provisioningProfile" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="ProvisioningProfile" inverseName="uploadRecord" inverseEntity="ProvisioningProfile" syncable="YES"/>
         <relationship name="service" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="AppBoxService" inverseName="uploadRecords" inverseEntity="AppBoxService" syncable="YES"/>
     </entity>
-    <elements>
-        <element name="Project" positionX="-11914.72265625" positionY="-2547.59375" width="128" height="88"/>
-        <element name="ProvisionedDevice" positionX="-12258" positionY="-2493" width="128" height="58"/>
-        <element name="ProvisioningProfile" positionX="-12260" positionY="-2736" width="128" height="163"/>
-        <element name="UploadRecord" positionX="-12081.50537109375" positionY="-2809.529998779297" width="128" height="358"/>
-        <element name="AppBoxService" positionX="-12078.29156494141" positionY="-3003.159118652344" width="128" height="148"/>
-    </elements>
 </model>

AppBox/AppBoxPrefixHeader.pch

@@ -11,9 +11,6 @@
 
 
 #import <SSZipArchive/SSZipArchive.h>
-#import <AppCenter/AppCenter.h>
-#import <AppCenterCrashes/AppCenterCrashes.h>
-#import <AppCenterAnalytics/AppCenterAnalytics.h>
 #import <SAMKeychain/SAMKeychain.h>
 #import <AFNetworking/AFNetworking.h>
 #import <ObjectiveDropboxOfficial/ObjectiveDropboxOfficial.h>
@@ -46,6 +43,7 @@
 #import "NSURL+URL.h"
 #import "NSDate+Date.h"
 #import "NSString+String.h"
+#import "NSException+Description.h"
 
 #import "Project+CoreDataProperties.h"
 #import "UploadRecord+CoreDataProperties.h"

AppBox/AppDelegate.m

@@ -28,41 +28,6 @@ - (void)awakeFromNib{
 	fileLogger.logFileManager.maximumNumberOfLogFiles = 7;
 	[DDLog addLogger:fileLogger withLevel:logLevel];
 	DDLogInfo(@"AppBox Started.");
-    
-    //Init AppCenter
-    [[NSUserDefaults standardUserDefaults] registerDefaults: @{ @"NSApplicationCrashOnExceptions": @YES }];
-    // Setting userConfirmationHandler as documented on https://docs.microsoft.com/en-us/appcenter/sdk/crashes/macos#ask-for-the-users-consent-to-send-a-crash-log
-    [MSACCrashes setUserConfirmationHandler:^BOOL(NSArray<MSACErrorReport *> * _Nonnull errorReports)
-     {
-        NSAlert *alert = [[NSAlert alloc] init];
-        alert.messageText = @"Sorry about that!";
-        alert.informativeText = @"Do you want to send a crash report so we can fix the issue?";
-        
-        [alert addButtonWithTitle:@"Always send"];
-        [alert addButtonWithTitle:@"Send"];
-        [alert addButtonWithTitle:@"Don't send"];
-        alert.alertStyle = NSAlertStyleWarning;
-        
-        switch ([alert runModal])
-        {
-            case NSAlertFirstButtonReturn:
-                [MSACCrashes notifyWithUserConfirmation:MSACUserConfirmationAlways];
-                break;
-            case NSAlertSecondButtonReturn:
-                [MSACCrashes notifyWithUserConfirmation:MSACUserConfirmationSend];
-                break;
-            case NSAlertThirdButtonReturn:
-                [MSACCrashes notifyWithUserConfirmation:MSACUserConfirmationDontSend];
-                break;
-            default:
-                break;
-                
-        }
-        return true; // Return true if the SDK should await user confirmation, otherwise return false.
-    }];
-        
-    NSString *appCenter = [[[NSBundle mainBundle] infoDictionary] valueForKey:@"AppCenter"];
-    [MSACAppCenter start:appCenter withServices: @[[MSACAnalytics class], [MSACCrashes class]]];
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
@@ -105,6 +70,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
 - (void)applicationWillTerminate:(NSNotification *)aNotification {
 	DDLogInfo(@"AppBox Terminated.");
     [self saveCoreDataChanges];
+	[self deleteTemporaryFiles];
 }
 
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender{
@@ -360,4 +326,12 @@ - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sende
     return NSTerminateNow;
 }
 
+// MARK: - Other helpers
+- (void)deleteTemporaryFiles {
+	NSArray* tmpDirectory = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:NSTemporaryDirectory() error:NULL];
+	for (NSString *file in tmpDirectory) {
+		[[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@%@", NSTemporaryDirectory(), file] error:NULL];
+	}
+}
+
 @end

AppBox/Common/Common.m

@@ -38,7 +38,7 @@ + (NSModalResponse)showAlertWithTitle:(NSString *)title andMessage:(NSString *)m
     NSAlert *alert = [[NSAlert alloc] init];
     [alert setMessageText: title == nil ? @"Error" : title];
     [alert setInformativeText:message == nil ? @"" : message];
-    [alert setAlertStyle:NSWarningAlertStyle];
+	[alert setAlertStyle:NSAlertStyleWarning];
     return [alert runModal];
 }
 

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:(MSACFlags)flags;
++(void)logEventWithName:(NSString *)eventName customAttributes:(NSDictionary *)attributes;
 
 @end