Merge pull request #504 from hello/jimmy/dev1222

1.2.2 RC 2
hello · Jan 27, 2016 · b54ab84 · b54ab84
2 parents 63237ec + 93a2f3a
commit b54ab84
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.2.2.2
+
+New:
+
+* Log an analytics Error event when toggling alarm in list errors out
+
+Fixes:
+
+* Fix a crasher that occurs when iOS is unable to determine a users current locale
+
 ## 1.2.2.1
 
 Fixes:

diff --git a/SenseWidget/Info.plist b/SenseWidget/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.2.1</string>
+	<string>1.2.2.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>

diff --git a/SleepModel/HEMAlarmListViewController.m b/SleepModel/HEMAlarmListViewController.m
@@ -300,6 +300,7 @@ - (IBAction)flippedEnabledSwitch:(UISwitch *)sender {
                                                if (error) {
                                                    alarm.on = !on;
                                                    sender.on = !on;
+                                                   [SENAnalytics trackError:error];
                                                } else {
                                                    [SENAnalytics trackAlarmToggle:alarm];
                                                }

diff --git a/SleepModel/HEMSegmentProvider.m b/SleepModel/HEMSegmentProvider.m
@@ -46,10 +46,10 @@ - (NSDictionary*)defaultTraits {
         NSString* deviceModel = [UIDevice currentDeviceModel];
         NSString* appVersion = [bundle objectForInfoDictionaryKey:@"CFBundleVersion"];
         NSString* iOSVersion = [[UIDevice currentDevice] systemVersion];
-        _defaultTraits = @{HEMSegmentTraitAppVersionName : appVersion,
-                           HEMSegmentTraitDeviceModelName : deviceModel,
-                           HEMSegmentTraitOSVersionName : iOSVersion,
-                           HEMSegmentTraitCountryCode : countryCode};
+        _defaultTraits = @{HEMSegmentTraitAppVersionName : appVersion ?: @"undefined",
+                           HEMSegmentTraitDeviceModelName : deviceModel ?: @"undefined",
+                           HEMSegmentTraitOSVersionName : iOSVersion ?: @"undefined",
+                           HEMSegmentTraitCountryCode : countryCode ?: @"undefined"};
     }
     return _defaultTraits;
 }

diff --git a/SleepModel/Sense-Info.plist b/SleepModel/Sense-Info.plist
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.2.1</string>
+	<string>1.2.2.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>