1 files changed, 9 insertions, 7 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
index 49de85f0..58125024 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
@@ -4,9 +4,9 @@ import android.app.ActivityManager
 import android.content.Intent
 import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
-import android.support.v4.view.ViewPager
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.graphics.Palette
+import androidx.viewpager.widget.ViewPager
+import androidx.appcompat.app.AppCompatActivity
+import androidx.palette.graphics.Palette
 import android.text.TextUtils
 import android.view.Menu
 import android.view.MenuItem
@@ -129,7 +129,7 @@ class MainActivity : AppCompatActivity() {
                 }
                 val statusMatcher = TWITTER_STATUS_PATTERN.matcher(uri.path)
                 if (statusMatcher.find()) {
-                    return launchUi {
+                    launchUi {
                         val id = statusMatcher.group(1)
                         try {
                             val tweet = world.getTweetAsync(id.toLong()).await()
@@ -139,10 +139,11 @@ class MainActivity : AppCompatActivity() {
                             world.notifyError("Could not retrieve tweet id=$id")
                         }
                     }
+                    return
                 }
                 val userMatcher = TWITTER_USER_PATTERN.matcher(uri.path)
                 if (userMatcher.find()) {
-                    return launchUi {
+                    launchUi {
                         val username = userMatcher.group(1)
                         try {
                             val user = world.getUserAsync(username).await()
@@ -152,6 +153,7 @@ class MainActivity : AppCompatActivity() {
                             world.notifyError("Could not retrieve user screen_name=$username")
                         }
                     }
+                    return
                 }
             }
         } else when (intent.action) {
@@ -160,9 +162,9 @@ class MainActivity : AppCompatActivity() {
                 if (type == "text/plain") {
                     val extra = intent.extras
                     if (extra != null) {
-                        var text = extra.getCharSequence(Intent.EXTRA_TEXT).toString()
+                        var text = extra.getCharSequence(Intent.EXTRA_TEXT)!!.toString()
                         if (!TextUtils.isEmpty(extra.getCharSequence(Intent.EXTRA_SUBJECT))) {
-                            text = extra.getCharSequence(Intent.EXTRA_SUBJECT).toString() + " " + text
+                            text = extra.getCharSequence(Intent.EXTRA_SUBJECT)!!.toString() + " " + text
                         }
                         val postPagePosition = world.pages.indexOfFirst { it is PageInfo.ComposePageInfo }
                         assert(postPagePosition != -1)