anko intents

10 files changed, 61 insertions, 165 deletions

diff --git a/app/app.iml b/app/app.iml
index dfa253ae..e3105218 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -55,7 +55,6 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
@@ -64,6 +63,7 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -85,13 +85,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -99,6 +92,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -123,25 +123,38 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="anko-sdk25-coroutines-0.10.1" level="project" />
     <orderEntry type="library" exported="" name="orma-4.2.5" level="project" />
     <orderEntry type="library" exported="" name="orma-migration-4.2.5" level="project" />
     <orderEntry type="library" exported="" name="haha-2.0.3" level="project" />
     <orderEntry type="library" exported="" name="library-3.3.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" exported="" name="anko-support-v4-commons-0.10.1" level="project" />
+    <orderEntry type="library" exported="" name="kotlinx-coroutines-core-0.15" level="project" />
+    <orderEntry type="library" exported="" name="anko-sqlite-0.10.1" level="project" />
     <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="anko-appcompat-v7-0.10.1" level="project" />
     <orderEntry type="library" exported="" name="crashlytics-core-2.3.17" level="project" />
     <orderEntry type="library" exported="" name="antlr4-runtime-4.6" level="project" />
     <orderEntry type="library" exported="" name="kotlin-stdlib-jre7-1.1.51" level="project" />
+    <orderEntry type="library" exported="" name="anko-coroutines-0.10.1" level="project" />
     <orderEntry type="library" exported="" name="support-v13-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="rxandroid-2.0.1" level="project" />
     <orderEntry type="library" exported="" name="twitter4j-stream-4.0.6" level="project" />
     <orderEntry type="library" exported="" name="rxjava-2.0.9" level="project" />
+    <orderEntry type="library" exported="" name="anko-support-v4-0.10.1" level="project" />
     <orderEntry type="library" exported="" name="leakcanary-analyzer-1.5.4" level="project" />
     <orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="kotlinx-coroutines-android-0.15" level="project" />
     <orderEntry type="library" exported="" name="reactive-streams-1.0.0" level="project" />
     <orderEntry type="library" exported="" name="fabric-1.3.17" level="project" />
+    <orderEntry type="library" exported="" name="anko-sdk25-0.10.1" level="project" />
+    <orderEntry type="library" exported="" name="anko-appcompat-v7-coroutines-0.10.1" level="project" />
     <orderEntry type="library" exported="" name="annotations-13.0" level="project" />
+    <orderEntry type="library" exported="" name="anko-appcompat-v7-commons-0.10.1" level="project" />
     <orderEntry type="library" exported="" name="beta-1.2.5" level="project" />
+    <orderEntry type="library" exported="" name="anko-0.10.1" level="project" />
+    <orderEntry type="library" exported="" name="anko-commons-0.10.1" level="project" />
     <orderEntry type="library" exported="" name="answers-1.3.13" level="project" />
     <orderEntry type="library" exported="" name="kotlin-stdlib-1.1.51" level="project" />
     <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index ccbc8b8a..e7ffccd9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,6 +5,10 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'me.tatarka.retrolambda'
 apply plugin: 'io.fabric'
 
+buildscript {
+    ext.anko_version = "0.10.1"
+}
+
 android {
     compileSdkVersion 25
     buildToolsVersion "25.0.2"
@@ -60,6 +64,10 @@ dependencies {
 
     compile 'com.android.support:support-v4:25.+'
     compile 'com.android.support:support-v13:25.+'
+
+    // Anko
+    compile "org.jetbrains.anko:anko:$anko_version"
+
     // volley
     compile 'com.android.volley:volley:1.0.0'
     // crouton
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 450009c2..91b6311d 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
@@ -43,11 +43,12 @@ import net.lacolaco.smileessence.entity.RBinding
 import net.lacolaco.smileessence.logging.Logger
 import net.lacolaco.smileessence.twitter.task.Users
 import net.lacolaco.smileessence.util.BitmapURLTask
-import net.lacolaco.smileessence.util.IntentUtils
 import net.lacolaco.smileessence.util.UIObserverBundle
 import net.lacolaco.smileessence.view.adapter.PageListAdapter
 import net.lacolaco.smileessence.view.dialog.ConfirmDialogFragment
 import net.lacolaco.smileessence.view.page.*
+import org.jetbrains.anko.browse
+import org.jetbrains.anko.startActivity;
 
 class MainActivity : Activity(), ViewPager.OnPageChangeListener {
     private val currentUserBundle = UIObserverBundle()
@@ -244,26 +245,14 @@ class MainActivity : Activity(), ViewPager.OnPageChangeListener {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            android.R.id.home -> {
-                val intent = Intent(this, ManageAccountsActivity::class.java)
-                intent.putExtra(ManageAccountsActivity.INTENT_KEY_NOINIT, true)
-                startActivity(intent)
-                return true
-            }
-            R.id.actionbar_setting -> {
-                startActivity(Intent(this, SettingActivity::class.java))
-                return true
-            }
-            R.id.actionbar_edit_extraction -> {
-                startActivity(Intent(this, EditExtractionActivity::class.java))
-                return true
-            }
-            R.id.actionbar_aclog -> {
-                IntentUtils.openUri(this, world.account.user.aclogTimelineURL)
-                return true
-            }
+            android.R.id.home ->
+                startActivity<ManageAccountsActivity>(ManageAccountsActivity.INTENT_KEY_NOINIT to true)
+            R.id.actionbar_setting -> startActivity<SettingActivity>()
+            R.id.actionbar_edit_extraction -> startActivity<EditExtractionActivity>()
+            R.id.actionbar_aclog -> browse(world.account.user.aclogTimelineURL)
             else -> return super.onOptionsItemSelected(item)
         }
+        return true
     }
 
     override fun onPause() {
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.kt
index e1240a76..37eec009 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.kt
@@ -46,6 +46,8 @@ import net.lacolaco.smileessence.twitter.OAuthSession
 import net.lacolaco.smileessence.view.dialog.ConfirmDialogFragment
 import kotlinx.android.synthetic.main.layout_edit_list.*
 import kotlinx.android.synthetic.main.list_item_account.view.*
+import org.jetbrains.anko.intentFor
+import org.jetbrains.anko.startActivityForResult
 
 import java.util.ArrayList
 
@@ -98,7 +100,7 @@ class ManageAccountsActivity : Activity(), AdapterView.OnItemClickListener, Adap
 
     private fun goToWorld(world: World) {
         // Continue the existing MainActivity
-        val intent = Intent(this, MainActivity::class.java)
+        val intent = intentFor<MainActivity>()
         intent.data = Uri.parse("smileessence://mainactivity/?user_id=" + world.account.userId)
         finish()
         startActivity(intent)
@@ -133,12 +135,9 @@ class ManageAccountsActivity : Activity(), AdapterView.OnItemClickListener, Adap
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.menu_edit_list_add -> {
-                startActivityForResult(Intent(this, OAuthActivity::class.java), REQUEST_OAUTH)
-            }
-            android.R.id.home -> {
-                safeFinish()
-            }
+            R.id.menu_edit_list_add -> startActivityForResult<OAuthActivity>(REQUEST_OAUTH)
+            android.R.id.home -> safeFinish()
+            else -> return super.onOptionsItemSelected(item)
         }
         return true
     }
diff --git a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenURL.kt b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenURL.kt
index b9150e12..4ca02660 100644
--- a/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenURL.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/command/CommandOpenURL.kt
@@ -25,22 +25,11 @@
 package net.lacolaco.smileessence.command
 
 import net.lacolaco.smileessence.activity.MainActivity
-import net.lacolaco.smileessence.util.IntentUtils
-
-class CommandOpenURL
-// --------------------------- CONSTRUCTORS ---------------------------
-
-(activity: MainActivity,
-        // ------------------------------ FIELDS ------------------------------
-
-        // --------------------- GETTER / SETTER METHODS ---------------------
-
- override val text: String) : Command(activity) {
-
-    // -------------------------- OTHER METHODS --------------------------
+import org.jetbrains.anko.browse
 
+class CommandOpenURL(activity: MainActivity, override val text: String) : Command(activity) {
     override fun execute(): Boolean {
-        IntentUtils.openUri(activity, text)
+        activity.browse(text)
         return true
     }
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/util/IntentUtils.kt b/app/src/main/java/net/lacolaco/smileessence/util/IntentUtils.kt
deleted file mode 100644
index 48b6f9e4..00000000
--- a/app/src/main/java/net/lacolaco/smileessence/util/IntentUtils.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2012-2014 lacolaco.net
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package net.lacolaco.smileessence.util
-
-import android.app.Activity
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.content.pm.ResolveInfo
-import android.net.Uri
-import net.lacolaco.smileessence.Application
-import net.lacolaco.smileessence.R
-
-object IntentUtils {
-
-    // -------------------------- STATIC METHODS --------------------------
-
-    /**
-     * Start activity if callable apps are found
-     *
-     * @param activity
-     * @param intent
-     * @return
-     */
-    fun startActivityIfFound(activity: Activity, intent: Intent): Boolean {
-        if (canStartActivity(activity, intent)) {
-            activity.startActivity(intent)
-            return true
-        } else {
-            Application.toast(R.string.notice_error_start_activity)
-        }
-        return false
-    }
-
-    /**
-     * Check intent has any callable activity
-     *
-     * @param activity
-     * @param intent
-     * @return
-     */
-    fun canStartActivity(activity: Activity, intent: Intent): Boolean {
-        val packageManager = activity.packageManager
-        val infos = packageManager.queryIntentActivities(intent, PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)
-        return !infos.isEmpty()
-    }
-
-    /**
-     * Start activity for result if callable apps are found
-     *
-     * @param activity
-     * @param intent
-     * @param requestCode
-     * @return
-     */
-    fun startActivityForResultIfFound(activity: Activity, intent: Intent, requestCode: Int): Boolean {
-        if (canStartActivity(activity, intent)) {
-            activity.startActivityForResult(intent, requestCode)
-            return true
-        } else {
-            Application.toast(R.string.notice_error_start_activity)
-        }
-        return false
-    }
-
-    fun openUri(activity: Activity, uriString: String): Boolean {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(uriString))
-        return startActivityIfFound(activity, intent)
-    }
-}
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.kt
index 495db525..0c908450 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/SettingFragment.kt
@@ -25,7 +25,6 @@
 package net.lacolaco.smileessence.view
 
 import android.app.AlertDialog
-import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.preference.EditTextPreference
@@ -33,9 +32,6 @@ import android.preference.ListPreference
 import android.preference.Preference
 import android.preference.PreferenceFragment
 import android.text.TextUtils
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.TextView
 import net.lacolaco.smileessence.Application
 import net.lacolaco.smileessence.BuildConfig
 import net.lacolaco.smileessence.R
@@ -43,6 +39,7 @@ import net.lacolaco.smileessence.activity.LicenseActivity
 
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import kotlinx.android.synthetic.main.dialog_app_info.view.*
+import org.jetbrains.anko.startActivity
 
 class SettingFragment : PreferenceFragment(), OnSharedPreferenceChangeListener, Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
     override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
@@ -66,9 +63,8 @@ class SettingFragment : PreferenceFragment(), OnSharedPreferenceChangeListener,
         val key = preference.key
         if (key.contentEquals(getString(R.string.key_setting_application_information))) {
             openAppInfoDialog()
-        } else if (key.contentEquals(getString(R.string.key_setting_licenses))) {
-            openLicenseActivity()
-        }
+        } else if (key.contentEquals(getString(R.string.key_setting_licenses)))
+            activity.startActivity<LicenseActivity>()
         return true
     }
 
@@ -114,11 +110,6 @@ class SettingFragment : PreferenceFragment(), OnSharedPreferenceChangeListener,
         return findPreference(getString(preferenceResID))
     }
 
-    private fun openLicenseActivity() {
-        val intent = Intent(activity, LicenseActivity::class.java)
-        activity.startActivity(intent)
-    }
-
     private fun openAppInfoDialog() {
         val inflater = activity.layoutInflater
         val contentView = inflater.inflate(R.layout.dialog_app_info, null)
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.kt
index 91f5cbf6..4517eae5 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StatusDetailDialogFragment.kt
@@ -43,13 +43,13 @@ import net.lacolaco.smileessence.entity.Tweet
 import net.lacolaco.smileessence.preference.UserPreferenceHelper
 import net.lacolaco.smileessence.twitter.task.TweetReactions
 import net.lacolaco.smileessence.twitter.task.Tweets
-import net.lacolaco.smileessence.util.IntentUtils
 import net.lacolaco.smileessence.util.SystemServiceHelper
 import net.lacolaco.smileessence.util.UIObserverBundle
 import net.lacolaco.smileessence.view.DialogHelper
 import net.lacolaco.smileessence.view.Partials
 import net.lacolaco.smileessence.view.adapter.CustomListAdapter
 import net.lacolaco.smileessence.view.adapter.TimelineAdapter
+import org.jetbrains.anko.browse
 
 import java.lang.ref.WeakReference
 import java.util.ArrayList
@@ -133,7 +133,7 @@ class StatusDetailDialogFragment : StackableDialogFragment(), View.OnClickListen
                                 1 -> {
                                     DialogHelper.showDialog(activity, TalkChainDialogFragment.newInstance(tweet))
                                 }
-                                2 -> IntentUtils.openUri(activity, tweet.originalTweet.twitterUrl)
+                                2 -> browse(tweet.originalTweet.twitterUrl)
                                 3 -> {
                                     SystemServiceHelper.copyToClipboard(activity, "tweet text", tweet.originalTweet.text)
                                     world.notify(R.string.notice_copy_clipboard)
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt
index ca634d92..b9b60cc6 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt
@@ -41,12 +41,12 @@ import net.lacolaco.smileessence.entity.RBinding
 import net.lacolaco.smileessence.entity.User
 import net.lacolaco.smileessence.twitter.task.Timelines
 import net.lacolaco.smileessence.twitter.task.Users
-import net.lacolaco.smileessence.util.IntentUtils
 import net.lacolaco.smileessence.util.UIHandler
 import net.lacolaco.smileessence.util.UIObserverBundle
 import net.lacolaco.smileessence.view.DialogHelper
 import net.lacolaco.smileessence.view.ThreeStateButton
 import net.lacolaco.smileessence.view.adapter.TimelineAdapter
+import org.jetbrains.anko.browse
 
 class UserDetailDialogFragment : StackableDialogFragment(), View.OnClickListener, PullToRefreshBase.OnRefreshListener2<ListView> {
     private val adapter by lazy { TimelineAdapter(activity, world) }
@@ -91,7 +91,7 @@ class UserDetailDialogFragment : StackableDialogFragment(), View.OnClickListener
                                             .onFail { ex -> world.notifyError(R.string.notice_r4s_failed) }
                                             .execute()
                                 }
-                                5 -> IntentUtils.openUri(activity, user.aclogTimelineURL)
+                                5 -> browse(user.aclogTimelineURL)
                                 else -> throw IllegalStateException()
                             }
                         }
@@ -99,19 +99,19 @@ class UserDetailDialogFragment : StackableDialogFragment(), View.OnClickListener
                 dialog.show()
             }
             R.id.imageview_user_detail_icon -> {
-                IntentUtils.openUri(activity, user.profileImageUrl!!)
+                browse(user.profileImageUrl!!)
             }
             R.id.textview_user_detail_screenname, R.id.textview_user_detail_tweet_count -> {
-                IntentUtils.openUri(activity, user.userHomeURL)
+                browse(user.userHomeURL)
             }
             R.id.textview_user_detail_friend_count -> {
-                IntentUtils.openUri(activity, String.format("%s/following", user.userHomeURL))
+                browse(String.format("%s/following", user.userHomeURL))
             }
             R.id.textview_user_detail_follower_count -> {
-                IntentUtils.openUri(activity, String.format("%s/followers", user.userHomeURL))
+                browse(String.format("%s/followers", user.userHomeURL))
             }
             R.id.textview_user_detail_favorite_count -> {
-                IntentUtils.openUri(activity, String.format("%s/favorites", user.userHomeURL))
+                browse(String.format("%s/favorites", user.userHomeURL))
             }
             R.id.button_user_detail_follow -> {
                 val v = view
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.kt
index a6af4881..b2aade14 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/PostFragment.kt
@@ -44,7 +44,6 @@ import net.lacolaco.smileessence.logging.Logger
 import net.lacolaco.smileessence.preference.UserPreferenceHelper
 import net.lacolaco.smileessence.twitter.task.Tweets
 import net.lacolaco.smileessence.util.BitmapThumbnailTask
-import net.lacolaco.smileessence.util.IntentUtils
 import net.lacolaco.smileessence.util.SystemServiceHelper
 import net.lacolaco.smileessence.util.UIHandler
 import net.lacolaco.smileessence.view.Partials
@@ -208,11 +207,10 @@ class PostFragment : PageFragment(), TextWatcher, View.OnFocusChangeListener, Vi
     }
 
     private fun displayImage() {
-        val intent = Intent()
-        intent.action = Intent.ACTION_VIEW
+        val intent = Intent(Intent.ACTION_VIEW)
         intent.addCategory(Intent.CATEGORY_DEFAULT)
         intent.setDataAndType(Uri.fromFile(File(world.postState.mediaFilePath)), "image/*")
-        IntentUtils.startActivityIfFound(activity, intent)
+        startActivity(intent)
     }
 
     private fun removeImage() {
@@ -228,7 +226,7 @@ class PostFragment : PageFragment(), TextWatcher, View.OnFocusChangeListener, Vi
 
         val intent = Intent(Intent.ACTION_PICK)
         intent.type = "image/*"
-        IntentUtils.startActivityForResultIfFound(activity, intent, MainActivity.REQUEST_GET_PICTURE_FROM_GALLERY)
+        startActivityForResult(intent, MainActivity.REQUEST_GET_PICTURE_FROM_GALLERY)
     }
 
     private fun setStateFromView() {