Skip to content

Commit 6cfe494

Browse files
author
Qiming Yuan
committed
Fix a bug when decoding void union field.
1 parent 34d6273 commit 6cfe494

File tree

205 files changed

+633
-6294
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+633
-6294
lines changed

‎Dropbox.Api/AppProperties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
[assembly: AssemblyCulture("")]
1919

2020
[assembly: AssemblyVersion("4.0.0")]
21-
[assembly: AssemblyFileVersion("4.0.6321")]
21+
[assembly: AssemblyFileVersion("4.0.6332")]

‎Dropbox.Api/Dropbox.Api.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>Dropbox.Api</id>
5-
<version>4.2.5</version>
5+
<version>4.2.6</version>
66
<title>Dropbox v2 API</title>
77
<authors>Dropbox Inc</authors>
88
<owners>Dropbox Inc</owners>
@@ -13,7 +13,7 @@
1313
<description>Portable class library for accessing the Dropbox v2 API</description>
1414
<releaseNotes>
1515
Bug fixes:
16-
- Fixed deadlock issue for DropboxOauth2Helper.
16+
- Fixed a bug that the SDK may crash when a union field is changed from void to non-void.
1717
</releaseNotes>
1818
<copyright>Copyright (c) Dropbox Inc. 2016</copyright>
1919
<tags>Dropbox Api</tags>

‎Dropbox.Api/Generated/Async/LaunchEmptyResult.cs‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -211,19 +211,10 @@ private class CompleteDecoder : enc.StructDecoder<Complete>
211211
/// </summary>
212212
/// <returns>The struct instance.</returns>
213213
protected override Complete Create()
214-
{
215-
return new Complete();
216-
}
217-
218-
/// <summary>
219-
/// <para>Decode fields without ensuring start and end object.</para>
220-
/// </summary>
221-
/// <param name="reader">The json reader.</param>
222-
/// <returns>The decoded object.</returns>
223-
public override Complete DecodeFields(enc.IJsonReader reader)
224214
{
225215
return Complete.Instance;
226216
}
217+
227218
}
228219

229220
#endregion

‎Dropbox.Api/Generated/Async/PollEmptyResult.cs‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -210,19 +210,10 @@ private class CompleteDecoder : enc.StructDecoder<Complete>
210210
/// </summary>
211211
/// <returns>The struct instance.</returns>
212212
protected override Complete Create()
213-
{
214-
return new Complete();
215-
}
216-
217-
/// <summary>
218-
/// <para>Decode fields without ensuring start and end object.</para>
219-
/// </summary>
220-
/// <param name="reader">The json reader.</param>
221-
/// <returns>The decoded object.</returns>
222-
public override Complete DecodeFields(enc.IJsonReader reader)
223213
{
224214
return Complete.Instance;
225215
}
216+
226217
}
227218

228219
#endregion
@@ -288,19 +279,10 @@ private class InProgressDecoder : enc.StructDecoder<InProgress>
288279
/// </summary>
289280
/// <returns>The struct instance.</returns>
290281
protected override InProgress Create()
291-
{
292-
return new InProgress();
293-
}
294-
295-
/// <summary>
296-
/// <para>Decode fields without ensuring start and end object.</para>
297-
/// </summary>
298-
/// <param name="reader">The json reader.</param>
299-
/// <returns>The decoded object.</returns>
300-
public override InProgress DecodeFields(enc.IJsonReader reader)
301282
{
302283
return InProgress.Instance;
303284
}
285+
304286
}
305287

306288
#endregion

‎Dropbox.Api/Generated/Async/PollError.cs‎

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -238,19 +238,10 @@ private class InvalidAsyncJobIdDecoder : enc.StructDecoder<InvalidAsyncJobId>
238238
/// </summary>
239239
/// <returns>The struct instance.</returns>
240240
protected override InvalidAsyncJobId Create()
241-
{
242-
return new InvalidAsyncJobId();
243-
}
244-
245-
/// <summary>
246-
/// <para>Decode fields without ensuring start and end object.</para>
247-
/// </summary>
248-
/// <param name="reader">The json reader.</param>
249-
/// <returns>The decoded object.</returns>
250-
public override InvalidAsyncJobId DecodeFields(enc.IJsonReader reader)
251241
{
252242
return InvalidAsyncJobId.Instance;
253243
}
244+
254245
}
255246

256247
#endregion
@@ -319,19 +310,10 @@ private class InternalErrorDecoder : enc.StructDecoder<InternalError>
319310
/// </summary>
320311
/// <returns>The struct instance.</returns>
321312
protected override InternalError Create()
322-
{
323-
return new InternalError();
324-
}
325-
326-
/// <summary>
327-
/// <para>Decode fields without ensuring start and end object.</para>
328-
/// </summary>
329-
/// <param name="reader">The json reader.</param>
330-
/// <returns>The decoded object.</returns>
331-
public override InternalError DecodeFields(enc.IJsonReader reader)
332313
{
333314
return InternalError.Instance;
334315
}
316+
335317
}
336318

337319
#endregion
@@ -397,19 +379,10 @@ private class OtherDecoder : enc.StructDecoder<Other>
397379
/// </summary>
398380
/// <returns>The struct instance.</returns>
399381
protected override Other Create()
400-
{
401-
return new Other();
402-
}
403-
404-
/// <summary>
405-
/// <para>Decode fields without ensuring start and end object.</para>
406-
/// </summary>
407-
/// <param name="reader">The json reader.</param>
408-
/// <returns>The decoded object.</returns>
409-
public override Other DecodeFields(enc.IJsonReader reader)
410382
{
411383
return Other.Instance;
412384
}
385+
413386
}
414387

415388
#endregion

‎Dropbox.Api/Generated/Async/PollResultBase.cs‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -181,19 +181,10 @@ private class InProgressDecoder : enc.StructDecoder<InProgress>
181181
/// </summary>
182182
/// <returns>The struct instance.</returns>
183183
protected override InProgress Create()
184-
{
185-
return new InProgress();
186-
}
187-
188-
/// <summary>
189-
/// <para>Decode fields without ensuring start and end object.</para>
190-
/// </summary>
191-
/// <param name="reader">The json reader.</param>
192-
/// <returns>The decoded object.</returns>
193-
public override InProgress DecodeFields(enc.IJsonReader reader)
194184
{
195185
return InProgress.Instance;
196186
}
187+
197188
}
198189

199190
#endregion

‎Dropbox.Api/Generated/Auth/AccessError.cs‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -435,19 +435,10 @@ private class OtherDecoder : enc.StructDecoder<Other>
435435
/// </summary>
436436
/// <returns>The struct instance.</returns>
437437
protected override Other Create()
438-
{
439-
return new Other();
440-
}
441-
442-
/// <summary>
443-
/// <para>Decode fields without ensuring start and end object.</para>
444-
/// </summary>
445-
/// <param name="reader">The json reader.</param>
446-
/// <returns>The decoded object.</returns>
447-
public override Other DecodeFields(enc.IJsonReader reader)
448438
{
449439
return Other.Instance;
450440
}
441+
451442
}
452443

453444
#endregion

‎Dropbox.Api/Generated/Auth/AuthError.cs‎

Lines changed: 5 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -298,19 +298,10 @@ private class InvalidAccessTokenDecoder : enc.StructDecoder<InvalidAccessToken>
298298
/// </summary>
299299
/// <returns>The struct instance.</returns>
300300
protected override InvalidAccessToken Create()
301-
{
302-
return new InvalidAccessToken();
303-
}
304-
305-
/// <summary>
306-
/// <para>Decode fields without ensuring start and end object.</para>
307-
/// </summary>
308-
/// <param name="reader">The json reader.</param>
309-
/// <returns>The decoded object.</returns>
310-
public override InvalidAccessToken DecodeFields(enc.IJsonReader reader)
311301
{
312302
return InvalidAccessToken.Instance;
313303
}
304+
314305
}
315306

316307
#endregion
@@ -379,19 +370,10 @@ private class InvalidSelectUserDecoder : enc.StructDecoder<InvalidSelectUser>
379370
/// </summary>
380371
/// <returns>The struct instance.</returns>
381372
protected override InvalidSelectUser Create()
382-
{
383-
return new InvalidSelectUser();
384-
}
385-
386-
/// <summary>
387-
/// <para>Decode fields without ensuring start and end object.</para>
388-
/// </summary>
389-
/// <param name="reader">The json reader.</param>
390-
/// <returns>The decoded object.</returns>
391-
public override InvalidSelectUser DecodeFields(enc.IJsonReader reader)
392373
{
393374
return InvalidSelectUser.Instance;
394375
}
376+
395377
}
396378

397379
#endregion
@@ -460,19 +442,10 @@ private class InvalidSelectAdminDecoder : enc.StructDecoder<InvalidSelectAdmin>
460442
/// </summary>
461443
/// <returns>The struct instance.</returns>
462444
protected override InvalidSelectAdmin Create()
463-
{
464-
return new InvalidSelectAdmin();
465-
}
466-
467-
/// <summary>
468-
/// <para>Decode fields without ensuring start and end object.</para>
469-
/// </summary>
470-
/// <param name="reader">The json reader.</param>
471-
/// <returns>The decoded object.</returns>
472-
public override InvalidSelectAdmin DecodeFields(enc.IJsonReader reader)
473445
{
474446
return InvalidSelectAdmin.Instance;
475447
}
448+
476449
}
477450

478451
#endregion
@@ -539,19 +512,10 @@ private class UserSuspendedDecoder : enc.StructDecoder<UserSuspended>
539512
/// </summary>
540513
/// <returns>The struct instance.</returns>
541514
protected override UserSuspended Create()
542-
{
543-
return new UserSuspended();
544-
}
545-
546-
/// <summary>
547-
/// <para>Decode fields without ensuring start and end object.</para>
548-
/// </summary>
549-
/// <param name="reader">The json reader.</param>
550-
/// <returns>The decoded object.</returns>
551-
public override UserSuspended DecodeFields(enc.IJsonReader reader)
552515
{
553516
return UserSuspended.Instance;
554517
}
518+
555519
}
556520

557521
#endregion
@@ -617,19 +581,10 @@ private class OtherDecoder : enc.StructDecoder<Other>
617581
/// </summary>
618582
/// <returns>The struct instance.</returns>
619583
protected override Other Create()
620-
{
621-
return new Other();
622-
}
623-
624-
/// <summary>
625-
/// <para>Decode fields without ensuring start and end object.</para>
626-
/// </summary>
627-
/// <param name="reader">The json reader.</param>
628-
/// <returns>The decoded object.</returns>
629-
public override Other DecodeFields(enc.IJsonReader reader)
630584
{
631585
return Other.Instance;
632586
}
587+
633588
}
634589

635590
#endregion

‎Dropbox.Api/Generated/Auth/InvalidAccountTypeError.cs‎

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -239,19 +239,10 @@ private class EndpointDecoder : enc.StructDecoder<Endpoint>
239239
/// </summary>
240240
/// <returns>The struct instance.</returns>
241241
protected override Endpoint Create()
242-
{
243-
return new Endpoint();
244-
}
245-
246-
/// <summary>
247-
/// <para>Decode fields without ensuring start and end object.</para>
248-
/// </summary>
249-
/// <param name="reader">The json reader.</param>
250-
/// <returns>The decoded object.</returns>
251-
public override Endpoint DecodeFields(enc.IJsonReader reader)
252242
{
253243
return Endpoint.Instance;
254244
}
245+
255246
}
256247

257248
#endregion
@@ -317,19 +308,10 @@ private class FeatureDecoder : enc.StructDecoder<Feature>
317308
/// </summary>
318309
/// <returns>The struct instance.</returns>
319310
protected override Feature Create()
320-
{
321-
return new Feature();
322-
}
323-
324-
/// <summary>
325-
/// <para>Decode fields without ensuring start and end object.</para>
326-
/// </summary>
327-
/// <param name="reader">The json reader.</param>
328-
/// <returns>The decoded object.</returns>
329-
public override Feature DecodeFields(enc.IJsonReader reader)
330311
{
331312
return Feature.Instance;
332313
}
314+
333315
}
334316

335317
#endregion
@@ -395,19 +377,10 @@ private class OtherDecoder : enc.StructDecoder<Other>
395377
/// </summary>
396378
/// <returns>The struct instance.</returns>
397379
protected override Other Create()
398-
{
399-
return new Other();
400-
}
401-
402-
/// <summary>
403-
/// <para>Decode fields without ensuring start and end object.</para>
404-
/// </summary>
405-
/// <param name="reader">The json reader.</param>
406-
/// <returns>The decoded object.</returns>
407-
public override Other DecodeFields(enc.IJsonReader reader)
408380
{
409381
return Other.Instance;
410382
}
383+
411384
}
412385

413386
#endregion

0 commit comments

Comments
 (0)