Merge pull request #20 from vineetchoudhary/development

Issues fix
getappbox · Dec 23, 2016 · 9c89406 · 9c89406
2 parents 355c4a4 + 86b9167
commit 9c89406
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 3 deletions.
diff --git a/AppBox/Common/Common.h b/AppBox/Common/Common.h
@@ -14,6 +14,7 @@
 + (void)shutdownSystem;
 + (NSString*)generateUUID;
 + (NSArray *)getAllTeamId;
++ (void)removeAllStoredCredentials;
 + (BOOL) isValidEmail:(NSString *)checkString;
 + (NSURL *)getFileDirectoryForFilePath:(NSURL *)filePath;
 + (NSModalResponse)showAlertWithTitle:(NSString *)title andMessage:(NSString *)message;

diff --git a/AppBox/Common/Common.m b/AppBox/Common/Common.m
@@ -129,4 +129,37 @@ + (NSArray *)getAllTeamId{
     return plainCertifcates;
 }
 
+#pragma mark - Remove All Cache, Cookies and Credentials
++ (void)removeAllStoredCredentials{
+    // Delete any cached URLrequests!
+    NSURLCache *sharedCache = [NSURLCache sharedURLCache];
+    [sharedCache removeAllCachedResponses];
+
+    // Also delete all stored cookies!
+    NSHTTPCookieStorage *cookieStorage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
+    NSArray *cookies = [cookieStorage cookies];
+    id cookie;
+    for (cookie in cookies) {
+        [cookieStorage deleteCookie:cookie];
+    }
+
+    NSDictionary *credentialsDict = [[NSURLCredentialStorage sharedCredentialStorage] allCredentials];
+    if ([credentialsDict count] > 0) {
+        // the credentialsDict has NSURLProtectionSpace objs as keys and dicts of userName => NSURLCredential
+        NSEnumerator *protectionSpaceEnumerator = [credentialsDict keyEnumerator];
+        id urlProtectionSpace;
+        // iterate over all NSURLProtectionSpaces
+        while (urlProtectionSpace = [protectionSpaceEnumerator nextObject]) {
+            NSEnumerator *userNameEnumerator = [[credentialsDict objectForKey:urlProtectionSpace] keyEnumerator];
+            id userName;
+            // iterate over all usernames for this protectionspace, which are the keys for the actual NSURLCredentials
+            while (userName = [userNameEnumerator nextObject]) {
+                NSURLCredential *cred = [[credentialsDict objectForKey:urlProtectionSpace] objectForKey:userName];
+                //NSLog(@"credentials to be removed: %@", cred);
+                [[NSURLCredentialStorage sharedCredentialStorage] removeCredential:cred forProtectionSpace:urlProtectionSpace];
+            }
+        }
+    }
+}
+
 @end
diff --git a/AppBox/Info.plist b/AppBox/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.6</string>
+	<string>0.9.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/AppBox/ViewController/HomeViewController/HomeViewController.m b/AppBox/ViewController/HomeViewController/HomeViewController.m
@@ -343,7 +343,7 @@ - (void)getIPAInfoFromLocalURL:(NSURL *)ipaFileURL{
         __block NSString *payloadEntry;
         __block NSString *infoPlistPath;
         [SSZipArchive unzipFileAtPath:fromPath toDestination:NSTemporaryDirectory() overwrite:YES password:nil progressHandler:^(NSString * _Nonnull entry, unz_file_info zipInfo, long entryNumber, long total) {
-            if ([[entry.lastPathComponent substringFromIndex:(entry.lastPathComponent.length-4)].lowercaseString isEqualToString: @".app"]) {
+            if ((entry.lastPathComponent.length > 4) && [[entry.lastPathComponent substringFromIndex:(entry.lastPathComponent.length-4)].lowercaseString isEqualToString: @".app"]) {
                 payloadEntry = entry;
             }
             NSString *mainInfoPlistPath = [NSString stringWithFormat:@"%@Info.plist",payloadEntry].lowercaseString;
@@ -732,6 +732,7 @@ -(void)updateViewState{
 
 #pragma mark - MailDelegate -
 -(void)mailViewLoadedWithWebView:(WebView *)webView{
+
 }
 
 -(void)mailSentWithWebView:(WebView *)webView{
@@ -768,7 +769,6 @@ -(void)enableMailField:(BOOL)enable{
     //Just for confirm changes
     [self textFieldMailValueChanged:textFieldEmail];
     [self textFieldDevMessageValueChanged:textFieldMessage];
-
 }
 
 #pragma mark - TabView Delegate

diff --git a/AppBox/ViewController/MailViewController/MailViewController.m b/AppBox/ViewController/MailViewController/MailViewController.m
@@ -66,6 +66,12 @@ - (WebView *)webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)
     return sender;
 }
 
+- (void)webViewClose:(WebView *)sender{
+    [[sender mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:abMailerBaseURL]]];
+    sender.shouldCloseWithWindow = NO;
+}
+
+
 #pragma mark - Actions
 - (IBAction)reloadButtonTapped:(NSButton *)sender {
     [[AppDelegate appDelegate] addSessionLog:@"User Reloaded Current Request!!!"];