Skip to content

Commit

Permalink
Merge pull request #493 from vimeo/feature/new-field-vsid
Browse files Browse the repository at this point in the history
VCANDROID-1140 Add the new fields into editSession
  • Loading branch information
anthonycr authored Jun 17, 2021
2 parents 8a9a39c + 8c50af4 commit 6693758
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 9 deletions.
3 changes: 1 addition & 2 deletions models/detekt_baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<SmellBaseline>
<ManuallySuppressedIssues></ManuallySuppressedIssues>
<CurrentIssues>
<ID>TrailingWhitespace:EditSession.kt$com.vimeo.networking2.EditSession.kt</ID>
<ID>UndocumentedPublicProperty:AddVideoToAlbum.kt$AddVideoToAlbum$/** * The URI of the video. */ @Json(name = "uri") val uri: String</ID>
<ID>UndocumentedPublicProperty:AddVideoToAlbum.kt$AddVideoToAlbum$/** * The position of the video. */ @Json(name = "position") val position: Int?</ID>
<ID>UndocumentedPublicProperty:AddVideoToAlbumContainer.kt$AddVideoToAlbumContainer$/** * The video that should be added. */ @Json(name = "video") val video: AddVideoToAlbum</ID>
Expand Down Expand Up @@ -123,8 +124,6 @@
<ID>UndocumentedPublicProperty:DashVideoFile.kt$DashVideoFile$/** * The token used for DRM protected streams. */ @Internal @Json(name = "token") val token: String? = null</ID>
<ID>UndocumentedPublicProperty:Document.kt$Document$/** * The partially stripped html for documents like the terms of service. */ @Json(name = "html") val html: String? = null</ID>
<ID>UndocumentedPublicProperty:Drm.kt$Drm$/** * The video file containing the info about the DRM protected stream. */ @Json(name = "widevine") val widevine: DashVideoFile? = null</ID>
<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>
<ID>UndocumentedPublicProperty:EditSession.kt$EditSession$/** * Whether the video has licensed music. */ @Json(name = "is_music_licensed") val isMusicLicensed: Boolean? = null</ID>
<ID>UndocumentedPublicProperty:Email.kt$Email$@Json(name = "email") val email: String? = null</ID>
<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>
<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>
Expand Down
28 changes: 21 additions & 7 deletions models/src/main/java/com/vimeo/networking2/EditSession.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,32 @@ import com.squareup.moshi.JsonClass

/**
* Information about the Vimeo Create session of a video.
*
* @param isMusicLicensed Whether the video has licensed music.
* @param isMaxResolution Whether the current version of clip is of max resolution.
* @param vsid Video session id.
* @param resultVideoHash The result video hash.
* @param hasWatermark Whether the video has watermark.
* @param isRated Whether the video is rated.
*/
@JsonClass(generateAdapter = true)
data class EditSession(
/**
* Whether the video has licensed music.
*/

@Json(name = "is_music_licensed")
val isMusicLicensed: Boolean? = null,

/**
* Whether the current version of clip is of max resolution.
*/
@Json(name = "is_max_resolution")
val isMaxResolution: Boolean? = null
val isMaxResolution: Boolean? = null,

@Json(name = "vsid")
val vsid: Int? = null,

@Json(name = "result_video_hash")
val resultVideoHash: String? = null,

@Json(name = "has_watermark")
val hasWatermark: Boolean? = null,

@Json(name = "is_rated")
val isRated: Boolean? = null,
)

0 comments on commit 6693758

Please sign in to comment.