Merge branch 'develop'

stefanmedack · Dec 27, 2017 · b02be29 · b02be29
2 parents dbb4ee5 + b041bd4
commit b02be29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -41,8 +41,8 @@ android {
         applicationId "de.stefanmedack.ccctv"
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode 6
-        versionName "2.0.0-RC3"
+        versionCode 7
+        versionName "2.0.0-RC4"
         resConfigs "en", "de"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/java/de/stefanmedack/ccctv/ui/main/LiveStreamingViewModel.kt b/app/src/main/java/de/stefanmedack/ccctv/ui/main/LiveStreamingViewModel.kt
@@ -21,7 +21,7 @@ class LiveStreamingViewModel @Inject constructor(
 
     private fun extractConference(): List<Room>
             = streamingRepository.cachedStreams.find { it.conference == conferenceName }?.
-                groups?.find { it.group == "Lecture Rooms" }?.rooms ?: listOf()
+                groups?.find { it.group == "Live" }?.rooms ?: listOf()
 
     //    val conferencesWithEvents: Flowable<Resource<List<ConferenceWithEvents>>>
     //        get() = repository.loadedConferences(conferenceName)