Merge branch 'release/4.0.3'

Author: lumaxis

Classes/Telemetry/BITPersistence.m

@@ -220,9 +220,9 @@ - (void)createDirectoryStructureIfNeeded {
 
     // Create telemetry subfolder
 
-    //NOTE: createDirectoryAtURL:withIntermediateDirectories:attributes:error
-    //will return YES if the directory already exists and won't override anything.
-    //No need to check if the directory already exists.
+    // NOTE: createDirectoryAtURL:withIntermediateDirectories:attributes:error
+    // will return YES if the directory already exists and won't override anything.
+    // No need to check if the directory already exists.
     NSURL *telemetryURL = [appURL URLByAppendingPathComponent:kBITTelemetryDirectory];
     if (![fileManager createDirectoryAtURL:telemetryURL withIntermediateDirectories:YES attributes:nil error:&error]) {
       BITHockeyLog(@"%@", error.localizedDescription);
@@ -255,7 +255,8 @@ - (NSString *)nextURLOfType:(BITPersistenceType)type {
                                                               includingPropertiesForKeys:@[NSURLNameKey]
                                                                                  options:NSDirectoryEnumerationSkipsHiddenFiles
                                                                                    error:&error];
-  // each track method asks, if space is still available. Getting the file count for each event would be too expensive,
+  
+  // Each track method asks if space is still available. Getting the file count for each event would be too expensive,
   // so let's get it here
   if (type == BITPersistenceTypeTelemetry) {
     _maxFileCountReached = fileNames.count >= _maxFileCount;
@@ -302,14 +303,24 @@ - (void)sendBundleSavedNotification {
 
 - (NSString *)appHockeySDKDirectoryPath {
   if (!_appHockeySDKDirectoryPath) {
+    
+    // Assemble the directory path we use to store our telemetry data in.
+    // We use the current app's bundle identifier for the name of the subfolder within Application Support
+    // as this is one of the few directories a sandboxed app can write to (Compare
+    // https://developer.apple.com/library/mac/documentation/General/Conceptual/MOSXAppProgrammingGuide/AppRuntime/AppRuntime.html#//apple_ref/doc/uid/TP40010543-CH2-SW9 )
+    // and then create our own subfolder within that.
     NSString *appSupportPath = [[NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) lastObject] stringByStandardizingPath];
-    NSString *bundleID = bit_mainBundleIdentifier();
+    NSString *bundleID = [self bundleIdentifier];
+    
     if (appSupportPath && bundleID) {
-      NSString *hockeySDKPath = [appSupportPath stringByAppendingPathComponent:kBITHockeyDirectory];
-      _appHockeySDKDirectoryPath = [hockeySDKPath stringByAppendingPathComponent:bundleID];
+      _appHockeySDKDirectoryPath = [[appSupportPath stringByAppendingPathComponent:bundleID] stringByAppendingPathComponent:kBITHockeyDirectory];
     }
   }
   return _appHockeySDKDirectoryPath;
 }
 
+- (NSString *)bundleIdentifier {
+  return bit_mainBundleIdentifier();
+}
+
 @end

Classes/Telemetry/BITPersistencePrivate.h

@@ -141,4 +141,6 @@ FOUNDATION_EXPORT NSString *const BITPersistenceSuccessNotification;
 */
 - (NSString *)fileURLForType:(BITPersistenceType)type;
 
+- (NSString *)appHockeySDKDirectoryPath;
+
 @end

HockeySDK-Mac.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'HockeySDK-Mac'
-  s.version           = '4.0.2'
+  s.version           = '4.0.3'
 
   s.summary           = 'Collect live crash reports, get feedback from your users, distribute your betas, and get usage data.'
   s.description       = <<-DESC

README.md

@@ -1,8 +1,8 @@
 [![Build Status](https://travis-ci.org/bitstadium/HockeySDK-iOS.svg?branch=develop)](https://travis-ci.org/bitstadium/HockeySDK-Mac)
 
-## Version 4.0.2
+## Version 4.0.3
 
-- [Changelog](http://www.hockeyapp.net/help/sdk/mac/4.0.2/docs/docs/Changelog.html)
+- [Changelog](http://www.hockeyapp.net/help/sdk/mac/4.0.3/docs/docs/Changelog.html)
 
 **NOTE:** With the release of HockeySDK 4.0.0-alpha.1 a bug was introduced which lead to the exclusion of the Application Support folder from iCloud and iTunes backups.
 
@@ -359,7 +359,7 @@ To check if data is send properly to HockeyApp and also see some additional SDK
 <a id="documentation"></a>
 ## 4. Documentation
 
-Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/mac/4.0.2/index.html).
+Our documentation can be found on [HockeyApp](http://hockeyapp.net/help/sdk/mac/4.0.3/index.html).
 
 <a id="troubleshooting"></a>
 ## 5.Troubleshooting

Support/BITPersistenceTests.m

@@ -0,0 +1,45 @@
+//
+//  BITPersistenceTests.m
+//  HockeySDK
+//
+//  Created by Patrick Dinger on 24/05/16.
+//
+//
+
+#import <XCTest/XCTest.h>
+#import <OCMock/OCMock.h>
+#import "BITPersistence.h"
+#import "BITPersistencePrivate.h"
+
+@interface BITPersistenceTests : XCTestCase
+
+@end
+
+@implementation BITPersistenceTests {
+    BITPersistence *_subject;
+}
+
+- (void)setUp {
+    [super setUp];
+    _subject = [BITPersistence alloc];
+    id mock = OCMPartialMock(_subject);
+    
+    OCMStub([mock bundleIdentifier]).andReturn(@"com.testapp");
+    
+    _subject = [_subject init];
+}
+
+- (void)tearDown {
+    [super tearDown];
+}
+
+- (void)testAppHockeySDKDirectoryPath {
+    NSString *path = [_subject appHockeySDKDirectoryPath];
+    
+    NSString *appSupportPath = [[NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) lastObject] stringByStandardizingPath];
+    NSString *validPath = [NSString stringWithFormat:@"%@/%@", appSupportPath, @"com.testapp/com.microsoft.HockeyApp"];
+    
+    XCTAssertEqualObjects(path, validPath);
+}
+
+@end