Skip to content

Commit 6693758

Browse files
authored
Merge pull request #493 from vimeo/feature/new-field-vsid
VCANDROID-1140 Add the new fields into editSession
2 parents 8a9a39c + 8c50af4 commit 6693758

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

models/detekt_baseline.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<SmellBaseline>
33
<ManuallySuppressedIssues></ManuallySuppressedIssues>
44
<CurrentIssues>
5+
<ID>TrailingWhitespace:EditSession.kt$com.vimeo.networking2.EditSession.kt</ID>
56
<ID>UndocumentedPublicProperty:AddVideoToAlbum.kt$AddVideoToAlbum$/** * The URI of the video. */ @Json(name = "uri") val uri: String</ID>
67
<ID>UndocumentedPublicProperty:AddVideoToAlbum.kt$AddVideoToAlbum$/** * The position of the video. */ @Json(name = "position") val position: Int?</ID>
78
<ID>UndocumentedPublicProperty:AddVideoToAlbumContainer.kt$AddVideoToAlbumContainer$/** * The video that should be added. */ @Json(name = "video") val video: AddVideoToAlbum</ID>
@@ -123,8 +124,6 @@
123124
<ID>UndocumentedPublicProperty:DashVideoFile.kt$DashVideoFile$/** * The token used for DRM protected streams. */ @Internal @Json(name = "token") val token: String? = null</ID>
124125
<ID>UndocumentedPublicProperty:Document.kt$Document$/** * The partially stripped html for documents like the terms of service. */ @Json(name = "html") val html: String? = null</ID>
125126
<ID>UndocumentedPublicProperty:Drm.kt$Drm$/** * The video file containing the info about the DRM protected stream. */ @Json(name = "widevine") val widevine: DashVideoFile? = null</ID>
126-
<ID>UndocumentedPublicProperty:EditSession.kt$EditSession$/** * Whether the current version of clip is of max resolution. */ @Json(name = "is_max_resolution") val isMaxResolution: Boolean? = null</ID>
127-
<ID>UndocumentedPublicProperty:EditSession.kt$EditSession$/** * Whether the video has licensed music. */ @Json(name = "is_music_licensed") val isMusicLicensed: Boolean? = null</ID>
128127
<ID>UndocumentedPublicProperty:Email.kt$Email$@Json(name = "email") val email: String? = null</ID>
129128
<ID>UndocumentedPublicProperty:EmbedButtons.kt$EmbedButtons$/** * Whether the Embed button appears in the embeddable player for this video. */ @Json(name = "embed") val embed: Boolean? = null</ID>
130129
<ID>UndocumentedPublicProperty:EmbedButtons.kt$EmbedButtons$/** * Whether the Fullscreen button appears in the embeddable player for this video. */ @Json(name = "fullscreen") val fullscreen: Boolean? = null</ID>

models/src/main/java/com/vimeo/networking2/EditSession.kt

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,32 @@ import com.squareup.moshi.JsonClass
55

66
/**
77
* Information about the Vimeo Create session of a video.
8+
*
9+
* @param isMusicLicensed Whether the video has licensed music.
10+
* @param isMaxResolution Whether the current version of clip is of max resolution.
11+
* @param vsid Video session id.
12+
* @param resultVideoHash The result video hash.
13+
* @param hasWatermark Whether the video has watermark.
14+
* @param isRated Whether the video is rated.
815
*/
916
@JsonClass(generateAdapter = true)
1017
data class EditSession(
11-
/**
12-
* Whether the video has licensed music.
13-
*/
18+
1419
@Json(name = "is_music_licensed")
1520
val isMusicLicensed: Boolean? = null,
1621

17-
/**
18-
* Whether the current version of clip is of max resolution.
19-
*/
2022
@Json(name = "is_max_resolution")
21-
val isMaxResolution: Boolean? = null
23+
val isMaxResolution: Boolean? = null,
24+
25+
@Json(name = "vsid")
26+
val vsid: Int? = null,
27+
28+
@Json(name = "result_video_hash")
29+
val resultVideoHash: String? = null,
30+
31+
@Json(name = "has_watermark")
32+
val hasWatermark: Boolean? = null,
33+
34+
@Json(name = "is_rated")
35+
val isRated: Boolean? = null,
2236
)

0 commit comments

Comments
 (0)