Skip to content

Fixing memory leaks leading to unreleased modal view controllers #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 2, 2016
Merged

Fixing memory leaks leading to unreleased modal view controllers #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25b0c1c
Fixing memory leaks in the modal view controllers
loudnate Jul 2, 2016
2b85bf3
Removing debugging statements
loudnate Jul 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions Loop.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
43CA93371CB98079000026B5 /* MinimedKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43CA93361CB98079000026B5 /* MinimedKit.framework */; };
43CE7CDE1CA8B63E003CC1B0 /* NSDate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43CE7CDD1CA8B63E003CC1B0 /* NSDate.swift */; };
43DBF04C1C93B8D700B3C386 /* BolusViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DBF04B1C93B8D700B3C386 /* BolusViewController.swift */; };
43DBF0511C93C14100B3C386 /* PopoverInNavigationControllerSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DBF0501C93C14100B3C386 /* PopoverInNavigationControllerSegue.swift */; };
43DBF0531C93EC8200B3C386 /* DeviceDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DBF0521C93EC8200B3C386 /* DeviceDataManager.swift */; };
43DBF0551C93ED3000B3C386 /* DeviceDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DBF0541C93ED3000B3C386 /* DeviceDataManager.swift */; };
43DBF0571C93F6EB00B3C386 /* ReservoirTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43DBF0561C93F6EB00B3C386 /* ReservoirTableViewController.swift */; };
Expand Down Expand Up @@ -279,7 +278,6 @@
43CE7CDD1CA8B63E003CC1B0 /* NSDate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSDate.swift; sourceTree = "<group>"; };
43D533BB1CFD1DD7009E3085 /* WatchApp Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "WatchApp Extension.entitlements"; sourceTree = "<group>"; };
43DBF04B1C93B8D700B3C386 /* BolusViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BolusViewController.swift; sourceTree = "<group>"; };
43DBF0501C93C14100B3C386 /* PopoverInNavigationControllerSegue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PopoverInNavigationControllerSegue.swift; sourceTree = "<group>"; };
43DBF0521C93EC8200B3C386 /* DeviceDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeviceDataManager.swift; sourceTree = "<group>"; };
43DBF0541C93ED3000B3C386 /* DeviceDataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeviceDataManager.swift; sourceTree = "<group>"; };
43DBF0561C93F6EB00B3C386 /* ReservoirTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReservoirTableViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -464,7 +462,6 @@
43776F951B8022E90074EA36 /* Main.storyboard */,
43F5C2E41B93C5D4003EB13D /* Managers */,
43757D131C06F26C00910CB9 /* Models */,
43DBF04F1C93C10F00B3C386 /* Transitions */,
43F5C2CE1B92A2A0003EB13D /* View Controllers */,
43F5C2CF1B92A2ED003EB13D /* Views */,
);
Expand Down Expand Up @@ -506,14 +503,6 @@
name = "Supporting Files";
sourceTree = "<group>";
};
43DBF04F1C93C10F00B3C386 /* Transitions */ = {
isa = PBXGroup;
children = (
43DBF0501C93C14100B3C386 /* PopoverInNavigationControllerSegue.swift */,
);
path = Transitions;
sourceTree = "<group>";
};
43DE92571C5479C3001FFDE1 /* Models */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -964,7 +953,6 @@
436A0DA51D236A2A00104B24 /* LoopError.swift in Sources */,
437CEEC01CD6FCD8003C8C80 /* BasalRateHUDView.swift in Sources */,
43E2D8C61D204678004DA55F /* KeychainManager.swift in Sources */,
43DBF0511C93C14100B3C386 /* PopoverInNavigationControllerSegue.swift in Sources */,
437CEECA1CD84DB7003C8C80 /* BatteryLevelHUDView.swift in Sources */,
43F78D261C8FC000002152D1 /* DoseMath.swift in Sources */,
4331E07A1C85650D00FBE832 /* ChartAxisValueDoubleLog.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "43F78D2A1C8FC58F002152D1"
BlueprintIdentifier = "43E2D90A1D20C581004DA55F"
BuildableName = "LoopTests.xctest"
BlueprintName = "LoopTests"
ReferencedContainer = "container:Loop.xcodeproj">
Expand Down
74 changes: 61 additions & 13 deletions Loop/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
</constraints>
</view>
</objects>
<point key="canvasLocation" x="1641" y="680"/>
<point key="canvasLocation" x="2453" y="680"/>
</scene>
<!--InsulinKit-->
<scene sceneID="n8N-hY-V0o">
Expand All @@ -158,7 +158,7 @@
</viewControllerPlaceholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="MjI-5q-y5n" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1386" y="-766"/>
<point key="canvasLocation" x="1386" y="-594"/>
</scene>
<!--CarbKit-->
<scene sceneID="4Ej-lH-3ai">
Expand All @@ -168,7 +168,7 @@
</viewControllerPlaceholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="erV-pI-Wmo" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1380" y="-869"/>
<point key="canvasLocation" x="1380" y="-697"/>
</scene>
<!--Status-->
<scene sceneID="dRe-fy-po5">
Expand Down Expand Up @@ -393,25 +393,19 @@
<toolbarItems>
<barButtonItem title="Add Meal" id="lpE-RX-jWF">
<connections>
<segue destination="Td9-bv-106" kind="popoverPresentation" identifier="CarbEntryEditViewController" customClass="PopoverInNavigationControllerSegue" customModule="Loop" customModuleProvider="target" popoverAnchorBarButtonItem="lpE-RX-jWF" id="viB-eQ-p7y">
<popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
</segue>
<segue destination="YJ1-01-QoA" kind="presentation" identifier="CarbEntryEditViewController" id="viB-eQ-p7y"/>
</connections>
</barButtonItem>
<barButtonItem style="plain" systemItem="flexibleSpace" id="ava-EZ-v6i"/>
<barButtonItem title="Bolus" id="2kb-DB-Vag">
<connections>
<segue destination="WhH-Np-jCn" kind="popoverPresentation" identifier="BolusViewController" customClass="PopoverInNavigationControllerSegue" customModule="Loop" customModuleProvider="target" popoverAnchorBarButtonItem="2kb-DB-Vag" id="PC7-vP-CUY">
<popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
</segue>
<segue destination="m6L-HW-ENd" kind="presentation" identifier="BolusViewController" id="PC7-vP-CUY"/>
</connections>
</barButtonItem>
<barButtonItem style="plain" systemItem="flexibleSpace" id="d5h-bj-8ek"/>
<barButtonItem title="Settings" id="PHJ-4n-qiF">
<connections>
<segue destination="4cb-Yq-02o" kind="popoverPresentation" customClass="PopoverInNavigationControllerSegue" customModule="Loop" customModuleProvider="target" popoverAnchorBarButtonItem="PHJ-4n-qiF" id="JAY-Kf-UMv">
<popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
</segue>
<segue destination="Fr0-ut-OuL" kind="presentation" id="JAY-Kf-UMv"/>
</connections>
</barButtonItem>
</toolbarItems>
Expand Down Expand Up @@ -603,7 +597,61 @@
</viewControllerPlaceholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="hft-ry-meg" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1444.5" y="-671"/>
<point key="canvasLocation" x="2256.5" y="-1071"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="4kH-I0-mGD">
<objects>
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="m6L-HW-ENd" sceneMemberID="viewController">
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" id="g59-B7-MLI">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<nil name="viewControllers"/>
<connections>
<segue destination="WhH-Np-jCn" kind="relationship" relationship="rootViewController" id="3MQ-PQ-Ot4"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="VQT-96-wh7" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1641" y="-204"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="NT7-CC-bRN">
<objects>
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="YJ1-01-QoA" sceneMemberID="viewController">
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" id="G1F-Va-gO2">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<nil name="viewControllers"/>
<connections>
<segue destination="Td9-bv-106" kind="relationship" relationship="rootViewController" id="76q-VW-DX3"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="3Ql-YC-B6I" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1641" y="-1071"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="vZz-u1-Q2B">
<objects>
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="Fr0-ut-OuL" sceneMemberID="viewController">
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" id="5cJ-yb-cD1">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<nil name="viewControllers"/>
<connections>
<segue destination="4cb-Yq-02o" kind="relationship" relationship="rootViewController" id="6BC-rd-2iw"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="hu2-qg-8CR" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1641" y="680"/>
</scene>
</scenes>
<resources>
Expand Down
4 changes: 2 additions & 2 deletions Loop/Managers/DeviceDataManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import HealthKit
import InsulinKit
import LoopKit
import MinimedKit
import NightscoutUploadKit
import RileyLinkKit
import ShareClient
import xDripG5
import NightscoutUploadKit

enum State<T> {
private enum State<T> {
case NeedsConfiguration
case Ready(T)
}
Expand Down
23 changes: 0 additions & 23 deletions Loop/Transitions/PopoverInNavigationControllerSegue.swift
View file
Open in desktop

This file was deleted.