FIx a crash on devices without Play Services

DSteve595 · Jan 15, 2017 · 5bb16e1 · 5bb16e1
1 parent bee0765
commit 5bb16e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,8 +24,8 @@ android {
         applicationId 'com.stevenschoen.putionew'
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 111
-        versionName '4.0.9'
+        versionCode 113
+        versionName '4.0.10'
         multiDexEnabled true
     }
     buildTypes {
@@ -82,7 +82,7 @@ dependencies {
     compile 'com.google.code.gson:gson:2.8.0'
     compile 'com.tbruyelle.rxpermissions:rxpermissions:0.9.1@aar'
     compile 'com.squareup.picasso:picasso:2.5.2'
-    compile 'com.aurelhubert:ahbottomnavigation:2.0.2'
+    compile 'com.aurelhubert:ahbottomnavigation:2.0.3'
     compile 'nz.bradcampbell:paperparcel:2.0.0-beta1'
     kapt 'nz.bradcampbell:paperparcel-compiler:2.0.0-beta1'
 }

diff --git a/app/src/main/java/com/stevenschoen/putionew/cast/BaseCastActivity.kt b/app/src/main/java/com/stevenschoen/putionew/cast/BaseCastActivity.kt
@@ -21,10 +21,6 @@ import org.apache.commons.io.FilenameUtils
 
 abstract class BaseCastActivity : AppCompatActivity(), PutioApplication.CastCallbacks {
 
-    companion object {
-        const val FRAGTAG_CAST_MINI_CONTROLLER = "mini_cast"
-    }
-
     protected val castContext: CastContext?
         get() = CastContext.getSharedInstance(this)
     protected val castSession: CastSession?
@@ -57,7 +53,8 @@ abstract class BaseCastActivity : AppCompatActivity(), PutioApplication.CastCall
     }
 
     override fun load(file: PutioFile, url: String, utils: PutioUtils) {
-        if (castContext != null && castSession != null && castSession!!.remoteMediaClient != null && castSession!!.isConnected) {
+        if (CastOptionsProvider.isCastSdkAvailable(this) &&
+                castContext != null && castSession != null && castSession!!.remoteMediaClient != null && castSession!!.isConnected) {
             fun play(subtitles: List<PutioSubtitle>? = null) {
                 val metaData = MediaMetadata(
                         if (file.isVideo)

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.github.ben-manes.versions'
 
 buildscript {
-    ext.kotlin_version = '1.0.5-3'
+    ext.kotlin_version = '1.0.6'
     repositories {
         jcenter()
     }