Skip to content

Commit 2701c1d

Browse files
vineetchoudharyvineetchoudhary
authored
Merge pull request #270 from getappbox/dev
Release 3.4.0
2 parents 5d2b3ab + 754e139 commit 2701c1d

File tree

838 files changed

+44114
-47319
lines changed

Some content is hidden

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

838 files changed

+44114
-47319
lines changed

‎AppBox.xcodeproj/project.pbxproj

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
DB425C051F8A517D008CB032 /* DefaultSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = DB425C041F8A517D008CB032 /* DefaultSettings.m */; };
3030
DB53856A2083622A004BFC84 /* NSURL+URL.m in Sources */ = {isa = PBXBuildFile; fileRef = DB5385692083622A004BFC84 /* NSURL+URL.m */; };
3131
DB53856E20838913004BFC84 /* DragDropView.m in Sources */ = {isa = PBXBuildFile; fileRef = DB53856D20838913004BFC84 /* DragDropView.m */; };
32+
DB5C5A4F2D00BA9C000C4A20 /* NSException+Description.m in Sources */ = {isa = PBXBuildFile; fileRef = DB5C5A4E2D00BA9C000C4A20 /* NSException+Description.m */; };
3233
DB6F784F215D459A00C77966 /* AppBoxColors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DB6F784E215D459A00C77966 /* AppBoxColors.xcassets */; };
3334
DB831BCB1FF6B5780065B646 /* ABHudViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DB831BC91FF6B5780065B646 /* ABHudViewController.m */; };
3435
DB831BCC1FF6B5780065B646 /* ABHudViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DB831BCA1FF6B5780065B646 /* ABHudViewController.xib */; };
@@ -193,6 +194,8 @@
193194
DB5385692083622A004BFC84 /* NSURL+URL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSURL+URL.m"; sourceTree = "<group>"; };
194195
DB53856C20838913004BFC84 /* DragDropView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DragDropView.h; sourceTree = "<group>"; };
195196
DB53856D20838913004BFC84 /* DragDropView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DragDropView.m; sourceTree = "<group>"; };
197+
DB5C5A4D2D00BA9C000C4A20 /* NSException+Description.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSException+Description.h"; sourceTree = "<group>"; };
198+
DB5C5A4E2D00BA9C000C4A20 /* NSException+Description.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSException+Description.m"; sourceTree = "<group>"; };
196199
DB6F784E215D459A00C77966 /* AppBoxColors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = AppBoxColors.xcassets; sourceTree = "<group>"; };
197200
DB831BC81FF6B5780065B646 /* ABHudViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ABHudViewController.h; sourceTree = "<group>"; };
198201
DB831BC91FF6B5780065B646 /* ABHudViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ABHudViewController.m; sourceTree = "<group>"; };
@@ -354,6 +357,8 @@
354357
DB1C84402079F54E007AC74C /* NSString+String.m */,
355358
DB5385682083622A004BFC84 /* NSURL+URL.h */,
356359
DB5385692083622A004BFC84 /* NSURL+URL.m */,
360+
DB5C5A4D2D00BA9C000C4A20 /* NSException+Description.h */,
361+
DB5C5A4E2D00BA9C000C4A20 /* NSException+Description.m */,
357362
);
358363
path = Extensions;
359364
sourceTree = "<group>";
@@ -980,11 +985,17 @@
980985
);
981986
inputPaths = (
982987
"${PODS_ROOT}/Target Support Files/Pods-AppBox/Pods-AppBox-resources.sh",
988+
"${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack/CocoaLumberjackPrivacy.bundle",
989+
"${PODS_CONFIGURATION_BUILD_DIR}/ObjectiveDropboxOfficial/ObjectiveDropboxPrivacyInfo.bundle",
983990
"${PODS_ROOT}/SAMKeychain/Support/SAMKeychain.bundle",
991+
"${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive/SSZipArchive.bundle",
984992
);
985993
name = "[CP] Copy Pods Resources";
986994
outputPaths = (
995+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CocoaLumberjackPrivacy.bundle",
996+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ObjectiveDropboxPrivacyInfo.bundle",
987997
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SAMKeychain.bundle",
998+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SSZipArchive.bundle",
988999
);
9891000
runOnlyForDeploymentPostprocessing = 0;
9901001
shellPath = /bin/sh;
@@ -1031,6 +1042,7 @@
10311042
DB358B6C216FB1AC0080CAC0 /* Project+CoreDataProperties.m in Sources */,
10321043
DB358B6B216FB1AC0080CAC0 /* UploadRecord+CoreDataProperties.m in Sources */,
10331044
DB358B68216FB1AC0080CAC0 /* ProvisionedDevice+CoreDataClass.m in Sources */,
1045+
DB5C5A4F2D00BA9C000C4A20 /* NSException+Description.m in Sources */,
10341046
DB8CE5F81FF77199003FEB65 /* DisabledView.m in Sources */,
10351047
DB358B6A216FB1AC0080CAC0 /* ProvisionedDevice+CoreDataProperties.m in Sources */,
10361048
E1902B531E16617B00C3E0F6 /* NetworkHandler.m in Sources */,
@@ -1225,10 +1237,11 @@
12251237
"\"${PODS_ROOT}/Headers/Public/Crashlytics\"",
12261238
);
12271239
INFOPLIST_FILE = AppBox/Info.plist;
1240+
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
12281241
LD_DYLIB_INSTALL_NAME = "";
12291242
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
1230-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1231-
MARKETING_VERSION = 3.3.0;
1243+
MACOSX_DEPLOYMENT_TARGET = 12.4;
1244+
MARKETING_VERSION = 3.4.0;
12321245
PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
12331246
PRODUCT_NAME = "$(TARGET_NAME)";
12341247
USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
@@ -1272,10 +1285,11 @@
12721285
"\"${PODS_ROOT}/Headers/Public/Crashlytics\"",
12731286
);
12741287
INFOPLIST_FILE = AppBox/Info.plist;
1288+
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
12751289
LD_DYLIB_INSTALL_NAME = "";
12761290
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
1277-
MACOSX_DEPLOYMENT_TARGET = 10.15;
1278-
MARKETING_VERSION = 3.3.0;
1291+
MACOSX_DEPLOYMENT_TARGET = 12.4;
1292+
MARKETING_VERSION = 3.4.0;
12791293
PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
12801294
PRODUCT_NAME = "$(TARGET_NAME)";
12811295
USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";

‎AppBox.xcodeproj/xcshareddata/xcschemes/AppBox.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1410"
3+
LastUpgradeVersion = "1610"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎AppBox/AppBox.xcdatamodeld/AppBox4.xcdatamodel/contents

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="18154" systemVersion="20G95" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
2+
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23507" systemVersion="24B91" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
33
<entity name="AppBoxService" representedClassName="AppBoxService" syncable="YES">
44
<attribute name="accountAccessKey" optional="YES" attributeType="String" syncable="YES"/>
55
<attribute name="accountEmail" optional="YES" attributeType="String" syncable="YES"/>
@@ -9,15 +9,15 @@
99
<attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
1010
<relationship name="uploadRecords" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="UploadRecord" inverseName="service" inverseEntity="UploadRecord" syncable="YES"/>
1111
</entity>
12-
<entity name="Project" representedClassName="Project" syncable="YES">
12+
<entity name="Project" representedClassName="ABProject" syncable="YES">
1313
<attribute name="bundleIdentifier" optional="YES" attributeType="String" syncable="YES"/>
1414
<attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
1515
<relationship name="uploadRecords" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="UploadRecord" inverseName="project" inverseEntity="UploadRecord" syncable="YES"/>
1616
</entity>
17-
<entity name="ProvisionedDevice" representedClassName="ProvisionedDevice" syncable="YES">
17+
<entity name="ProvisionedDevice" representedClassName="ABProvisionedDevice" syncable="YES">
1818
<attribute name="deviceId" optional="YES" attributeType="String" syncable="YES"/>
1919
</entity>
20-
<entity name="ProvisioningProfile" representedClassName="ProvisioningProfile" syncable="YES">
20+
<entity name="ProvisioningProfile" representedClassName="ABProvisioningProfile" syncable="YES">
2121
<attribute name="buildType" optional="YES" attributeType="String" syncable="YES"/>
2222
<attribute name="createDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
2323
<attribute name="expirationDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
@@ -27,7 +27,7 @@
2727
<relationship name="provisionedDevices" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="ProvisionedDevice" syncable="YES"/>
2828
<relationship name="uploadRecord" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="UploadRecord" inverseName="provisioningProfile" inverseEntity="UploadRecord" syncable="YES"/>
2929
</entity>
30-
<entity name="UploadRecord" representedClassName="UploadRecord" syncable="YES">
30+
<entity name="UploadRecord" representedClassName="ABUploadRecord" syncable="YES">
3131
<attribute name="build" optional="YES" attributeType="String" syncable="YES"/>
3232
<attribute name="buildType" optional="YES" attributeType="String" syncable="YES"/>
3333
<attribute name="datetime" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
@@ -50,11 +50,4 @@
5050
<relationship name="provisioningProfile" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="ProvisioningProfile" inverseName="uploadRecord" inverseEntity="ProvisioningProfile" syncable="YES"/>
5151
<relationship name="service" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="AppBoxService" inverseName="uploadRecords" inverseEntity="AppBoxService" syncable="YES"/>
5252
</entity>
53-
<elements>
54-
<element name="Project" positionX="-11914.72265625" positionY="-2547.59375" width="128" height="88"/>
55-
<element name="ProvisionedDevice" positionX="-12258" positionY="-2493" width="128" height="58"/>
56-
<element name="ProvisioningProfile" positionX="-12260" positionY="-2736" width="128" height="163"/>
57-
<element name="UploadRecord" positionX="-12081.50537109375" positionY="-2809.529998779297" width="128" height="358"/>
58-
<element name="AppBoxService" positionX="-12078.29156494141" positionY="-3003.159118652344" width="128" height="148"/>
59-
</elements>
6053
</model>

‎AppBox/AppBoxPrefixHeader.pch

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111

1212

1313
#import <SSZipArchive/SSZipArchive.h>
14-
#import <AppCenter/AppCenter.h>
15-
#import <AppCenterCrashes/AppCenterCrashes.h>
16-
#import <AppCenterAnalytics/AppCenterAnalytics.h>
1714
#import <SAMKeychain/SAMKeychain.h>
1815
#import <AFNetworking/AFNetworking.h>
1916
#import <ObjectiveDropboxOfficial/ObjectiveDropboxOfficial.h>
@@ -46,6 +43,7 @@
4643
#import "NSURL+URL.h"
4744
#import "NSDate+Date.h"
4845
#import "NSString+String.h"
46+
#import "NSException+Description.h"
4947

5048
#import "Project+CoreDataProperties.h"
5149
#import "UploadRecord+CoreDataProperties.h"

‎AppBox/AppDelegate.m

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -28,41 +28,6 @@ - (void)awakeFromNib{
2828
fileLogger.logFileManager.maximumNumberOfLogFiles = 7;
2929
[DDLog addLogger:fileLogger withLevel:logLevel];
3030
DDLogInfo(@"AppBox Started.");
31-
32-
//Init AppCenter
33-
[[NSUserDefaults standardUserDefaults] registerDefaults: @{ @"NSApplicationCrashOnExceptions": @YES }];
34-
// 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
35-
[MSACCrashes setUserConfirmationHandler:^BOOL(NSArray<MSACErrorReport *> * _Nonnull errorReports)
36-
{
37-
NSAlert *alert = [[NSAlert alloc] init];
38-
alert.messageText = @"Sorry about that!";
39-
alert.informativeText = @"Do you want to send a crash report so we can fix the issue?";
40-
41-
[alert addButtonWithTitle:@"Always send"];
42-
[alert addButtonWithTitle:@"Send"];
43-
[alert addButtonWithTitle:@"Don't send"];
44-
alert.alertStyle = NSAlertStyleWarning;
45-
46-
switch ([alert runModal])
47-
{
48-
case NSAlertFirstButtonReturn:
49-
[MSACCrashes notifyWithUserConfirmation:MSACUserConfirmationAlways];
50-
break;
51-
case NSAlertSecondButtonReturn:
52-
[MSACCrashes notifyWithUserConfirmation:MSACUserConfirmationSend];
53-
break;
54-
case NSAlertThirdButtonReturn:
55-
[MSACCrashes notifyWithUserConfirmation:MSACUserConfirmationDontSend];
56-
break;
57-
default:
58-
break;
59-
60-
}
61-
return true; // Return true if the SDK should await user confirmation, otherwise return false.
62-
}];
63-
64-
NSString *appCenter = [[[NSBundle mainBundle] infoDictionary] valueForKey:@"AppCenter"];
65-
[MSACAppCenter start:appCenter withServices: @[[MSACAnalytics class], [MSACCrashes class]]];
6631
}
6732

6833
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
@@ -105,6 +70,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
10570
- (void)applicationWillTerminate:(NSNotification *)aNotification {
10671
DDLogInfo(@"AppBox Terminated.");
10772
[self saveCoreDataChanges];
73+
[self deleteTemporaryFiles];
10874
}
10975

11076
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender{
@@ -360,4 +326,12 @@ - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sende
360326
return NSTerminateNow;
361327
}
362328

329+
// MARK: - Other helpers
330+
- (void)deleteTemporaryFiles {
331+
NSArray* tmpDirectory = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:NSTemporaryDirectory() error:NULL];
332+
for (NSString *file in tmpDirectory) {
333+
[[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@%@", NSTemporaryDirectory(), file] error:NULL];
334+
}
335+
}
336+
363337
@end

‎AppBox/Common/Common.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ + (NSModalResponse)showAlertWithTitle:(NSString *)title andMessage:(NSString *)m
3838
NSAlert *alert = [[NSAlert alloc] init];
3939
[alert setMessageText: title == nil ? @"Error" : title];
4040
[alert setInformativeText:message == nil ? @"" : message];
41-
[alert setAlertStyle:NSWarningAlertStyle];
41+
[alert setAlertStyle:NSAlertStyleWarning];
4242
return [alert runModal];
4343
}
4444

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

5555
@end

0 commit comments

Comments
 (0)