Pulling out extension logic and cleanup

Pulling out extension logic from downloadMediaAndSaveInBundle into it's own method.
Cleaning up typos
Creating MAX_NOTIFICATION_MEDIA_SIZE_BYTES in OneSignalCommonDefines
Renaming supportedFileExtension to supportedFileExtensionFromQueryItems

Author: emawby

iOS_SDK/OneSignalDevApp/OneSignalDevApp.xcodeproj/xcshareddata/xcschemes/OneSignalDevApp.xcscheme

@@ -26,10 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -46,12 +43,23 @@
             isEnabled = "YES">
          </AdditionalOption>
       </AdditionalOptions>
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "911E2CB91E398AB3003112A4"
+               BuildableName = "UnitTests.xctest"
+               BlueprintName = "UnitTests"
+               ReferencedContainer = "container:../OneSignalSDK/OneSignal.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

iOS_SDK/OneSignalSDK/Source/NSURL+OneSignal.h

@@ -31,6 +31,6 @@
 
 - (NSString *)valueFromQueryParameter:(NSString *)parameter;
 
-- (NSString*)supportedFileExtension;
+- (NSString *)supportedFileExtensionFromQueryItems;
 
 @end

iOS_SDK/OneSignalSDK/Source/NSURL+OneSignal.m

@@ -39,7 +39,7 @@ - (NSString *)valueFromQueryParameter:(NSString *)parameter {
     return nil;
 }
 
-- (NSString*)supportedFileExtension {
+- (NSString *)supportedFileExtensionFromQueryItems {
     NSURLComponents *components = [NSURLComponents componentsWithURL:self resolvingAgainstBaseURL:false];
 
     for (NSURLQueryItem *item in [components.queryItems reverseObjectEnumerator]) {

iOS_SDK/OneSignalSDK/Source/OneSignalCommonDefines.h

@@ -238,4 +238,6 @@ typedef enum {GET, POST, HEAD, PUT, DELETE, OPTIONS, CONNECT, TRACE} HTTPMethod;
 // variance and floating-point error.
 #define OS_ROUGHLY_EQUAL(left, right) (fabs(left - right) < 0.03)
 
+#define MAX_NOTIFICATION_MEDIA_SIZE_BYTES 50000000
+
 #endif /* OneSignalCommonDefines_h */

iOS_SDK/OneSignalSDK/Source/OneSignalHelper.m

@@ -79,10 +79,10 @@ -(void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataT
     [outputHandle writeData:data];
 }
 
--(void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveResponse:(NSURLResponse *)aResponse completionHandler:(void (^)(NSURLSessionResponseDisposition))completionHandler {
+- (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveResponse:(NSURLResponse *)aResponse completionHandler:(void (^)(NSURLSessionResponseDisposition))completionHandler {
     response = aResponse;
     long long expectedLength = response.expectedContentLength;
-    if (expectedLength > 50000000) { //Enforcing 50 mb limit on media before downloading
+    if (expectedLength > MAX_NOTIFICATION_MEDIA_SIZE_BYTES) { //Enforcing 50 mb limit on media before downloading
         completionHandler(NSURLSessionResponseCancel);
         return;
     }
@@ -782,24 +782,14 @@ + (void)addNotificationRequest:(OSNotificationPayload*)payload
 /*
  Synchroneously downloads an attachment
  On success returns bundle resource name, otherwise returns nil
- The preference order for file type determination is as follows:
-    1. File extension in the actual URL
-    2. MIME type
-    3. URL Query parameter called 'filename', such as test.jpg. The SDK will extract the file extension from it
 */
-+ (NSString*)downloadMediaAndSaveInBundle:(NSString*)urlString {
++ (NSString *)downloadMediaAndSaveInBundle:(NSString*)urlString {
 
     let url = [NSURL URLWithString:urlString];
 
-    //Try to get extension from the filname parameter
-    NSString* extension = [[[NSURL URLWithString:urlString] valueFromQueryParameter:@"filename"]
-                            supportedFileExtension];
-     
     //Download the file
     var name = [self randomStringWithLength:10];
 
-    if (extension)
-        name = [name stringByAppendingString:[NSString stringWithFormat:@".%@", extension]];
     NSArray* paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
     NSString* filePath = [paths[0] stringByAppendingPathComponent:name];
 
@@ -813,31 +803,16 @@ + (NSString*)downloadMediaAndSaveInBundle:(NSString*)urlString {
             [OneSignal onesignal_Log:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"Encountered an error while attempting to download file with URL: %@", error]];
             return nil;
         }
-        if (!extension) {
-            NSString *newExtension;
-            //Use the MIME type for the extension if one wasn't provided in the filename parameter
-            if (mimeType != nil && ![mimeType isEqualToString:@""]) {
-                newExtension = mimeType.fileExtensionForMimeType;
-            }
-            
-            //Try using url.pathExtension
-            if (!newExtension || ![ONESIGNAL_SUPPORTED_ATTACHMENT_TYPES containsObject:newExtension]) {
-                newExtension =  url.pathExtension;
-            }
-            
-            //Try getting an extension from the query
-            if (!newExtension || ![ONESIGNAL_SUPPORTED_ATTACHMENT_TYPES containsObject:newExtension]) {
-                newExtension = url.supportedFileExtension;
-                if (!newExtension || [newExtension isEqualToString:@""])
-                     return nil;
-            }
-            
-            name = [NSString stringWithFormat:@"%@.%@", name, newExtension];
-            
-            let newPath = [paths[0] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@", name]];
-            
-            [[NSFileManager defaultManager] moveItemAtPath:filePath toPath:newPath error:&error];
-        }
+
+        NSString *extension = [OneSignalHelper getSupportedFileExtensionFromURL:url mimeType:mimeType];
+        if (!extension || [extension isEqualToString:@""])
+            return nil;
+        
+        name = [NSString stringWithFormat:@"%@.%@", name, extension];
+        
+        let newPath = [paths[0] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@", name]];
+        
+        [[NSFileManager defaultManager] moveItemAtPath:filePath toPath:newPath error:&error];
 
         if (error) {
             [OneSignal onesignal_Log:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"Encountered an error while attempting to download file with URL: %@", error]];
@@ -864,6 +839,41 @@ + (NSString*)downloadMediaAndSaveInBundle:(NSString*)urlString {
     }
 }
 
+
+/*
+ The preference order for file type determination is as follows:
+    1. URL Query parameter called 'filename', such as test.jpg. The SDK will extract the file extension from it
+    2. MIME type
+    3. File extension in the actual URL
+    4. A file extension extracted by searching through all URL Query parameters
+ */
++ (NSString *)getSupportedFileExtensionFromURL:(NSURL *)url mimeType:(NSString *)mimeType {
+    //Try to get extension from the filename parameter
+    NSString* extension = [[url valueFromQueryParameter:@"filename"]
+                            supportedFileExtension];
+    if (extension && [ONESIGNAL_SUPPORTED_ATTACHMENT_TYPES containsObject:extension]) {
+        return extension;
+    }
+    //Use the MIME type for the extension
+    if (mimeType != nil && ![mimeType isEqualToString:@""]) {
+        extension = mimeType.fileExtensionForMimeType;
+        if (extension && [ONESIGNAL_SUPPORTED_ATTACHMENT_TYPES containsObject:extension]) {
+            return extension;
+        }
+    }
+    //Try using url.pathExtension
+    extension =  url.pathExtension;
+    if (extension && [ONESIGNAL_SUPPORTED_ATTACHMENT_TYPES containsObject:extension]) {
+        return extension;
+    }
+    //Try getting an extension from the query
+    extension = url.supportedFileExtensionFromQueryItems;
+    if (extension && [ONESIGNAL_SUPPORTED_ATTACHMENT_TYPES containsObject:extension]) {
+        return extension;
+    }
+    return nil;
+}
+
 // TODO: Add back after testing
 + (void)clearCachedMedia {
     /*

iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m

@@ -2165,7 +2165,7 @@ - (void)testFileExtensionPrioritizesFileNameParameter {
     XCTAssertTrue([downloadedGifFilename.supportedFileExtension isEqualToString:@"png"]);
 }
 
-- (void)testExtractFileExtensionFromAnyParamter {
+- (void)testExtractFileExtensionFromAnyParameter {
     //test to make sure the fallback of parsing all parameters for a file type works correctly
     //NSURLSessionOverrider returns an unallowed extension (heic) for this URL to test the fallback
     id pngFormat = [self exampleNotificationJSONWithMediaURL:@"http://domain.com/secondFile?file=test.png&media=image&type=.fakeextension"];