Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

develop -> master #248

Merged
merged 17 commits into from
Jul 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 4 additions & 32 deletions AppBox.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
E12E6D0A1D8FC77D0054814D /* DashboardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E12E6D081D8FC77D0054814D /* DashboardViewController.m */; };
E13161F21E9777DF00586052 /* CIProjectBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = E13161F11E9777DF00586052 /* CIProjectBuilder.m */; };
E13946121DF2AFCF00B3FAD0 /* XCProject.m in Sources */ = {isa = PBXBuildFile; fileRef = E13946111DF2AFCF00B3FAD0 /* XCProject.m */; };
E143637B1DF59AFD00FB10CA /* LogViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E143637A1DF59AFD00FB10CA /* LogViewController.m */; };
E14F33341E1A64CA00C3DD34 /* NSApplication+MenuHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = E14F33331E1A64CA00C3DD34 /* NSApplication+MenuHandler.m */; };
E15C266A1D7FD5CE004243B9 /* ShowLinkViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E15C26691D7FD5CE004243B9 /* ShowLinkViewController.m */; };
E16018F01DEC0BC200E3A377 /* DropboxViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E16018EF1DEC0BC200E3A377 /* DropboxViewController.m */; };
Expand All @@ -68,7 +67,6 @@
E18186DC1E8A47C10002509F /* AccountPreferencesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E18186DB1E8A47C10002509F /* AccountPreferencesViewController.m */; };
E18186DF1E8A47CD0002509F /* EmailPreferencesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E18186DE1E8A47CD0002509F /* EmailPreferencesViewController.m */; };
E18186E21E8A47D60002509F /* HelpPreferencesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E18186E11E8A47D60002509F /* HelpPreferencesViewController.m */; };
E1853392200E084500E88529 /* ABLog.m in Sources */ = {isa = PBXBuildFile; fileRef = E1853391200E084500E88529 /* ABLog.m */; };
E1902B481E16423200C3E0F6 /* ProjectAdvancedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E1902B471E16423200C3E0F6 /* ProjectAdvancedViewController.m */; };
E1902B531E16617B00C3E0F6 /* NetworkHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = E1902B4E1E16617B00C3E0F6 /* NetworkHandler.m */; };
E1902B541E16617B00C3E0F6 /* UserData.m in Sources */ = {isa = PBXBuildFile; fileRef = E1902B521E16617B00C3E0F6 /* UserData.m */; };
Expand Down Expand Up @@ -222,8 +220,6 @@
E13946101DF2AFCF00B3FAD0 /* XCProject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XCProject.h; sourceTree = "<group>"; };
E13946111DF2AFCF00B3FAD0 /* XCProject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XCProject.m; sourceTree = "<group>"; };
E13946131DF2AFFF00B3FAD0 /* AppBoxPrefixHeader.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppBoxPrefixHeader.pch; sourceTree = "<group>"; };
E14363791DF59AFD00FB10CA /* LogViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogViewController.h; sourceTree = "<group>"; };
E143637A1DF59AFD00FB10CA /* LogViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogViewController.m; sourceTree = "<group>"; };
E14F33321E1A64CA00C3DD34 /* NSApplication+MenuHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSApplication+MenuHandler.h"; sourceTree = "<group>"; };
E14F33331E1A64CA00C3DD34 /* NSApplication+MenuHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSApplication+MenuHandler.m"; sourceTree = "<group>"; };
E15C26681D7FD5CE004243B9 /* ShowLinkViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShowLinkViewController.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -263,8 +259,6 @@
E18186DE1E8A47CD0002509F /* EmailPreferencesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EmailPreferencesViewController.m; sourceTree = "<group>"; };
E18186E01E8A47D60002509F /* HelpPreferencesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelpPreferencesViewController.h; sourceTree = "<group>"; };
E18186E11E8A47D60002509F /* HelpPreferencesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelpPreferencesViewController.m; sourceTree = "<group>"; };
E1853390200E084500E88529 /* ABLog.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ABLog.h; sourceTree = "<group>"; };
E1853391200E084500E88529 /* ABLog.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ABLog.m; sourceTree = "<group>"; };
E1902B461E16423200C3E0F6 /* ProjectAdvancedViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectAdvancedViewController.h; sourceTree = "<group>"; };
E1902B471E16423200C3E0F6 /* ProjectAdvancedViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProjectAdvancedViewController.m; sourceTree = "<group>"; };
E1902B4D1E16617B00C3E0F6 /* NetworkHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkHandler.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -511,15 +505,6 @@
path = ProjectModel;
sourceTree = "<group>";
};
E14363781DF59AC700FB10CA /* LogViewController */ = {
isa = PBXGroup;
children = (
E14363791DF59AFD00FB10CA /* LogViewController.h */,
E143637A1DF59AFD00FB10CA /* LogViewController.m */,
);
path = LogViewController;
sourceTree = "<group>";
};
E14F332E1E1A3D1300C3DD34 /* MenuHandler */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -601,7 +586,6 @@
E16437F01D743B3600CE8B7E /* HomeViewController */,
E15C26671D7FD5A9004243B9 /* ShowLinkViewController */,
E1AA0F411E2F325F00BA81A1 /* QRCodeViewController */,
E14363781DF59AC700FB10CA /* LogViewController */,
E12E6D061D8FC6E20054814D /* DashboardViewController */,
E1902B451E16420C00C3E0F6 /* ProjectAdvancedViewController */,
E16D72E61E8935060031FB7C /* PreferencesViewController */,
Expand Down Expand Up @@ -741,15 +725,6 @@
path = HelpPreferencesViewController;
sourceTree = "<group>";
};
E185338F200E082800E88529 /* LogManager */ = {
isa = PBXGroup;
children = (
E1853390200E084500E88529 /* ABLog.h */,
E1853391200E084500E88529 /* ABLog.m */,
);
path = LogManager;
sourceTree = "<group>";
};
E1902B451E16420C00C3E0F6 /* ProjectAdvancedViewController */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -873,7 +848,6 @@
E1902B4C1E16617B00C3E0F6 /* NetworkHandler */,
E19473FC205FD3B700CF12F9 /* UISubClasses */,
E19473F0205F9F2900CF12F9 /* ServiceIntegrations */,
E185338F200E082800E88529 /* LogManager */,
E1902B501E16617B00C3E0F6 /* UserManager */,
DB2629781F95ED8900C4C647 /* Extensions */,
E1902B4B1E16617B00C3E0F6 /* MailHandler */,
Expand Down Expand Up @@ -1048,7 +1022,6 @@
E16437DD1D743A4E00CE8B7E /* AppBox.xcdatamodeld in Sources */,
E16437D71D743A4E00CE8B7E /* main.m in Sources */,
DB831BCB1FF6B5780065B646 /* ABHudViewController.m in Sources */,
E1853392200E084500E88529 /* ABLog.m in Sources */,
E1902B481E16423200C3E0F6 /* ProjectAdvancedViewController.m in Sources */,
DBF290D71FA64A590046D5CE /* ProvisioningDetailsViewController.m in Sources */,
DB358B66216FB1AC0080CAC0 /* UploadRecord+CoreDataClass.m in Sources */,
Expand Down Expand Up @@ -1098,7 +1071,6 @@
E18186DF1E8A47CD0002509F /* EmailPreferencesViewController.m in Sources */,
E13161F21E9777DF00586052 /* CIProjectBuilder.m in Sources */,
4410D19C26FF851D0046E5F9 /* CoreDataMigration3to4.xcmappingmodel in Sources */,
E143637B1DF59AFD00FB10CA /* LogViewController.m in Sources */,
DB2629851F961F4700C4C647 /* DBErrorHandler.m in Sources */,
E18186E21E8A47D60002509F /* HelpPreferencesViewController.m in Sources */,
E18186CE1E8A3BC00002509F /* PreferencesTabViewController.m in Sources */,
Expand Down Expand Up @@ -1252,8 +1224,8 @@
INFOPLIST_FILE = AppBox/Info.plist;
LD_DYLIB_INSTALL_NAME = "";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
MARKETING_VERSION = 3.1.0;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 3.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
Expand Down Expand Up @@ -1298,8 +1270,8 @@
INFOPLIST_FILE = AppBox/Info.plist;
LD_DYLIB_INSTALL_NAME = "";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
MARKETING_VERSION = 3.1.0;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 3.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
Expand Down
2 changes: 2 additions & 0 deletions AppBox/AppBox.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.files.downloads.read-write</key>
<true/>
<key>com.apple.security.files.user-selected.read-write</key>
<true/>
<key>com.apple.security.network.client</key>
Expand Down
6 changes: 4 additions & 2 deletions AppBox/AppBoxPrefixHeader.pch
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
#define AppBoxPrefixHeader_pch


#import <ZipArchive.h>
#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>
#import <ABPrivate/ABPrivate.h>
#import <CocoaLumberjack/CocoaLumberjack.h>

#import "ABLog.h"
#import "MBProgressHUD+ProgressHud.h"

#import "UserData.h"
Expand Down Expand Up @@ -52,4 +52,6 @@
#import "AppBoxService+CoreDataProperties.h"
#import "ProvisionedDevice+CoreDataProperties.h"
#import "ProvisioningProfile+CoreDataProperties.h"

static const DDLogLevel ddLogLevel = DDLogLevelAll;
#endif /* AppBoxPrefixHeader_pch */
23 changes: 13 additions & 10 deletions AppBox/AppDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,26 @@

@interface AppDelegate : NSObject <NSApplicationDelegate, NSUserNotificationCenterDelegate>

@property (nonatomic, strong) NSMutableString *sessionLog;
@property (readonly, strong, nonatomic) NSPersistentStoreCoordinator *persistentStoreCoordinator;
@property (readonly, strong, nonatomic) NSManagedObjectModel *managedObjectModel;
@property (readonly, strong, nonatomic) NSManagedObjectContext *managedObjectContext;

+(AppDelegate *)appDelegate;
-(void)addSessionLog:(NSString *)sessionLog;
-(void)saveCoreDataChanges;
-(void)openFileWithPath:(NSString *)filePath;

//stored properties
@property (nonatomic) BOOL processing;
@property (nonatomic) BOOL isReadyToBuild;
@property (nonatomic) BOOL isInternetConnected;

//menu iboutlet
@property (nonatomic, weak) IBOutlet NSMenuItem *dropboxLogoutButton;
@property (nonatomic, weak) IBOutlet NSMenuItem *dropboxSpaceButton;
@property (nonatomic, weak) IBOutlet NSMenuItem *dropboxAccountButton;
@property (nonatomic, weak) IBOutlet NSMenuItem *dropboxNameButton;

//coredata
@property (readonly, strong, nonatomic) NSPersistentStoreCoordinator *persistentStoreCoordinator;
@property (readonly, strong, nonatomic) NSManagedObjectModel *managedObjectModel;
@property (readonly, strong, nonatomic) NSManagedObjectContext *managedObjectContext;
-(void)saveCoreDataChanges;

+(AppDelegate *)appDelegate;
-(void)openLatestLogFile;
-(void)openFileWithPath:(NSString *)filePath;

@end

Loading