Skip to content

Commit 1196bd5

Browse files
gcutrinigcutrini
authored
Merge pull request #97 from OpenStack-mobile/develop
Release v2.3.2
2 parents 30cace1 + 322419d commit 1196bd5

22 files changed

+137
-71
lines changed

‎OpenStack Summit/CoreSummit/FeedbackRequest.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public extension Store {
9292

9393
managedObject.averageFeedback = averageFeedback
9494

95-
try context.validateAndSave()
95+
try context.save()
9696
}
9797
}
9898

‎OpenStack Summit/CoreSummit/Level.swift‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
//
2+
// Level.swift
3+
// OpenStack Summit
4+
//
5+
// Created by Gabriel Horacio Cutrini on 4/18/17.
6+
// Copyright © 2017 OpenStack. All rights reserved.
7+
//
8+
9+
public enum Level: String, Comparable {
10+
11+
case Beginner
12+
case Intermediate
13+
case Advanced
14+
case NotApplicable = "N/A"
15+
16+
public var order: Int {
17+
18+
switch self {
19+
case .Beginner: return 0
20+
case .Intermediate: return 1
21+
case .Advanced: return 2
22+
case .NotApplicable: return 3
23+
}
24+
}
25+
}
26+
27+
// MARK: - Comparable
28+
29+
public func == (lhs: Level, rhs: Level) -> Bool {
30+
31+
return lhs.order == rhs.order
32+
}
33+
34+
public func < (lhs: Level, rhs: Level) -> Bool {
35+
36+
return lhs.order < rhs.order
37+
}

‎OpenStack Summit/CoreSummit/Presentation.swift‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,6 @@ public struct Presentation: Unique, Equatable {
1717
public var speakers: Set<Identifier>
1818
}
1919

20-
// MARK: - Supporting Types
21-
22-
public extension Presentation {
23-
24-
public enum Level: String {
25-
26-
case Beginner
27-
case Intermediate
28-
case Advanced
29-
case NotApplicable = "N/A"
30-
}
31-
}
32-
3320
// MARK: - Equatable
3421

3522
public func == (lhs: Presentation, rhs: Presentation) -> Bool {

‎OpenStack Summit/CoreSummit/PresentationDataUpdate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public struct PresentationDataUpdate: Unique {
1010

1111
public let identifier: Identifier
1212

13-
public let level: Presentation.Level?
13+
public let level: Level?
1414

1515
public let moderator: Identifier?
1616

‎OpenStack Summit/CoreSummit/PresentationDataUpdateJSON.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ extension PresentationDataUpdate: JSONDecodable {
3636

3737
if let levelString = JSONObject[JSONKey.level.rawValue]?.rawValue as? String {
3838

39-
guard let level = Presentation.Level(rawValue: levelString)
39+
guard let level = Level(rawValue: levelString)
4040
else { return nil }
4141

4242
self.level = level

‎OpenStack Summit/OpenStack Summit.xcodeproj/project.pbxproj‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,6 +1074,10 @@
10741074
9DABFF941DA6A75B00B3101A /* VenueFloorJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D1CE1071DA48BB60064B3B1 /* VenueFloorJSON.swift */; };
10751075
9DABFF951DA6A75C00B3101A /* VenueFloorJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D1CE1071DA48BB60064B3B1 /* VenueFloorJSON.swift */; };
10761076
9DABFF961DA6A75E00B3101A /* VenueFloorJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D1CE1071DA48BB60064B3B1 /* VenueFloorJSON.swift */; };
1077+
9DEF130D1EA67153001798D4 /* Level.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DEF130C1EA67153001798D4 /* Level.swift */; };
1078+
9DEF130E1EA67153001798D4 /* Level.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DEF130C1EA67153001798D4 /* Level.swift */; };
1079+
9DEF130F1EA67153001798D4 /* Level.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DEF130C1EA67153001798D4 /* Level.swift */; };
1080+
9DEF13101EA67153001798D4 /* Level.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DEF130C1EA67153001798D4 /* Level.swift */; };
10771081
/* End PBXBuildFile section */
10781082

10791083
/* Begin PBXContainerItemProxy section */
@@ -1758,6 +1762,7 @@
17581762
6EFE54EB1E612BDD005EAB86 /* JSON.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JSON.framework; sourceTree = "<group>"; };
17591763
6EFE54EF1E612BDD005EAB86 /* SwiftFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftFoundation.framework; sourceTree = "<group>"; };
17601764
6EFE54F11E612BDD005EAB86 /* XCDYouTubeKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = XCDYouTubeKit.framework; sourceTree = "<group>"; };
1765+
9D13D0A51EB39C3D00991DD2 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
17611766
9D1CE1051DA43DCF0064B3B1 /* VenueFloor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VenueFloor.swift; sourceTree = "<group>"; };
17621767
9D1CE1071DA48BB60064B3B1 /* VenueFloorJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VenueFloorJSON.swift; sourceTree = "<group>"; };
17631768
9D4B1C231E84B01F00F98ECB /* AffiliationOrganization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AffiliationOrganization.swift; sourceTree = "<group>"; };
@@ -1770,6 +1775,7 @@
17701775
9D6AADA81DBE4ABE0057888E /* DataUpdates6.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = DataUpdates6.json; sourceTree = "<group>"; };
17711776
9D6AADAB1DBE563A0057888E /* VenueRoomDataUpdateJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VenueRoomDataUpdateJSON.swift; sourceTree = "<group>"; };
17721777
9D6AADAD1DBE56CB0057888E /* VenueRoomDataUpdate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VenueRoomDataUpdate.swift; sourceTree = "<group>"; };
1778+
9DEF130C1EA67153001798D4 /* Level.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Level.swift; sourceTree = "<group>"; };
17731779
/* End PBXFileReference section */
17741780

17751781
/* Begin PBXFrameworksBuildPhase section */
@@ -2010,9 +2016,9 @@
20102016
6E9B22D71D40171800D25271 /* Venue.storyboard */,
20112017
6E8D109C1DF8957100A0BBDC /* Teams.storyboard */,
20122018
6EEED02C1E3A4DAD00795B3D /* Notifications.storyboard */,
2019+
6ED495821D792F7800749940 /* Debug.entitlements */,
20132020
6E5BE4191D76996600E323D3 /* Beta.entitlements */,
20142021
6ED495811D792F7800749940 /* Release.entitlements */,
2015-
6ED495821D792F7800749940 /* Debug.entitlements */,
20162022
6E104D3D1D1061AC00541E84 /* Info.plist */,
20172023
6E5DEDB51E2D300C00F45602 /* GoogleServices */,
20182024
6EF147ED1D1357A100D5EEF9 /* Controller */,
@@ -2107,6 +2113,7 @@
21072113
6E10A52B1D10675C008CBD0C /* NonConfirmedAttendee.swift */,
21082114
6E10A52D1D10675C008CBD0C /* Person.swift */,
21092115
6E10A52E1D10675C008CBD0C /* Presentation.swift */,
2116+
9DEF130C1EA67153001798D4 /* Level.swift */,
21102117
6E10A5301D10675C008CBD0C /* Speaker.swift */,
21112118
6E10A5481D10675C008CBD0C /* Summit.swift */,
21122119
6E10A5491D10675C008CBD0C /* Attendee.swift */,
@@ -2403,8 +2410,9 @@
24032410
6E5DEDB51E2D300C00F45602 /* GoogleServices */ = {
24042411
isa = PBXGroup;
24052412
children = (
2406-
6EEED02F1E3A60E900795B3D /* Beta */,
24072413
6E5DEDB61E2D300C00F45602 /* Debug */,
2414+
6EEED02F1E3A60E900795B3D /* Beta */,
2415+
9D13D0A41EB39C3D00991DD2 /* Release */,
24082416
);
24092417
path = GoogleServices;
24102418
sourceTree = SOURCE_ROOT;
@@ -2937,6 +2945,14 @@
29372945
path = ../../Carthage/Build/Mac;
29382946
sourceTree = "<group>";
29392947
};
2948+
9D13D0A41EB39C3D00991DD2 /* Release */ = {
2949+
isa = PBXGroup;
2950+
children = (
2951+
9D13D0A51EB39C3D00991DD2 /* GoogleService-Info.plist */,
2952+
);
2953+
path = Release;
2954+
sourceTree = "<group>";
2955+
};
29402956
/* End PBXGroup section */
29412957

29422958
/* Begin PBXHeadersBuildPhase section */
@@ -3980,6 +3996,7 @@
39803996
6EE954551E92A0BC006B1330 /* Compound.swift in Sources */,
39813997
6EB1FDF51E1C073E0048045D /* TeamInvitationRequest.swift in Sources */,
39823998
6EBC49051E1394FE0077806B /* TeamMessageJSON.swift in Sources */,
3999+
9DEF13101EA67153001798D4 /* Level.swift in Sources */,
39834000
9DABFF911DA6A74C00B3101A /* VenueFloor.swift in Sources */,
39844001
6E0B5F0A1D77C8950005F6CE /* Video.swift in Sources */,
39854002
6E1BCFF11E37A5FE00059E94 /* MemberJSON.swift in Sources */,
@@ -4169,6 +4186,7 @@
41694186
6EF4F86B1DC8D1D300D31A99 /* CoreDataDecodable.swift in Sources */,
41704187
6E10A58C1D10675D008CBD0C /* Attendee.swift in Sources */,
41714188
6EFC6E691D2322E70087057A /* EventScheduleRequest.swift in Sources */,
4189+
9DEF130D1EA67153001798D4 /* Level.swift in Sources */,
41724190
6E10A55F1D10675D008CBD0C /* ErrorValue.swift in Sources */,
41734191
6E570A361D67753D00189992 /* PresentationDataUpdate.swift in Sources */,
41744192
9D6AADB21DBE58030057888E /* VenueRoomDataUpdateJSON.swift in Sources */,
@@ -4401,6 +4419,7 @@
44014419
6E2923D21D7AF8C900D14F0A /* Configuration.swift in Sources */,
44024420
6E2923D31D7AF8C900D14F0A /* EventType.swift in Sources */,
44034421
6E2923D41D7AF8C900D14F0A /* Venue.swift in Sources */,
4422+
9DEF130F1EA67153001798D4 /* Level.swift in Sources */,
44044423
6E2923D51D7AF8C900D14F0A /* TicketTypeJSON.swift in Sources */,
44054424
6E2923D61D7AF8C900D14F0A /* TicketOrderRequest.swift in Sources */,
44064425
6E99B8AB1DC7D68F009CE28D /* Model.xcdatamodeld in Sources */,
@@ -4533,6 +4552,7 @@
45334552
6E7557B81E58C48C003B6844 /* CoreDataDecodable.swift in Sources */,
45344553
6E7557B91E58C48C003B6844 /* Attendee.swift in Sources */,
45354554
6E7557BA1E58C48C003B6844 /* EventScheduleRequest.swift in Sources */,
4555+
9DEF130E1EA67153001798D4 /* Level.swift in Sources */,
45364556
6E7557BB1E58C48C003B6844 /* ErrorValue.swift in Sources */,
45374557
6E7557BC1E58C48C003B6844 /* PresentationDataUpdate.swift in Sources */,
45384558
6E7557BD1E58C48C003B6844 /* VenueRoomDataUpdateJSON.swift in Sources */,

‎OpenStack Summit/OpenStack Summit/AppDelegate.swift‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,12 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandl
167167
// Print full message.
168168
print("Recieved remote notification: \(userInfo)")
169169

170-
PushNotificationManager.shared.process(userInfo as! [String: String])
170+
var notification = userInfo
171+
notification.removeValueForKey("aps")
172+
173+
if let notification = notification as? [String: String] {
174+
PushNotificationManager.shared.process(notification)
175+
}
171176

172177
completionHandler(.NewData)
173178
}

‎OpenStack Summit/OpenStack Summit/AttendeeConfirmViewController.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
277277

278278
let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.attendeeConfirmSelectionTableViewCell)!
279279

280+
cell.pickerView.reloadAllComponents()
281+
280282
return cell
281283

282284
case .action:

0 commit comments

Comments
 (0)