Skip to content

Commit

Permalink
Merge pull request #164 from vineetchoudhary/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@vineetchoudhary
vineetchoudhary authored Jun 25, 2019
2 parents 1fe24a9 + f4b77e3 commit d2ab37e
Show file tree
Hide file tree
Showing 2,219 changed files with 103,149 additions and 50,317 deletions.
47 changes: 40 additions & 7 deletions AppBox.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
443198DF22C1E3DE00967EE3 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 443198DE22C1E3DE00967EE3 /* GoogleService-Info.plist */; };
84A31BD8650851B3675A1797 /* libPods-AppBox.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADD2CC287A9B5D93F4C72A0D /* libPods-AppBox.a */; };
DB1A06532160CE27008D33FD /* TeamsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DB1A06512160CE27008D33FD /* TeamsViewController.m */; };
DB1A06542160CE27008D33FD /* TeamsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DB1A06522160CE27008D33FD /* TeamsViewController.xib */; };
Expand Down Expand Up @@ -222,6 +223,7 @@

/* Begin PBXFileReference section */
179DF69BDB018D0F7E295C95 /* Pods-AppBox.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AppBox.release.xcconfig"; path = "Pods/Target Support Files/Pods-AppBox/Pods-AppBox.release.xcconfig"; sourceTree = "<group>"; };
443198DE22C1E3DE00967EE3 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
ADD2CC287A9B5D93F4C72A0D /* libPods-AppBox.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-AppBox.a"; sourceTree = BUILT_PRODUCTS_DIR; };
BA6359ECA7EF9D4D3F8BE63F /* Pods-AppBox.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AppBox.debug.xcconfig"; path = "Pods/Target Support Files/Pods-AppBox/Pods-AppBox.debug.xcconfig"; sourceTree = "<group>"; };
DB1A06502160CE27008D33FD /* TeamsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TeamsViewController.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -872,6 +874,7 @@
E16437D51D743A4E00CE8B7E /* Supporting Files */ = {
isa = PBXGroup;
children = (
443198DE22C1E3DE00967EE3 /* GoogleService-Info.plist */,
E16437D61D743A4E00CE8B7E /* main.m */,
E16437E31D743A4E00CE8B7E /* Info.plist */,
E13946131DF2AFFF00B3FAD0 /* AppBoxPrefixHeader.pch */,
Expand Down Expand Up @@ -1329,8 +1332,8 @@
isa = PBXNativeTarget;
buildConfigurationList = E16437E61D743A4E00CE8B7E /* Build configuration list for PBXNativeTarget "AppBox" */;
buildPhases = (
E19973332091D2640035CCE9 /* Embed Frameworks */,
C3566842BD53E8411EB6A412 /* [CP] Check Pods Manifest.lock */,
E19973332091D2640035CCE9 /* Embed Frameworks */,
E16437CB1D743A4E00CE8B7E /* Sources */,
E16437CC1D743A4E00CE8B7E /* Frameworks */,
E16437CD1D743A4E00CE8B7E /* Resources */,
Expand Down Expand Up @@ -1377,6 +1380,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -1406,6 +1410,7 @@
E1D12EEA1EC2F5230065E59A /* EmailPreferencesViewController.xib in Resources */,
E14237C22010A6F600F83501 /* CreateIPAScript.sh in Resources */,
DBCD1563200BCD1C00C003E6 /* PreferencesViewController.xib in Resources */,
443198DF22C1E3DE00967EE3 /* GoogleService-Info.plist in Resources */,
E10B82221DF0498800BBE0CD /* TeamIDScript.sh in Resources */,
E16D72E51E8912790031FB7C /* XCodePath.sh in Resources */,
DB45B45C1F6EC5F10041EB42 /* SwitchXcode.sh in Resources */,
Expand Down Expand Up @@ -1433,18 +1438,16 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-AppBox/Pods-AppBox-resources.sh",
"${PODS_ROOT}/Google-Analytics-for-OS-X/GoogleAnalyticsTracker/AnalyticsWindow.xib",
"${PODS_ROOT}/Target Support Files/Pods-AppBox/Pods-AppBox-resources.sh",
"${PODS_ROOT}/SAMKeychain/Support/SAMKeychain.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AnalyticsWindow.nib",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SAMKeychain.bundle",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AppBox/Pods-AppBox-resources.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AppBox/Pods-AppBox-resources.sh\"\n";
showEnvVarsInLog = 0;
};
C3566842BD53E8411EB6A412 /* [CP] Check Pods Manifest.lock */ = {
Expand Down Expand Up @@ -1675,10 +1678,25 @@
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = AppBox/AppBoxPrefixHeader.pch;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"\"${PODS_ROOT}/Headers/Public\"",
"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
"\"${PODS_ROOT}/Headers/Public/CMDQueryStringSerialization\"",
"\"${PODS_ROOT}/Headers/Public/Google-Analytics-for-OS-X\"",
"\"${PODS_ROOT}/Headers/Public/ISO8601\"",
"\"${PODS_ROOT}/Headers/Public/ObjectiveDropboxOfficial\"",
"\"${PODS_ROOT}/Headers/Public/SAMKeychain\"",
"\"${PODS_ROOT}/Headers/Public/SSZipArchive\"",
"\"${PODS_ROOT}/Headers/Public/STPrivilegedTask\"",
"\"${PODS_ROOT}/Headers/Public/ZXingObjC\"",
"\"${PODS_ROOT}/Headers/Public/Fabric\"",
"\"${PODS_ROOT}/Headers/Public/Crashlytics\"",
);
INFOPLIST_FILE = AppBox/Info.plist;
LD_DYLIB_INSTALL_NAME = "";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
Expand All @@ -1703,10 +1721,25 @@
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = AppBox/AppBoxPrefixHeader.pch;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"\"${PODS_ROOT}/Headers/Public\"",
"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
"\"${PODS_ROOT}/Headers/Public/CMDQueryStringSerialization\"",
"\"${PODS_ROOT}/Headers/Public/Google-Analytics-for-OS-X\"",
"\"${PODS_ROOT}/Headers/Public/ISO8601\"",
"\"${PODS_ROOT}/Headers/Public/ObjectiveDropboxOfficial\"",
"\"${PODS_ROOT}/Headers/Public/SAMKeychain\"",
"\"${PODS_ROOT}/Headers/Public/SSZipArchive\"",
"\"${PODS_ROOT}/Headers/Public/STPrivilegedTask\"",
"\"${PODS_ROOT}/Headers/Public/ZXingObjC\"",
"\"${PODS_ROOT}/Headers/Public/Fabric\"",
"\"${PODS_ROOT}/Headers/Public/Crashlytics\"",
);
INFOPLIST_FILE = AppBox/Info.plist;
LD_DYLIB_INSTALL_NAME = "";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
Expand Down
1 change: 1 addition & 0 deletions AppBox/AppBoxPrefixHeader.pch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#import <Fabric/Fabric.h>
#import <SAMKeychain/SAMKeychain.h>
#import <Crashlytics/Crashlytics.h>
#import <FirebaseCore/FirebaseCore.h>
#import <AFNetworking/AFNetworking.h>
#import <STPrivilegedTask/STPrivilegedTask.h>
#import <ObjectiveDropboxOfficial/ObjectiveDropboxOfficial.h>
Expand Down
3 changes: 2 additions & 1 deletion AppBox/AppDelegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
[DefaultSettings setFirstTimeSettings];
[DefaultSettings setEveryStartupSettings];

//Init Crashlytics
//Init Crashlytics and Firebase
[FIRApp configure];
[[NSUserDefaults standardUserDefaults] registerDefaults:@{ @"NSApplicationCrashOnExceptions": @YES }];
[Fabric with:@[[Crashlytics class], [Answers class]]];

Expand Down
1 change: 1 addition & 0 deletions AppBox/Common/Constants.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ static NSString *const FILE_NAME_SHARE_URL = @".appbox_share_value.json";
#define abTeamIdLength 10
#define abBytesToMB (1024 * 1024)
#define abDropboxOutOfSpaceWarningSize 150
#define abOnErrorMaxRetryCount 3
#define abEndOfSessionLog @"abEndOfSessionLog"


Expand Down
1 change: 0 additions & 1 deletion AppBox/Common/EventTracker/EventTracker.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
//

#import <Foundation/Foundation.h>
#import <GoogleAnalyticsTracker/GoogleAnalyticsTracker.h>

typedef enum : NSUInteger {
LogEventTypeCopyToClipboard,
Expand Down
14 changes: 0 additions & 14 deletions AppBox/Common/EventTracker/EventTracker.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,12 @@

@implementation EventTracker

+(void)ga{
static MPAnalyticsConfiguration *configuration = nil;
if (configuration == nil) {
configuration = [[MPAnalyticsConfiguration alloc] initWithAnalyticsIdentifier: [DBManager gaKey]];
[MPGoogleAnalyticsTracker activateConfiguration:configuration];
}
}

+(void)logScreen:(NSString *)name{
[[self class] ga];
[MPGoogleAnalyticsTracker trackScreen:name];
[Answers logContentViewWithName:name contentType:@"screen" contentId:nil customAttributes:nil];
}

+(void)logEventWithName:(NSString *)eventName customAttributes:(NSDictionary *)attributes action:(NSString *)action label:(NSString *)label value:(NSNumber *)value {
[[self class] ga];
[Answers logCustomEventWithName:eventName customAttributes:attributes];
if (action && label && value) {
[MPGoogleAnalyticsTracker trackEventOfCategory:eventName action:action label:label value:value];
}
}

+(void)logEventWithType:(LogEventTypes)eventType{
Expand Down
9 changes: 5 additions & 4 deletions AppBox/Common/UploadManager/UploadManager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,11 @@ typedef void(^CompletionBlock)();
@property(nonatomic, strong) CompletionBlock completionBlock;


+(void)setupDBClientsManager;
-(void)uploadIPAFile:(NSURL *)ipaFileURL;
-(void)uploadIPAFileWithoutUnzip:(NSURL *)ipaURL;
+ (void)setupDBClientsManager;
- (instancetype)init;
- (void)uploadIPAFile:(NSURL *)ipaFileURL;
- (void)uploadIPAFileWithoutUnzip:(NSURL *)ipaURL;

-(void)deleteBuildFromDropbox;
- (void)deleteBuildFromDropbox;

@end
Loading

0 comments on commit d2ab37e

Please sign in to comment.