feat(dvr_update_exoplayer): update support library to 27.1.1 and comp…

…ile sdk to 27
clappr · Aug 16, 2018 · c07f6b0 · c07f6b0
1 parent 6ebca51
commit c07f6b0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,8 @@
 
 buildscript {
     ext.kotlin_version = '1.2.50'
-    ext.android_support_version = '26.1.0'
+    ext.android_support_version = '27.1.1'
+
 
     repositories {
         mavenCentral()

diff --git a/clappr/build.gradle b/clappr/build.gradle
@@ -46,10 +46,10 @@ bintray {
 
 android {
     publishNonDefault publishAttrs['bintrayPublishNonDefault']
-    compileSdkVersion 26
+    compileSdkVersion 27
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode publishAttrs['versionCode']
         versionName publishAttrs['versionName']
     }

diff --git a/clappr/src/main/kotlin/io/clappr/player/base/BaseObject.kt b/clappr/src/main/kotlin/io/clappr/player/base/BaseObject.kt
@@ -27,7 +27,7 @@ open class BaseObject() : EventInterface {
     override fun on(eventName: String, handler: Callback, obj: EventInterface): String {
         val listenId = createListenId(eventName, obj, handler)
 
-        val bm = LocalBroadcastManager.getInstance(context?.applicationContext)
+        val bm = context?.run { LocalBroadcastManager.getInstance(applicationContext) }
 
         if (receivers[listenId] == null) {
             val receiver = Utils.broadcastReceiver { _, intent: Intent? ->
@@ -37,8 +37,8 @@ open class BaseObject() : EventInterface {
                 }
             }
 
-            bm.registerReceiver(receiver, IntentFilter("clappr:" + eventName))
-            receivers.put(listenId, receiver)
+            bm?.registerReceiver(receiver, IntentFilter("clappr:" + eventName))
+            receivers[listenId] = receiver
         }
         return listenId
     }
@@ -56,8 +56,7 @@ open class BaseObject() : EventInterface {
     override fun off(listenId: String) {
         val receiver = receivers[listenId] as? BroadcastReceiver
         if (receiver != null) {
-            val bm = LocalBroadcastManager.getInstance(context?.applicationContext)
-            bm.unregisterReceiver(receiver)
+            context?.run{ LocalBroadcastManager.getInstance(applicationContext) }?.also { it.unregisterReceiver(receiver) }
             receivers.remove(listenId)
         }
     }
@@ -70,21 +69,21 @@ open class BaseObject() : EventInterface {
         if (listenId != null) {
             off(listenId)
         } else {
-            val bm = LocalBroadcastManager.getInstance(context?.applicationContext)
-            receivers.forEach { it -> bm.unregisterReceiver(it.value) }
+            val bm = context?.run { LocalBroadcastManager.getInstance(applicationContext) }
+            receivers.forEach { it -> bm?.unregisterReceiver(it.value) }
             receivers.clear()
         }
     }
 
     override fun trigger(eventName: String, userData: Bundle?) {
-        val bm = LocalBroadcastManager.getInstance(context?.applicationContext)
+        val bm = context?.run { LocalBroadcastManager.getInstance(applicationContext) }
         val intent = Intent()
         intent.action = "clappr:" + eventName
         intent.putExtra(CONTEXT_KEY, this.id)
         if (userData != null) {
             intent.putExtra(USERDATA_KEY, userData)
         }
-        bm.sendBroadcastSync(intent)
+        bm?.sendBroadcastSync(intent)
     }
 
     private fun createListenId(eventName: String, baseObject: EventInterface, handler: Callback) : String {