Merge pull request #15 from vineetchoudhary/development

Fixes for next release

Author: vineetchoudhary

AppBox.xcodeproj/project.pbxproj

@@ -39,7 +39,6 @@
 		E18DCB171DFE729300BD7F11 /* MailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E18DCB161DFE729300BD7F11 /* MailViewController.m */; };
 		E18DCB1D1DFED95000BD7F11 /* UserData.m in Sources */ = {isa = PBXBuildFile; fileRef = E18DCB1C1DFED95000BD7F11 /* UserData.m */; };
 		E1A3965D1E040C9E0065FC7F /* NetworkHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = E1A3965C1E040C9E0065FC7F /* NetworkHandler.m */; };
-		E1A3965E1E04123E0065FC7F /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E1C148731E027A6100EE637F /* AFNetworking.framework */; };
 		E1A3965F1E04123E0065FC7F /* AFNetworking.framework in Copy Files (1 item) */ = {isa = PBXBuildFile; fileRef = E1C148731E027A6100EE637F /* AFNetworking.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		E1C148741E027A6100EE637F /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E1C148731E027A6100EE637F /* AFNetworking.framework */; };
 		E1CFC65E1D7E7FEA005872BE /* Common.m in Sources */ = {isa = PBXBuildFile; fileRef = E1CFC65D1D7E7FEA005872BE /* Common.m */; };
@@ -134,7 +133,6 @@
 				E16437F91D743D4500CE8B7E /* DropboxOSX.framework in Frameworks */,
 				E1FB91D91D78055200F8DF46 /* ZipArchive.framework in Frameworks */,
 				E188EA161D7856D200EBCA52 /* ISO8601.framework in Frameworks */,
-				E1A3965E1E04123E0065FC7F /* AFNetworking.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -377,7 +375,7 @@
 		E16437C71D743A4E00CE8B7E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = "Developer Insider";
 				TargetAttributes = {
 					E16437CE1D743A4E00CE8B7E = {
@@ -471,8 +469,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -515,8 +515,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";

AppBox/AppDelegate.m

@@ -33,10 +33,9 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     [Common isNewVersionAvailableCompletion:^(bool available, NSURL *url) {
         if (available){
             NSAlert *alert = [[NSAlert alloc] init];
-            [alert setMessageText: @"New Version Available - AppBox"];
+            [alert setMessageText: @"New Version Available"];
             [alert setInformativeText:@"A newer version of the \"AppBox\" is available. Do you want to update it? \n\n\n"];
             [alert setAlertStyle:NSInformationalAlertStyle];
-            [alert setDelegate:self];
             [alert addButtonWithTitle:@"YES"];
             [alert addButtonWithTitle:@"NO"];
             if ([alert runModal] == NSAlertFirstButtonReturn){
@@ -62,7 +61,8 @@ +(AppDelegate *)appDelegate{
 
 -(void)addSessionLog:(NSString *)sessionLog{
     [_sessionLog appendFormat: @"\n\n%@ - %@",[NSDate date],sessionLog];
-    [[NSNotificationCenter defaultCenter] postNotificationName:SessionLogUpdated object:nil];
+    NSLog(@"%@",sessionLog);
+    [[NSNotificationCenter defaultCenter] postNotificationName:abSessionLogUpdated object:nil];
 }
 
 #pragma mark - Notification Center Delegate

AppBox/Base.lproj/Main.storyboard

@@ -15,7 +15,7 @@ + (NSString*)generateUUID {
     int result = SecRandomCopyBytes(NULL, 32, data.mutableBytes);
     NSAssert(result == 0, @"Error generating random bytes: %d", errno);
     NSString *base64EncodedData = [data base64EncodedStringWithOptions:0];
-    base64EncodedData = [base64EncodedData stringByReplacingOccurrencesOfString:@"/" withString:@""];
+    base64EncodedData = [base64EncodedData stringByReplacingOccurrencesOfString:@"/" withString:abEmptyString];
     return base64EncodedData;
 }
 
@@ -68,14 +68,14 @@ + (void)shutdownSystem{
 + (void)isNewVersionAvailableCompletion:(void (^)(bool available, NSURL *url))completion{
     @try {
         [[AppDelegate appDelegate] addSessionLog:@"Checking for new version..."];
-        [NetworkHandler requestWithURL:GitHubLatestRelease withParameters:nil andRequestType:RequestGET andCompletetion:^(id responseObj, NSError *error) {
+        [NetworkHandler requestWithURL:abGitHubLatestRelease withParameters:nil andRequestType:RequestGET andCompletetion:^(id responseObj, NSError *error) {
             if (error == nil &&
                 [((NSDictionary *)responseObj).allKeys containsObject:@"tag_name"] &&
                 [((NSDictionary *)responseObj).allKeys containsObject:@"html_url"]){
                 NSString *tag = [responseObj valueForKey:@"tag_name"];
-                NSString *newVesion = [[tag componentsSeparatedByCharactersInSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet]] componentsJoinedByString:@""];
+                NSString *newVesion = [[tag componentsSeparatedByCharactersInSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet]] componentsJoinedByString:abEmptyString];
                 NSString *versionString = [[[NSBundle mainBundle] infoDictionary] valueForKey:@"CFBundleShortVersionString"];
-                NSString *currentVersion = [[versionString componentsSeparatedByCharactersInSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet]] componentsJoinedByString:@""];
+                NSString *currentVersion = [[versionString componentsSeparatedByCharactersInSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet]] componentsJoinedByString:abEmptyString];
                 completion(([newVesion compare:currentVersion] == NSOrderedDescending),[NSURL URLWithString:[responseObj valueForKey:@"html_url"]]);
             }else{
                 completion(false, nil);
@@ -104,13 +104,15 @@ + (NSArray *)getAllTeamId{
         NSMutableDictionary *certProperties = [[NSMutableDictionary alloc] init];
         NSString *certLabel = [obj valueForKey:(NSString *)kSecAttrLabel];
         NSArray *certComponent = [certLabel componentsSeparatedByString:@": "];
-        if (certComponent.count == 2 && [[certComponent firstObject] containsString:@"Distribution"]){
+        if (certComponent.count == 2 &&
+            ([[[certComponent firstObject] lowercaseString] isEqualToString:abiPhoneDistribution] ||
+             [[[certComponent firstObject] lowercaseString] isEqualToString:abiPhoneDeveloper])){
             NSArray *certDetailsComponent = [[certComponent lastObject] componentsSeparatedByString:@" ("];
             if (certDetailsComponent.count == 2){
-                NSString *teamId = [[certDetailsComponent lastObject] stringByReplacingOccurrencesOfString:@")" withString:@""];
-                [certProperties setValue:certLabel forKey:@"fullName"];
-                [certProperties setValue:[certComponent lastObject] forKey:@"teamName"];
-                [certProperties setObject:teamId forKey:@"teamId"];
+                NSString *teamId = [[certDetailsComponent lastObject] stringByReplacingOccurrencesOfString:@")" withString:abEmptyString];
+                [certProperties setValue:certLabel forKey:abFullName];
+                [certProperties setValue:[certComponent lastObject] forKey:abTeamName];
+                [certProperties setObject:teamId forKey:abTeamId];
                 if ([teamId containsString:@" "]){
 
                 }
@@ -121,6 +123,9 @@ + (NSArray *)getAllTeamId{
             }
         }
     }];
+    [plainCertifcates sortUsingComparator:^NSComparisonResult(id  _Nonnull obj1, id  _Nonnull obj2) {
+        return [obj1 valueForKey:abTeamId] > [obj2 valueForKey:abTeamId];
+    }];
     return plainCertifcates;
 }
 

AppBox/Common/Common.m

@@ -10,20 +10,31 @@
 #define Constants_h
 
 //Base URL's
-#define MailerBaseURL @"https://tryapp.github.io/mail"
-#define GitHubLatestRelease @"https://api.github.com/repos/vineetchoudhary/AppBox-iOSAppsWirelessInstallation/releases/latest"
+#define abMailerBaseURL @"https://tryapp.github.io/mail"
+#define abGitHubLatestRelease @"https://api.github.com/repos/vineetchoudhary/AppBox-iOSAppsWirelessInstallation/releases/latest"
 
 //dropbox
-#define DbRoot kDBRootAppFolder
-#define DbAppkey @"86tfx5bu3356fqo"
-#define DbScreatkey @"mq4l1damoz8hwrr"
+#define abDbRoot kDBRootAppFolder
+#define abDbAppkey @"86tfx5bu3356fqo"
+#define abDbScreatkey @"mq4l1damoz8hwrr"
 
 //notification
-#define SessionLogUpdated @"SessionLogUpdated"
+#define abSessionLogUpdated @"SessionLogUpdated"
 
 //messages
-#define KeepSameLinkHelpTitle @"What is keep same link for all future upload?"
-#define KeepSameLinkHelpMessage  @"This feature will keep same short url for all future build/ipa uploaded with same bundle identifier, this means old build/ipa url will replaced by new ipa file. You can change the link by changing the Dropbox app folder name below. \n\nWe are working on this feature, Once we fineshed this you will be able to install previous build/ipa also."
+#define abKeepSameLinkHelpTitle @"What is keep same link for all future upload?"
+#define abKeepSameLinkHelpMessage  @"This feature will keep same short url for all future build/ipa uploaded with same bundle identifier, this means old build/ipa url will replaced by new ipa file. You can change the link by changing the Dropbox app folder name below. \n\nIf this option is enable, you can also download the previous build with same url."
+#define abKeepSameLinkReadMoreURL @"https://iosappswirelessinstallation.codeplex.com/wikipage?title=KeepSameLink"
+
+//team id constants
+#define abiPhoneDeveloper @"iphone developer"
+#define abiPhoneDistribution @"iphone distribution"
+#define abFullName @"fullName"
+#define abTeamName @"teamName"
+#define abTeamId @"teamId"
+
+//others
+#define abEmptyString @""
 
 
 //enums

AppBox/Common/Constants.h

@@ -26,7 +26,7 @@ +(void)setIsGmailLoggedIn:(BOOL)isGmailLoggedIn{
 
 +(NSString *)userEmail{
     NSString *userEmail = [[NSUserDefaults standardUserDefaults] stringForKey:UserEmail];
-    return userEmail == nil ? @"" : userEmail;
+    return userEmail == nil ? abEmptyString : userEmail;
 }
 
 +(void)setUserEmail:(NSString *)userEmail{
@@ -36,7 +36,7 @@ +(void)setUserEmail:(NSString *)userEmail{
 
 +(NSString *)userMessage{
     NSString *userMessage = [[NSUserDefaults standardUserDefaults] stringForKey:UserMessage];
-    return userMessage == nil ? @"" : userMessage;
+    return userMessage == nil ? abEmptyString : userMessage;
 }
 
 +(void)setUserMessage:(NSString *)userMessage{

AppBox/Common/UserData.m

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.3</string>
+	<string>0.9.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

AppBox/Info.plist

@@ -18,7 +18,7 @@ -(void)createUDIDAndIsNew:(BOOL)isNew{
 }
 
 -(NSString *)buildMailURLStringForEmailId:(NSString *)mailId andMessage:(NSString *)message{
-    NSMutableString *mailString = [NSMutableString stringWithString:MailerBaseURL];
+    NSMutableString *mailString = [NSMutableString stringWithString:abMailerBaseURL];
     [mailString appendFormat:@"?to=%@",mailId];
     [mailString appendFormat:@"&app=%@",self.name];
     [mailString appendFormat:@"&ver=%@",self.version];
@@ -103,7 +103,7 @@ - (NSURL *)buildArchivePath{
 #pragma mark - Setter
 
 - (void)setName:(NSString *)name{
-    _name = [name stringByReplacingOccurrencesOfString:@" " withString:@""];
+    _name = [name stringByReplacingOccurrencesOfString:@" " withString:abEmptyString];
 }
 
 - (void)setFullPath:(NSURL *)fullPath{
@@ -115,7 +115,7 @@ - (void)setFullPath:(NSURL *)fullPath{
 - (void)setIpaInfoPlist:(NSDictionary *)ipaInfoPlist{
     _ipaInfoPlist = ipaInfoPlist;
     [self createUDIDAndIsNew:YES];
-    if (self.name == nil){
+    if ([ipaInfoPlist valueForKey:@"CFBundleName"] != nil){
         [self setName: [ipaInfoPlist valueForKey:@"CFBundleName"]];
     }
     [self setBuild: [ipaInfoPlist valueForKey:@"CFBundleVersion"]];

AppBox/Model/ProjectModel/XCProject.m

@@ -17,7 +17,7 @@ @implementation DropboxViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do view setup here.
-    DBSession *session = [[DBSession alloc] initWithAppKey:DbAppkey appSecret:DbScreatkey root:DbRoot];
+    DBSession *session = [[DBSession alloc] initWithAppKey:abDbAppkey appSecret:abDbScreatkey root:abDbRoot];
     [session setDelegate:self];
     [DBSession setSharedSession:session];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(authHelperStateChangedNotification:) name:DBAuthHelperOSXStateChangedNotification object:[DBAuthHelperOSX sharedHelper]];
@@ -29,7 +29,7 @@ - (IBAction)buttonConnectDropboxTapped:(NSButton *)sender {
 
 #pragma mark - DBSession Delegate
 - (void)sessionDidReceiveAuthorizationFailure:(DBSession *)session userId:(NSString *)userId{
-    [Common showAlertWithTitle:@"Authorization Failed" andMessage:@""];
+    [Common showAlertWithTitle:@"Authorization Failed" andMessage:abEmptyString];
 }
 
 - (void)authHelperStateChangedNotification:(NSNotification *)notification {