1 files changed, 4 insertions, 7 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/ComposePageFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/ComposePageFragment.kt
index 018184f7..e8e3737b 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/ComposePageFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/ComposePageFragment.kt
@@ -7,8 +7,8 @@ import android.net.Uri
 import android.os.Bundle
 import android.os.Parcelable
 import android.provider.MediaStore
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.text.Editable
 import android.text.Spannable
 import android.text.TextWatcher
@@ -115,10 +115,7 @@ class ComposePageFragment : PageFragment<PageInfo.ComposePageInfo>(), TextWatche
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        if (savedInstanceState != null)
-            postState = savedInstanceState.getParcelable(KEY_POST_STATE)
-        else
-            postState = PostState()
+        postState = savedInstanceState?.getParcelable(KEY_POST_STATE) ?: PostState()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -198,7 +195,7 @@ class ComposePageFragment : PageFragment<PageInfo.ComposePageInfo>(), TextWatche
             REQUEST_OPEN_DOCUMENT -> {
                 if (resultCode != Activity.RESULT_OK)
                     return
-                setMediaFile(data!!.data)
+                setMediaFile(data!!.data!!)
             }
             else -> super.onActivityResult(requestCode, resultCode, data)
         }