Skip to content

Commit 544c363

Browse files
author
Julian Locke
committed
Pull stone and spec and regenerate routes
1 parent 56a73c4 commit 544c363

31 files changed

+1156
-102
lines changed

‎.jazzy.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,6 +1030,9 @@
10301030
"DBTEAMLOGDropboxPasswordsExportedType",
10311031
"DBTEAMLOGDropboxPasswordsNewDeviceEnrolledDetails",
10321032
"DBTEAMLOGDropboxPasswordsNewDeviceEnrolledType",
1033+
"DBTEAMLOGDropboxPasswordsPolicy",
1034+
"DBTEAMLOGDropboxPasswordsPolicyChangedDetails",
1035+
"DBTEAMLOGDropboxPasswordsPolicyChangedType",
10331036
"DBTEAMLOGDurationLogInfo",
10341037
"DBTEAMLOGEmailIngestPolicy",
10351038
"DBTEAMLOGEmailIngestPolicyChangedDetails",
@@ -3047,6 +3050,9 @@
30473050
"DBTEAMLOGDropboxPasswordsExportedTypeSerializer",
30483051
"DBTEAMLOGDropboxPasswordsNewDeviceEnrolledDetailsSerializer",
30493052
"DBTEAMLOGDropboxPasswordsNewDeviceEnrolledTypeSerializer",
3053+
"DBTEAMLOGDropboxPasswordsPolicySerializer",
3054+
"DBTEAMLOGDropboxPasswordsPolicyChangedDetailsSerializer",
3055+
"DBTEAMLOGDropboxPasswordsPolicyChangedTypeSerializer",
30503056
"DBTEAMLOGDurationLogInfoSerializer",
30513057
"DBTEAMLOGEmailIngestPolicySerializer",
30523058
"DBTEAMLOGEmailIngestPolicyChangedDetailsSerializer",

‎Source/ObjectiveDropboxOfficial/Shared/Generated/ApiObjects/FileProperties/Headers/DBFILEPROPERTIESLookupError.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ typedef NS_CLOSED_ENUM(NSInteger, DBFILEPROPERTIESLookupErrorTag){
4242
/// isn't a folder.
4343
DBFILEPROPERTIESLookupErrorNotFolder,
4444

45-
/// The file cannot be transferred because the content is restricted. For
46-
/// example, sometimes there are legal restrictions due to copyright claims.
45+
/// The file cannot be transferred because the content is restricted. For
46+
/// example, we might restrict a file due to legal requirements.
4747
DBFILEPROPERTIESLookupErrorRestrictedContent,
4848

4949
/// (no description).
@@ -103,8 +103,8 @@ typedef NS_CLOSED_ENUM(NSInteger, DBFILEPROPERTIESLookupErrorTag){
103103
/// Initializes union class with tag state of "restricted_content".
104104
///
105105
/// Description of the "restricted_content" tag state: The file cannot be
106-
/// transferred because the content is restricted. For example, sometimes there
107-
/// are legal restrictions due to copyright claims.
106+
/// transferred because the content is restricted. For example, we might
107+
/// restrict a file due to legal requirements.
108108
///
109109
/// @return An initialized instance.
110110
///

‎Source/ObjectiveDropboxOfficial/Shared/Generated/ApiObjects/Files/DBFilesObjects.m‎

Lines changed: 77 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4885,7 +4885,8 @@ @implementation DBFILESMetadata
48854885
- (instancetype)initWithName:(NSString *)name
48864886
pathLower:(NSString *)pathLower
48874887
pathDisplay:(NSString *)pathDisplay
4888-
parentSharedFolderId:(NSString *)parentSharedFolderId {
4888+
parentSharedFolderId:(NSString *)parentSharedFolderId
4889+
previewUrl:(NSString *)previewUrl {
48894890
[DBStoneValidators nonnullValidator:nil](name);
48904891
[DBStoneValidators
48914892
nullableValidator:[DBStoneValidators stringValidator:nil maxLength:nil pattern:@"[-_0-9a-zA-Z:]+"]](
@@ -4897,12 +4898,13 @@ - (instancetype)initWithName:(NSString *)name
48974898
_pathLower = pathLower;
48984899
_pathDisplay = pathDisplay;
48994900
_parentSharedFolderId = parentSharedFolderId;
4901+
_previewUrl = previewUrl;
49004902
}
49014903
return self;
49024904
}
49034905

49044906
- (instancetype)initWithName:(NSString *)name {
4905-
return [self initWithName:name pathLower:nil pathDisplay:nil parentSharedFolderId:nil];
4907+
return [self initWithName:name pathLower:nil pathDisplay:nil parentSharedFolderId:nil previewUrl:nil];
49064908
}
49074909

49084910
#pragma mark - Serialization methods
@@ -4945,6 +4947,9 @@ - (NSUInteger)hash {
49454947
if (self.parentSharedFolderId != nil) {
49464948
result = prime * result + [self.parentSharedFolderId hash];
49474949
}
4950+
if (self.previewUrl != nil) {
4951+
result = prime * result + [self.previewUrl hash];
4952+
}
49484953

49494954
return prime * result;
49504955
}
@@ -4983,6 +4988,11 @@ - (BOOL)isEqualToMetadata:(DBFILESMetadata *)aMetadata {
49834988
return NO;
49844989
}
49854990
}
4991+
if (self.previewUrl) {
4992+
if (![self.previewUrl isEqual:aMetadata.previewUrl]) {
4993+
return NO;
4994+
}
4995+
}
49864996
return YES;
49874997
}
49884998

@@ -5005,6 +5015,9 @@ @implementation DBFILESMetadataSerializer
50055015
if (valueObj.parentSharedFolderId) {
50065016
jsonDict[@"parent_shared_folder_id"] = valueObj.parentSharedFolderId;
50075017
}
5018+
if (valueObj.previewUrl) {
5019+
jsonDict[@"preview_url"] = valueObj.previewUrl;
5020+
}
50085021

50095022
if ([valueObj isKindOfClass:[DBFILESFileMetadata class]]) {
50105023
NSDictionary *subTypeFields = [DBFILESFileMetadataSerializer serialize:(DBFILESFileMetadata *)valueObj];
@@ -5062,21 +5075,25 @@ @implementation DBFILESDeletedMetadata
50625075
- (instancetype)initWithName:(NSString *)name
50635076
pathLower:(NSString *)pathLower
50645077
pathDisplay:(NSString *)pathDisplay
5065-
parentSharedFolderId:(NSString *)parentSharedFolderId {
5078+
parentSharedFolderId:(NSString *)parentSharedFolderId
5079+
previewUrl:(NSString *)previewUrl {
50665080
[DBStoneValidators nonnullValidator:nil](name);
50675081
[DBStoneValidators
50685082
nullableValidator:[DBStoneValidators stringValidator:nil maxLength:nil pattern:@"[-_0-9a-zA-Z:]+"]](
50695083
parentSharedFolderId);
50705084

5071-
self =
5072-
[super initWithName:name pathLower:pathLower pathDisplay:pathDisplay parentSharedFolderId:parentSharedFolderId];
5085+
self = [super initWithName:name
5086+
pathLower:pathLower
5087+
pathDisplay:pathDisplay
5088+
parentSharedFolderId:parentSharedFolderId
5089+
previewUrl:previewUrl];
50735090
if (self) {
50745091
}
50755092
return self;
50765093
}
50775094

50785095
- (instancetype)initWithName:(NSString *)name {
5079-
return [self initWithName:name pathLower:nil pathDisplay:nil parentSharedFolderId:nil];
5096+
return [self initWithName:name pathLower:nil pathDisplay:nil parentSharedFolderId:nil previewUrl:nil];
50805097
}
50815098

50825099
#pragma mark - Serialization methods
@@ -5119,6 +5136,9 @@ - (NSUInteger)hash {
51195136
if (self.parentSharedFolderId != nil) {
51205137
result = prime * result + [self.parentSharedFolderId hash];
51215138
}
5139+
if (self.previewUrl != nil) {
5140+
result = prime * result + [self.previewUrl hash];
5141+
}
51225142

51235143
return prime * result;
51245144
}
@@ -5157,6 +5177,11 @@ - (BOOL)isEqualToDeletedMetadata:(DBFILESDeletedMetadata *)aDeletedMetadata {
51575177
return NO;
51585178
}
51595179
}
5180+
if (self.previewUrl) {
5181+
if (![self.previewUrl isEqual:aDeletedMetadata.previewUrl]) {
5182+
return NO;
5183+
}
5184+
}
51605185
return YES;
51615186
}
51625187

@@ -5179,6 +5204,9 @@ @implementation DBFILESDeletedMetadataSerializer
51795204
if (valueObj.parentSharedFolderId) {
51805205
jsonDict[@"parent_shared_folder_id"] = valueObj.parentSharedFolderId;
51815206
}
5207+
if (valueObj.previewUrl) {
5208+
jsonDict[@"preview_url"] = valueObj.previewUrl;
5209+
}
51825210

51835211
return [jsonDict count] > 0 ? jsonDict : nil;
51845212
}
@@ -5188,11 +5216,13 @@ + (DBFILESDeletedMetadata *)deserialize:(NSDictionary<NSString *, id> *)valueDic
51885216
NSString *pathLower = valueDict[@"path_lower"] ?: nil;
51895217
NSString *pathDisplay = valueDict[@"path_display"] ?: nil;
51905218
NSString *parentSharedFolderId = valueDict[@"parent_shared_folder_id"] ?: nil;
5219+
NSString *previewUrl = valueDict[@"preview_url"] ?: nil;
51915220

51925221
return [[DBFILESDeletedMetadata alloc] initWithName:name
51935222
pathLower:pathLower
51945223
pathDisplay:pathDisplay
5195-
parentSharedFolderId:parentSharedFolderId];
5224+
parentSharedFolderId:parentSharedFolderId
5225+
previewUrl:previewUrl];
51965226
}
51975227

51985228
@end
@@ -7606,6 +7636,7 @@ - (instancetype)initWithName:(NSString *)name
76067636
pathLower:(NSString *)pathLower
76077637
pathDisplay:(NSString *)pathDisplay
76087638
parentSharedFolderId:(NSString *)parentSharedFolderId
7639+
previewUrl:(NSString *)previewUrl
76097640
mediaInfo:(DBFILESMediaInfo *)mediaInfo
76107641
symlinkInfo:(DBFILESSymlinkInfo *)symlinkInfo
76117642
sharingInfo:(DBFILESFileSharingInfo *)sharingInfo
@@ -7631,8 +7662,11 @@ - (instancetype)initWithName:(NSString *)name
76317662
[DBStoneValidators
76327663
nullableValidator:[DBStoneValidators stringValidator:@(64) maxLength:@(64) pattern:nil]](contentHash);
76337664

7634-
self =
7635-
[super initWithName:name pathLower:pathLower pathDisplay:pathDisplay parentSharedFolderId:parentSharedFolderId];
7665+
self = [super initWithName:name
7666+
pathLower:pathLower
7667+
pathDisplay:pathDisplay
7668+
parentSharedFolderId:parentSharedFolderId
7669+
previewUrl:previewUrl];
76367670
if (self) {
76377671
_id_ = id_;
76387672
_clientModified = clientModified;
@@ -7667,6 +7701,7 @@ - (instancetype)initWithName:(NSString *)name
76677701
pathLower:nil
76687702
pathDisplay:nil
76697703
parentSharedFolderId:nil
7704+
previewUrl:nil
76707705
mediaInfo:nil
76717706
symlinkInfo:nil
76727707
sharingInfo:nil
@@ -7723,6 +7758,9 @@ - (NSUInteger)hash {
77237758
if (self.parentSharedFolderId != nil) {
77247759
result = prime * result + [self.parentSharedFolderId hash];
77257760
}
7761+
if (self.previewUrl != nil) {
7762+
result = prime * result + [self.previewUrl hash];
7763+
}
77267764
if (self.mediaInfo != nil) {
77277765
result = prime * result + [self.mediaInfo hash];
77287766
}
@@ -7801,6 +7839,11 @@ - (BOOL)isEqualToFileMetadata:(DBFILESFileMetadata *)aFileMetadata {
78017839
return NO;
78027840
}
78037841
}
7842+
if (self.previewUrl) {
7843+
if (![self.previewUrl isEqual:aFileMetadata.previewUrl]) {
7844+
return NO;
7845+
}
7846+
}
78047847
if (self.mediaInfo) {
78057848
if (![self.mediaInfo isEqual:aFileMetadata.mediaInfo]) {
78067849
return NO;
@@ -7873,6 +7916,9 @@ @implementation DBFILESFileMetadataSerializer
78737916
if (valueObj.parentSharedFolderId) {
78747917
jsonDict[@"parent_shared_folder_id"] = valueObj.parentSharedFolderId;
78757918
}
7919+
if (valueObj.previewUrl) {
7920+
jsonDict[@"preview_url"] = valueObj.previewUrl;
7921+
}
78767922
if (valueObj.mediaInfo) {
78777923
jsonDict[@"media_info"] = [DBFILESMediaInfoSerializer serialize:valueObj.mediaInfo];
78787924
}
@@ -7918,6 +7964,7 @@ + (DBFILESFileMetadata *)deserialize:(NSDictionary<NSString *, id> *)valueDict {
79187964
NSString *pathLower = valueDict[@"path_lower"] ?: nil;
79197965
NSString *pathDisplay = valueDict[@"path_display"] ?: nil;
79207966
NSString *parentSharedFolderId = valueDict[@"parent_shared_folder_id"] ?: nil;
7967+
NSString *previewUrl = valueDict[@"preview_url"] ?: nil;
79217968
DBFILESMediaInfo *mediaInfo =
79227969
valueDict[@"media_info"] ? [DBFILESMediaInfoSerializer deserialize:valueDict[@"media_info"]] : nil;
79237970
DBFILESSymlinkInfo *symlinkInfo =
@@ -7948,6 +7995,7 @@ + (DBFILESFileMetadata *)deserialize:(NSDictionary<NSString *, id> *)valueDict {
79487995
pathLower:pathLower
79497996
pathDisplay:pathDisplay
79507997
parentSharedFolderId:parentSharedFolderId
7998+
previewUrl:previewUrl
79517999
mediaInfo:mediaInfo
79528000
symlinkInfo:symlinkInfo
79538001
sharingInfo:sharingInfo
@@ -8385,6 +8433,7 @@ - (instancetype)initWithName:(NSString *)name
83858433
pathLower:(NSString *)pathLower
83868434
pathDisplay:(NSString *)pathDisplay
83878435
parentSharedFolderId:(NSString *)parentSharedFolderId
8436+
previewUrl:(NSString *)previewUrl
83888437
sharedFolderId:(NSString *)sharedFolderId
83898438
sharingInfo:(DBFILESFolderSharingInfo *)sharingInfo
83908439
propertyGroups:(NSArray<DBFILEPROPERTIESPropertyGroup *> *)propertyGroups {
@@ -8400,8 +8449,11 @@ - (instancetype)initWithName:(NSString *)name
84008449
maxItems:nil
84018450
itemValidator:[DBStoneValidators nonnullValidator:nil]]](propertyGroups);
84028451

8403-
self =
8404-
[super initWithName:name pathLower:pathLower pathDisplay:pathDisplay parentSharedFolderId:parentSharedFolderId];
8452+
self = [super initWithName:name
8453+
pathLower:pathLower
8454+
pathDisplay:pathDisplay
8455+
parentSharedFolderId:parentSharedFolderId
8456+
previewUrl:previewUrl];
84058457
if (self) {
84068458
_id_ = id_;
84078459
_sharedFolderId = sharedFolderId;
@@ -8417,6 +8469,7 @@ - (instancetype)initWithName:(NSString *)name id_:(NSString *)id_ {
84178469
pathLower:nil
84188470
pathDisplay:nil
84198471
parentSharedFolderId:nil
8472+
previewUrl:nil
84208473
sharedFolderId:nil
84218474
sharingInfo:nil
84228475
propertyGroups:nil];
@@ -8463,6 +8516,9 @@ - (NSUInteger)hash {
84638516
if (self.parentSharedFolderId != nil) {
84648517
result = prime * result + [self.parentSharedFolderId hash];
84658518
}
8519+
if (self.previewUrl != nil) {
8520+
result = prime * result + [self.previewUrl hash];
8521+
}
84668522
if (self.sharedFolderId != nil) {
84678523
result = prime * result + [self.sharedFolderId hash];
84688524
}
@@ -8513,6 +8569,11 @@ - (BOOL)isEqualToFolderMetadata:(DBFILESFolderMetadata *)aFolderMetadata {
85138569
return NO;
85148570
}
85158571
}
8572+
if (self.previewUrl) {
8573+
if (![self.previewUrl isEqual:aFolderMetadata.previewUrl]) {
8574+
return NO;
8575+
}
8576+
}
85168577
if (self.sharedFolderId) {
85178578
if (![self.sharedFolderId isEqual:aFolderMetadata.sharedFolderId]) {
85188579
return NO;
@@ -8551,6 +8612,9 @@ @implementation DBFILESFolderMetadataSerializer
85518612
if (valueObj.parentSharedFolderId) {
85528613
jsonDict[@"parent_shared_folder_id"] = valueObj.parentSharedFolderId;
85538614
}
8615+
if (valueObj.previewUrl) {
8616+
jsonDict[@"preview_url"] = valueObj.previewUrl;
8617+
}
85548618
if (valueObj.sharedFolderId) {
85558619
jsonDict[@"shared_folder_id"] = valueObj.sharedFolderId;
85568620
}
@@ -8574,6 +8638,7 @@ + (DBFILESFolderMetadata *)deserialize:(NSDictionary<NSString *, id> *)valueDict
85748638
NSString *pathLower = valueDict[@"path_lower"] ?: nil;
85758639
NSString *pathDisplay = valueDict[@"path_display"] ?: nil;
85768640
NSString *parentSharedFolderId = valueDict[@"parent_shared_folder_id"] ?: nil;
8641+
NSString *previewUrl = valueDict[@"preview_url"] ?: nil;
85778642
NSString *sharedFolderId = valueDict[@"shared_folder_id"] ?: nil;
85788643
DBFILESFolderSharingInfo *sharingInfo =
85798644
valueDict[@"sharing_info"] ? [DBFILESFolderSharingInfoSerializer deserialize:valueDict[@"sharing_info"]] : nil;
@@ -8590,6 +8655,7 @@ + (DBFILESFolderMetadata *)deserialize:(NSDictionary<NSString *, id> *)valueDict
85908655
pathLower:pathLower
85918656
pathDisplay:pathDisplay
85928657
parentSharedFolderId:parentSharedFolderId
8658+
previewUrl:previewUrl
85938659
sharedFolderId:sharedFolderId
85948660
sharingInfo:sharingInfo
85958661
propertyGroups:propertyGroups];

‎Source/ObjectiveDropboxOfficial/Shared/Generated/ApiObjects/Files/Headers/DBFILESDeletedMetadata.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,15 @@ NS_ASSUME_NONNULL_BEGIN
4848
/// @param parentSharedFolderId Please use `parentSharedFolderId` in
4949
/// `DBFILESFileSharingInfo` or `parentSharedFolderId` in
5050
/// `DBFILESFolderSharingInfo` instead.
51+
/// @param previewUrl The preview URL of the file.
5152
///
5253
/// @return An initialized instance.
5354
///
5455
- (instancetype)initWithName:(NSString *)name
5556
pathLower:(nullable NSString *)pathLower
5657
pathDisplay:(nullable NSString *)pathDisplay
57-
parentSharedFolderId:(nullable NSString *)parentSharedFolderId;
58+
parentSharedFolderId:(nullable NSString *)parentSharedFolderId
59+
previewUrl:(nullable NSString *)previewUrl;
5860

5961
///
6062
/// Convenience constructor (exposes only non-nullable instance variables with

‎Source/ObjectiveDropboxOfficial/Shared/Generated/ApiObjects/Files/Headers/DBFILESFileMetadata.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ NS_ASSUME_NONNULL_BEGIN
120120
/// @param parentSharedFolderId Please use `parentSharedFolderId` in
121121
/// `DBFILESFileSharingInfo` or `parentSharedFolderId` in
122122
/// `DBFILESFolderSharingInfo` instead.
123+
/// @param previewUrl The preview URL of the file.
123124
/// @param mediaInfo Additional information if the file is a photo or video.
124125
/// This field will not be set on entries returned by `listFolder`,
125126
/// `listFolderContinue`, or `getThumbnailBatch`, starting December 2, 2019.
@@ -154,6 +155,7 @@ NS_ASSUME_NONNULL_BEGIN
154155
pathLower:(nullable NSString *)pathLower
155156
pathDisplay:(nullable NSString *)pathDisplay
156157
parentSharedFolderId:(nullable NSString *)parentSharedFolderId
158+
previewUrl:(nullable NSString *)previewUrl
157159
mediaInfo:(nullable DBFILESMediaInfo *)mediaInfo
158160
symlinkInfo:(nullable DBFILESSymlinkInfo *)symlinkInfo
159161
sharingInfo:(nullable DBFILESFileSharingInfo *)sharingInfo

‎Source/ObjectiveDropboxOfficial/Shared/Generated/ApiObjects/Files/Headers/DBFILESFolderMetadata.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ NS_ASSUME_NONNULL_BEGIN
6363
/// @param parentSharedFolderId Please use `parentSharedFolderId` in
6464
/// `DBFILESFileSharingInfo` or `parentSharedFolderId` in
6565
/// `DBFILESFolderSharingInfo` instead.
66+
/// @param previewUrl The preview URL of the file.
6667
/// @param sharedFolderId Please use sharingInfo instead.
6768
/// @param sharingInfo Set if the folder is contained in a shared folder or is a
6869
/// shared folder mount point.
@@ -78,6 +79,7 @@ NS_ASSUME_NONNULL_BEGIN
7879
pathLower:(nullable NSString *)pathLower
7980
pathDisplay:(nullable NSString *)pathDisplay
8081
parentSharedFolderId:(nullable NSString *)parentSharedFolderId
82+
previewUrl:(nullable NSString *)previewUrl
8183
sharedFolderId:(nullable NSString *)sharedFolderId
8284
sharingInfo:(nullable DBFILESFolderSharingInfo *)sharingInfo
8385
propertyGroups:(nullable NSArray<DBFILEPROPERTIESPropertyGroup *> *)propertyGroups;

0 commit comments

Comments
 (0)