diff options
author | Joel Fischer <joeljfischer@gmail.com> | 2021-08-13 11:56:09 -0400 |
---|---|---|
committer | Joel Fischer <joeljfischer@gmail.com> | 2021-08-13 11:56:09 -0400 |
commit | 9cdf9c22bc00425296c9607b4cf7f9c8ef982714 (patch) | |
tree | 8fb2bc554763574ecebf5b6a20d70ef447041bd2 | |
parent | 1da1b9ddad80f4d08ee51798b039a8eeff5012f6 (diff) | |
download | sdl_ios-9cdf9c22bc00425296c9607b4cf7f9c8ef982714.tar.gz |
Temporarily remove things that may not be necessary
3 files changed, 85 insertions, 6 deletions
diff --git a/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLink-Example-Swift.xcscheme b/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLink-Example-Swift.xcscheme new file mode 100644 index 000000000..9d72e5789 --- /dev/null +++ b/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLink-Example-Swift.xcscheme @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Scheme + LastUpgradeVersion = "1250" + version = "1.3"> + <BuildAction + parallelizeBuildables = "YES" + buildImplicitDependencies = "YES"> + <BuildActionEntries> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8829567D207CF68800EF056C" + BuildableName = "SDL Example Swift.app" + BlueprintName = "SmartDeviceLink-Example-Swift" + ReferencedContainer = "container:SmartDeviceLink-iOS.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction + buildConfiguration = "Debug" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + shouldUseLaunchSchemeArgsEnv = "YES"> + <Testables> + </Testables> + </TestAction> + <LaunchAction + buildConfiguration = "Debug" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + launchStyle = "0" + useCustomWorkingDirectory = "NO" + ignoresPersistentStateOnLaunch = "NO" + debugDocumentVersioning = "YES" + debugServiceExtension = "internal" + allowLocationSimulation = "YES"> + <BuildableProductRunnable + runnableDebuggingMode = "0"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8829567D207CF68800EF056C" + BuildableName = "SDL Example Swift.app" + BlueprintName = "SmartDeviceLink-Example-Swift" + ReferencedContainer = "container:SmartDeviceLink-iOS.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + </LaunchAction> + <ProfileAction + buildConfiguration = "Release" + shouldUseLaunchSchemeArgsEnv = "YES" + savedToolIdentifier = "" + useCustomWorkingDirectory = "NO" + debugDocumentVersioning = "YES"> + <BuildableProductRunnable + runnableDebuggingMode = "0"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8829567D207CF68800EF056C" + BuildableName = "SDL Example Swift.app" + BlueprintName = "SmartDeviceLink-Example-Swift" + ReferencedContainer = "container:SmartDeviceLink-iOS.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + </ProfileAction> + <AnalyzeAction + buildConfiguration = "Debug"> + </AnalyzeAction> + <ArchiveAction + buildConfiguration = "Release" + revealArchiveInOrganizer = "YES"> + </ArchiveAction> +</Scheme> diff --git a/SmartDeviceLink/private/SDLMenuReplaceOperation.m b/SmartDeviceLink/private/SDLMenuReplaceOperation.m index 25c3d9b0c..612c9ce41 100644 --- a/SmartDeviceLink/private/SDLMenuReplaceOperation.m +++ b/SmartDeviceLink/private/SDLMenuReplaceOperation.m @@ -111,7 +111,7 @@ NS_ASSUME_NONNULL_BEGIN NSArray<SDLMenuCell *> *newKeeps = [self sdl_filterKeepMenuItemsWithNewMenuItems:self.updatedMenu basedOnStatusList:runScore.updatedStatus]; // Since we are creating a new Menu but keeping old cells we must first transfer the old cellIDs to the new menus kept cells. - [self sdl_transferCellIDsFromOldCells:oldKeeps toKeptCells:newKeeps]; +// [self sdl_transferCellIDsFromOldCells:oldKeeps toKeptCells:newKeeps]; // Upload the artworks, then we will start updating the main menu __weak typeof(self) weakSelf = self; @@ -181,10 +181,11 @@ NS_ASSUME_NONNULL_BEGIN NSArray<SDLMenuCell *> *cellsToDelete = [self sdl_filterDeleteMenuItemsWithOldMenuItems:oldKeptCells[startIndex].subCells basedOnStatusList:deleteMenuStatus]; NSArray<SDLMenuCell *> *cellsToAdd = [self sdl_filterAddMenuItemsWithNewMenuItems:newKeptCells[startIndex].subCells basedOnStatusList:addMenuStatus]; - NSArray<SDLMenuCell *> *oldKeeps = [self sdl_filterKeepMenuItemsWithOldMenuItems:oldKeptCells[startIndex].subCells basedOnStatusList:deleteMenuStatus]; - NSArray<SDLMenuCell *> *newKeeps = [self sdl_filterKeepMenuItemsWithNewMenuItems:newKeptCells[startIndex].subCells basedOnStatusList:addMenuStatus]; - - [self sdl_transferCellIDsFromOldCells:oldKeeps toKeptCells:newKeeps]; + // TODO: These will be necessary once we do subcells of subcells +// NSArray<SDLMenuCell *> *oldKeeps = [self sdl_filterKeepMenuItemsWithOldMenuItems:oldKeptCells[startIndex].subCells basedOnStatusList:deleteMenuStatus]; +// NSArray<SDLMenuCell *> *newKeeps = [self sdl_filterKeepMenuItemsWithNewMenuItems:newKeptCells[startIndex].subCells basedOnStatusList:addMenuStatus]; +// +// [self sdl_transferCellIDsFromOldCells:oldKeeps toKeptCells:newKeeps]; __weak typeof(self) weakself = self; [self sdl_sendDeleteCurrentMenu:cellsToDelete withCompletionHandler:^(NSError * _Nullable error) { diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLMenuReplaceOperationSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLMenuReplaceOperationSpec.m index 0913d7226..d83e9615b 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLMenuReplaceOperationSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLMenuReplaceOperationSpec.m @@ -120,7 +120,7 @@ describe(@"a menu replace operation", ^{ mockReplaceUtilities = OCMClassMock([SDLMenuReplaceUtilities class]); }); - describe(@"sending initial batch of cells", ^{ + context(@"sending initial batch of cells", ^{ context(@"when setting no cells", ^{ it(@"should finish without doing anything", ^{ testOp = [[SDLMenuReplaceOperation alloc] initWithConnectionManager:testConnectionManager fileManager:testFileManager windowCapability:testWindowCapability menuConfiguration:testMenuConfiguration currentMenu:testCurrentMenu updatedMenu:testNewMenu compatibilityModeEnabled:YES currentMenuUpdatedHandler:testCurrentMenuUpdatedBlock]; |