Beta 0.9.3; Fixed streamable player

feelfreelinux · Jul 5, 2018 · ec1544c · ec1544c
1 parent 685dcad
commit ec1544c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 7 deletions.
diff --git a/app/src/main/kotlin/io/github/feelfreelinux/wykopmobilny/api/embed/ExternalRepository.kt b/app/src/main/kotlin/io/github/feelfreelinux/wykopmobilny/api/embed/ExternalRepository.kt
@@ -16,7 +16,6 @@ class ExternalRepository(val retrofit: Retrofit) : ExternalApi {
     override fun getGfycatWebmUrl(gfycatId: String): Single<URL> =
             embedApi.getGfycat(gfycatId)
                     .map {
-                        printout(it.gfyItem.webmUrl)
                         URL(it.gfyItem.webmUrl) }
 
     override fun getGifUrl(gfycatId: String): Single<URL> =
@@ -25,7 +24,7 @@ class ExternalRepository(val retrofit: Retrofit) : ExternalApi {
 
     override fun getStreamableUrl(streamableId: String): Single<URL> =
             embedApi.getStreamableFile(streamableId)
-                    .map { URL("https:${it.files.mp4Mobile.url}") }
+                    .map { URL("https:${it.files.mp4Mobile?.url ?: it.files.mp4.url}") }
 
     override fun getCoub(coubId: String): Single<Coub> =
             embedApi.getCoub(coubId)

diff --git a/app/src/main/kotlin/io/github/feelfreelinux/wykopmobilny/models/mapper/apiv2/SurveyMapper.kt b/app/src/main/kotlin/io/github/feelfreelinux/wykopmobilny/models/mapper/apiv2/SurveyMapper.kt
@@ -7,7 +7,7 @@ import io.github.feelfreelinux.wykopmobilny.models.pojo.apiv2.models.SurveyRespo
 class SurveyMapper {
     companion object : Mapper<SurveyResponse, Survey> {
         override fun map(value: SurveyResponse): Survey {
-            return Survey(value.question,
+            return Survey(value.question ?: "",
                     value.answers.map { AnswerMapper.map(it) },
                     value.userAnswer)
         }

diff --git a/...in/kotlin/io/github/feelfreelinux/wykopmobilny/models/pojo/apiv2/embed/StreamableFiles.kt b/...in/kotlin/io/github/feelfreelinux/wykopmobilny/models/pojo/apiv2/embed/StreamableFiles.kt
@@ -6,5 +6,5 @@ data class StreamableFiles(
         @JsonProperty("mp4")
         val mp4 : StreamableFile,
         @JsonProperty("mp4-mobile")
-        val mp4Mobile : StreamableFile
+        val mp4Mobile : StreamableFile?
 )
diff --git a/...in/kotlin/io/github/feelfreelinux/wykopmobilny/models/pojo/apiv2/models/SurveyResponse.kt b/...in/kotlin/io/github/feelfreelinux/wykopmobilny/models/pojo/apiv2/models/SurveyResponse.kt
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackso
 
 data class SurveyResponse(
         @JsonProperty("question")
-        val question : String,
+        val question : String?,
 
         @JsonProperty("answers")
         val answers : List<AnswerResponse>,

diff --git a/...ain/kotlin/io/github/feelfreelinux/wykopmobilny/ui/modules/photoview/PhotoViewActivity.kt b/...ain/kotlin/io/github/feelfreelinux/wykopmobilny/ui/modules/photoview/PhotoViewActivity.kt
@@ -2,7 +2,6 @@ package io.github.feelfreelinux.wykopmobilny.ui.modules.photoview
 
 import android.content.Context
 import android.content.Intent
-import android.graphics.Paint
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle

diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,7 @@ allprojects {
     project.ext {
         versionMajor = 0
         versionMinor = 9
-        versionPatch = 2
+        versionPatch = 3
         versionBuild = 0
     }
 }