Skip to content

Commit d2ab37e

Browse files
vineetchoudharyvineetchoudhary
authored
Merge pull request #164 from vineetchoudhary/develop
Develop
2 parents 1fe24a9 + f4b77e3 commit d2ab37e

File tree

2,219 files changed

+103149
-50317
lines changed

Some content is hidden

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

2,219 files changed

+103149
-50317
lines changed

‎AppBox.xcodeproj/project.pbxproj

+40-7
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

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

223224
/* Begin PBXFileReference section */
224225
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>"; };
226+
443198DE22C1E3DE00967EE3 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
225227
ADD2CC287A9B5D93F4C72A0D /* libPods-AppBox.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-AppBox.a"; sourceTree = BUILT_PRODUCTS_DIR; };
226228
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>"; };
227229
DB1A06502160CE27008D33FD /* TeamsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TeamsViewController.h; sourceTree = "<group>"; };
@@ -872,6 +874,7 @@
872874
E16437D51D743A4E00CE8B7E /* Supporting Files */ = {
873875
isa = PBXGroup;
874876
children = (
877+
443198DE22C1E3DE00967EE3 /* GoogleService-Info.plist */,
875878
E16437D61D743A4E00CE8B7E /* main.m */,
876879
E16437E31D743A4E00CE8B7E /* Info.plist */,
877880
E13946131DF2AFFF00B3FAD0 /* AppBoxPrefixHeader.pch */,
@@ -1329,8 +1332,8 @@
13291332
isa = PBXNativeTarget;
13301333
buildConfigurationList = E16437E61D743A4E00CE8B7E /* Build configuration list for PBXNativeTarget "AppBox" */;
13311334
buildPhases = (
1332-
E19973332091D2640035CCE9 /* Embed Frameworks */,
13331335
C3566842BD53E8411EB6A412 /* [CP] Check Pods Manifest.lock */,
1336+
E19973332091D2640035CCE9 /* Embed Frameworks */,
13341337
E16437CB1D743A4E00CE8B7E /* Sources */,
13351338
E16437CC1D743A4E00CE8B7E /* Frameworks */,
13361339
E16437CD1D743A4E00CE8B7E /* Resources */,
@@ -1377,6 +1380,7 @@
13771380
developmentRegion = English;
13781381
hasScannedForEncodings = 0;
13791382
knownRegions = (
1383+
English,
13801384
en,
13811385
Base,
13821386
);
@@ -1406,6 +1410,7 @@
14061410
E1D12EEA1EC2F5230065E59A /* EmailPreferencesViewController.xib in Resources */,
14071411
E14237C22010A6F600F83501 /* CreateIPAScript.sh in Resources */,
14081412
DBCD1563200BCD1C00C003E6 /* PreferencesViewController.xib in Resources */,
1413+
443198DF22C1E3DE00967EE3 /* GoogleService-Info.plist in Resources */,
14091414
E10B82221DF0498800BBE0CD /* TeamIDScript.sh in Resources */,
14101415
E16D72E51E8912790031FB7C /* XCodePath.sh in Resources */,
14111416
DB45B45C1F6EC5F10041EB42 /* SwitchXcode.sh in Resources */,
@@ -1433,18 +1438,16 @@
14331438
files = (
14341439
);
14351440
inputPaths = (
1436-
"${SRCROOT}/Pods/Target Support Files/Pods-AppBox/Pods-AppBox-resources.sh",
1437-
"${PODS_ROOT}/Google-Analytics-for-OS-X/GoogleAnalyticsTracker/AnalyticsWindow.xib",
1441+
"${PODS_ROOT}/Target Support Files/Pods-AppBox/Pods-AppBox-resources.sh",
14381442
"${PODS_ROOT}/SAMKeychain/Support/SAMKeychain.bundle",
14391443
);
14401444
name = "[CP] Copy Pods Resources";
14411445
outputPaths = (
1442-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AnalyticsWindow.nib",
14431446
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SAMKeychain.bundle",
14441447
);
14451448
runOnlyForDeploymentPostprocessing = 0;
14461449
shellPath = /bin/sh;
1447-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AppBox/Pods-AppBox-resources.sh\"\n";
1450+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AppBox/Pods-AppBox-resources.sh\"\n";
14481451
showEnvVarsInLog = 0;
14491452
};
14501453
C3566842BD53E8411EB6A412 /* [CP] Check Pods Manifest.lock */ = {
@@ -1675,10 +1678,25 @@
16751678
);
16761679
GCC_PRECOMPILE_PREFIX_HEADER = YES;
16771680
GCC_PREFIX_HEADER = AppBox/AppBoxPrefixHeader.pch;
1681+
HEADER_SEARCH_PATHS = (
1682+
"$(inherited)",
1683+
"\"${PODS_ROOT}/Headers/Public\"",
1684+
"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
1685+
"\"${PODS_ROOT}/Headers/Public/CMDQueryStringSerialization\"",
1686+
"\"${PODS_ROOT}/Headers/Public/Google-Analytics-for-OS-X\"",
1687+
"\"${PODS_ROOT}/Headers/Public/ISO8601\"",
1688+
"\"${PODS_ROOT}/Headers/Public/ObjectiveDropboxOfficial\"",
1689+
"\"${PODS_ROOT}/Headers/Public/SAMKeychain\"",
1690+
"\"${PODS_ROOT}/Headers/Public/SSZipArchive\"",
1691+
"\"${PODS_ROOT}/Headers/Public/STPrivilegedTask\"",
1692+
"\"${PODS_ROOT}/Headers/Public/ZXingObjC\"",
1693+
"\"${PODS_ROOT}/Headers/Public/Fabric\"",
1694+
"\"${PODS_ROOT}/Headers/Public/Crashlytics\"",
1695+
);
16781696
INFOPLIST_FILE = AppBox/Info.plist;
16791697
LD_DYLIB_INSTALL_NAME = "";
16801698
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
1681-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1699+
MACOSX_DEPLOYMENT_TARGET = 10.11;
16821700
PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
16831701
PRODUCT_NAME = "$(TARGET_NAME)";
16841702
USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";
@@ -1703,10 +1721,25 @@
17031721
);
17041722
GCC_PRECOMPILE_PREFIX_HEADER = YES;
17051723
GCC_PREFIX_HEADER = AppBox/AppBoxPrefixHeader.pch;
1724+
HEADER_SEARCH_PATHS = (
1725+
"$(inherited)",
1726+
"\"${PODS_ROOT}/Headers/Public\"",
1727+
"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
1728+
"\"${PODS_ROOT}/Headers/Public/CMDQueryStringSerialization\"",
1729+
"\"${PODS_ROOT}/Headers/Public/Google-Analytics-for-OS-X\"",
1730+
"\"${PODS_ROOT}/Headers/Public/ISO8601\"",
1731+
"\"${PODS_ROOT}/Headers/Public/ObjectiveDropboxOfficial\"",
1732+
"\"${PODS_ROOT}/Headers/Public/SAMKeychain\"",
1733+
"\"${PODS_ROOT}/Headers/Public/SSZipArchive\"",
1734+
"\"${PODS_ROOT}/Headers/Public/STPrivilegedTask\"",
1735+
"\"${PODS_ROOT}/Headers/Public/ZXingObjC\"",
1736+
"\"${PODS_ROOT}/Headers/Public/Fabric\"",
1737+
"\"${PODS_ROOT}/Headers/Public/Crashlytics\"",
1738+
);
17061739
INFOPLIST_FILE = AppBox/Info.plist;
17071740
LD_DYLIB_INSTALL_NAME = "";
17081741
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
1709-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1742+
MACOSX_DEPLOYMENT_TARGET = 10.11;
17101743
PRODUCT_BUNDLE_IDENTIFIER = com.developerinsider.AppBox;
17111744
PRODUCT_NAME = "$(TARGET_NAME)";
17121745
USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)";

‎AppBox/AppBoxPrefixHeader.pch

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#import <Fabric/Fabric.h>
1515
#import <SAMKeychain/SAMKeychain.h>
1616
#import <Crashlytics/Crashlytics.h>
17+
#import <FirebaseCore/FirebaseCore.h>
1718
#import <AFNetworking/AFNetworking.h>
1819
#import <STPrivilegedTask/STPrivilegedTask.h>
1920
#import <ObjectiveDropboxOfficial/ObjectiveDropboxOfficial.h>

‎AppBox/AppDelegate.m

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
2626
[DefaultSettings setFirstTimeSettings];
2727
[DefaultSettings setEveryStartupSettings];
2828

29-
//Init Crashlytics
29+
//Init Crashlytics and Firebase
30+
[FIRApp configure];
3031
[[NSUserDefaults standardUserDefaults] registerDefaults:@{ @"NSApplicationCrashOnExceptions": @YES }];
3132
[Fabric with:@[[Crashlytics class], [Answers class]]];
3233

‎AppBox/Common/Constants.h

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ static NSString *const FILE_NAME_SHARE_URL = @".appbox_share_value.json";
8383
#define abTeamIdLength 10
8484
#define abBytesToMB (1024 * 1024)
8585
#define abDropboxOutOfSpaceWarningSize 150
86+
#define abOnErrorMaxRetryCount 3
8687
#define abEndOfSessionLog @"abEndOfSessionLog"
8788

8889

‎AppBox/Common/EventTracker/EventTracker.h

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//
88

99
#import <Foundation/Foundation.h>
10-
#import <GoogleAnalyticsTracker/GoogleAnalyticsTracker.h>
1110

1211
typedef enum : NSUInteger {
1312
LogEventTypeCopyToClipboard,

‎AppBox/Common/EventTracker/EventTracker.m

-14
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,12 @@
1010

1111
@implementation EventTracker
1212

13-
+(void)ga{
14-
static MPAnalyticsConfiguration *configuration = nil;
15-
if (configuration == nil) {
16-
configuration = [[MPAnalyticsConfiguration alloc] initWithAnalyticsIdentifier: [DBManager gaKey]];
17-
[MPGoogleAnalyticsTracker activateConfiguration:configuration];
18-
}
19-
}
20-
2113
+(void)logScreen:(NSString *)name{
22-
[[self class] ga];
23-
[MPGoogleAnalyticsTracker trackScreen:name];
2414
[Answers logContentViewWithName:name contentType:@"screen" contentId:nil customAttributes:nil];
2515
}
2616

2717
+(void)logEventWithName:(NSString *)eventName customAttributes:(NSDictionary *)attributes action:(NSString *)action label:(NSString *)label value:(NSNumber *)value {
28-
[[self class] ga];
2918
[Answers logCustomEventWithName:eventName customAttributes:attributes];
30-
if (action && label && value) {
31-
[MPGoogleAnalyticsTracker trackEventOfCategory:eventName action:action label:label value:value];
32-
}
3319
}
3420

3521
+(void)logEventWithType:(LogEventTypes)eventType{

‎AppBox/Common/UploadManager/UploadManager.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@ typedef void(^CompletionBlock)();
3535
@property(nonatomic, strong) CompletionBlock completionBlock;
3636

3737

38-
+(void)setupDBClientsManager;
39-
-(void)uploadIPAFile:(NSURL *)ipaFileURL;
40-
-(void)uploadIPAFileWithoutUnzip:(NSURL *)ipaURL;
38+
+ (void)setupDBClientsManager;
39+
- (instancetype)init;
40+
- (void)uploadIPAFile:(NSURL *)ipaFileURL;
41+
- (void)uploadIPAFileWithoutUnzip:(NSURL *)ipaURL;
4142

42-
-(void)deleteBuildFromDropbox;
43+
- (void)deleteBuildFromDropbox;
4344

4445
@end

0 commit comments

Comments
 (0)