Merge branch 'development' into feedback

fossasia · Apr 14, 2019 · 3fb5a39 · 3fb5a39
2 parents dd359c3 + 2df871e
commit 3fb5a39
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt
@@ -223,7 +223,7 @@ class EventDetailsFragment : Fragment() {
         }
 
         // Event Description Section
-        val description = event.description.stripHtml()
+        val description = event.description.nullToEmpty().stripHtml()
         if (!description.isNullOrEmpty()) {
             setTextField(rootView.eventDescription, description)
 

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.21'
+    ext.kotlin_version = '1.3.30'
 
     repositories {
         google()