Merge pull request #663 from hello/jimmy/reset-swap

BLE factory reset at end of upgrade flow + use swap error status
hello · Aug 26, 2016 · cd271df · cd271df
2 parents 5fa1ab7 + 3a627d1
commit cd271df
Show file tree

Hide file tree

Showing 28 changed files with 996 additions and 846 deletions.
diff --git a/Podfile.lock b/Podfile.lock
@@ -152,7 +152,7 @@ CHECKOUT OPTIONS:
     :commit: 0451b5e67dec46b8bc48fcad63d9f844cae1bf19
     :git: git@github.com:hello/NAPickerView.git
   SenseKit:
-    :commit: e30808f67b01e1f62bf204e640a2c4d6a5c1a092
+    :commit: 53d43cd8251f30cb76945bf1ab93a0089ffbaeae
     :git: git@github.com:hello/SenseKit.git
   SHSProtoBuf:
     :commit: 86b2e176097f76d130c858164eca42e15b779073

diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pods/SenseKit/Pod/Classes/API/SENAPIDevice.h b/Pods/SenseKit/Pod/Classes/API/SENAPIDevice.h
diff --git a/Pods/SenseKit/Pod/Classes/API/SENAPIDevice.m b/Pods/SenseKit/Pod/Classes/API/SENAPIDevice.m
diff --git a/Pods/SenseKit/Pod/Classes/Model/Model.h b/Pods/SenseKit/Pod/Classes/Model/Model.h
diff --git a/Pods/SenseKit/Pod/Classes/Model/SENPairedDevices.h b/Pods/SenseKit/Pod/Classes/Model/SENPairedDevices.h
diff --git a/Pods/SenseKit/Pod/Classes/Model/SENPairedDevices.m b/Pods/SenseKit/Pod/Classes/Model/SENPairedDevices.m
diff --git a/Pods/SenseKit/Pod/Classes/Model/SENSwapStatus.h b/Pods/SenseKit/Pod/Classes/Model/SENSwapStatus.h
diff --git a/Pods/SenseKit/Pod/Classes/Model/SENSwapStatus.m b/Pods/SenseKit/Pod/Classes/Model/SENSwapStatus.m
diff --git a/Pods/Target Support Files/SenseKit/SenseKit-umbrella.h b/Pods/Target Support Files/SenseKit/SenseKit-umbrella.h
diff --git a/Sense.xcodeproj/project.pbxproj b/Sense.xcodeproj/project.pbxproj
@@ -410,7 +410,6 @@
 		BFF3648A1D64EBE1008D4DF8 /* HEMUpgradePairPillPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = BFF364891D64EBE1008D4DF8 /* HEMUpgradePairPillPresenter.m */; };
 		BFF3648D1D665C3E008D4DF8 /* HEMResetSenseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BFF3648C1D665C3E008D4DF8 /* HEMResetSenseViewController.m */; };
 		BFF364901D667B67008D4DF8 /* HEMResetSensePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = BFF3648F1D667B67008D4DF8 /* HEMResetSensePresenter.m */; };
-		BFF364931D677C6A008D4DF8 /* HEMResetDoneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BFF364921D677C6A008D4DF8 /* HEMResetDoneViewController.m */; };
 		BFF3B43E1A5B831200B11643 /* HEMSettingsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BFF3B43D1A5B831200B11643 /* HEMSettingsTableViewCell.m */; };
 		BFF3B4471A5CD60300B11643 /* HEMDeviceCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BFF3B4461A5CD60300B11643 /* HEMDeviceCollectionViewCell.m */; };
 		BFF3B44A1A5DB5DE00B11643 /* HEMNoDeviceCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BFF3B4491A5DB5DD00B11643 /* HEMNoDeviceCollectionViewCell.m */; };
@@ -1206,8 +1205,6 @@
 		BFF3648C1D665C3E008D4DF8 /* HEMResetSenseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HEMResetSenseViewController.m; sourceTree = "<group>"; };
 		BFF3648E1D667B67008D4DF8 /* HEMResetSensePresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HEMResetSensePresenter.h; sourceTree = "<group>"; };
 		BFF3648F1D667B67008D4DF8 /* HEMResetSensePresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HEMResetSensePresenter.m; sourceTree = "<group>"; };
-		BFF364911D677C6A008D4DF8 /* HEMResetDoneViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HEMResetDoneViewController.h; sourceTree = "<group>"; };
-		BFF364921D677C6A008D4DF8 /* HEMResetDoneViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HEMResetDoneViewController.m; sourceTree = "<group>"; };
 		BFF3B43C1A5B831200B11643 /* HEMSettingsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HEMSettingsTableViewCell.h; sourceTree = "<group>"; };
 		BFF3B43D1A5B831200B11643 /* HEMSettingsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HEMSettingsTableViewCell.m; sourceTree = "<group>"; };
 		BFF3B4451A5CD60300B11643 /* HEMDeviceCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HEMDeviceCollectionViewCell.h; sourceTree = "<group>"; };
@@ -3224,8 +3221,6 @@
 				BFF3647C1D629018008D4DF8 /* HEMSenseUpgradedViewController.m */,
 				BFF3648B1D665C3E008D4DF8 /* HEMResetSenseViewController.h */,
 				BFF3648C1D665C3E008D4DF8 /* HEMResetSenseViewController.m */,
-				BFF364911D677C6A008D4DF8 /* HEMResetDoneViewController.h */,
-				BFF364921D677C6A008D4DF8 /* HEMResetDoneViewController.m */,
 			);
 			name = "View Controllers";
 			sourceTree = "<group>";
@@ -4025,7 +4020,6 @@
 				BFB59E101C03A929001BD941 /* HEMTimeZoneService.m in Sources */,
 				BFF3B4471A5CD60300B11643 /* HEMDeviceCollectionViewCell.m in Sources */,
 				BF55D87E1CA484F500379FBF /* HEMSoundsContainerViewController.m in Sources */,
-				BFF364931D677C6A008D4DF8 /* HEMResetDoneViewController.m in Sources */,
 				BFC99BC01B6A93AF008F7F0D /* HEMAppReviewQuestionsDataSource.m in Sources */,
 				BF5BACFF1C5C266900347185 /* HEMTrendsBaseCell.m in Sources */,
 			);

diff --git a/SleepModel/Base.lproj/Localizable.strings b/SleepModel/Base.lproj/Localizable.strings
@@ -911,6 +911,8 @@
 "upgrade.pill.checking-pill" = "Checking for Sleep Pill";
 "upgrade.pill.checking-pill.error.message" = "Unable to check your account for an existing Sleep Pill. Make sure you are connected to the internet and try again.";
 "upgrade.reset.sense.title" = "Reset your original Sense";
-"upgrade.reset.sense.description" = "Resetting your original Sense will return it to factory settings.";
+"upgrade.reset.sense.description" = "Reset your original Sense to use with another account or give away. Plug your original Sense into a power outlet and make sure it’s nearby before resetting.";
 "upgrade.reset.status" = "Sending request";
 "upgrade.reset.done" = "Sent";
+"upgrade.reset.error.title" = "Factory reset";
+"upgrade.reset.error.message" = "An error occurred while attempting to factory reset your original Sense. Make sure Sense is plugged in, nearby and try again.";