diff --git a/twidere/build.gradle b/twidere/build.gradle
index e58c87cd7..be1050a91 100644
--- a/twidere/build.gradle
+++ b/twidere/build.gradle
@@ -35,8 +35,8 @@ android {
         applicationId "org.mariotaku.twidere"
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 217
-        versionName '3.2.13'
+        versionCode 218
+        versionName '3.3.0'
         multiDexEnabled true
 
         buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("false")'
diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/tab/TabConfiguration.java b/twidere/src/main/java/org/mariotaku/twidere/model/tab/TabConfiguration.java
index dee19f479..23e37d9aa 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/model/tab/TabConfiguration.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/model/tab/TabConfiguration.java
@@ -226,7 +226,7 @@ public abstract class TabConfiguration {
             this.view = view;
         }
 
-        public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
 
         }
 
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserExtraConfiguration.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserExtraConfiguration.kt
index 14390632d..9809f2e7c 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserExtraConfiguration.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserExtraConfiguration.kt
@@ -55,11 +55,11 @@ class UserExtraConfiguration(key: String) : TabConfiguration.ExtraConfiguration(
         hintView.visibility = View.VISIBLE
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         when (requestCode) {
             1 -> {
                 if (resultCode == Activity.RESULT_OK) {
-                    val user: ParcelableUser = data.getParcelableExtra(EXTRA_USER)
+                    val user: ParcelableUser = data!!.getParcelableExtra(EXTRA_USER)
                     viewHolder.display(user, dependencyHolder.mediaLoader, dependencyHolder.userColorNameManager, true)
                     viewHolder.view.visibility = View.VISIBLE
                     hintView.visibility = View.GONE
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserListExtraConfiguration.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserListExtraConfiguration.kt
index cef419214..24099e4e6 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserListExtraConfiguration.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserListExtraConfiguration.kt
@@ -55,11 +55,11 @@ class UserListExtraConfiguration(key: String) : TabConfiguration.ExtraConfigurat
         hintView.visibility = View.VISIBLE
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         when (requestCode) {
             1 -> {
                 if (resultCode == Activity.RESULT_OK) {
-                    val userList: ParcelableUserList = data.getParcelableExtra(EXTRA_USER_LIST)
+                    val userList: ParcelableUserList = data!!.getParcelableExtra(EXTRA_USER_LIST)
                     viewHolder.display(userList, dependencyHolder.mediaLoader,
                             dependencyHolder.userColorNameManager, true)
                     viewHolder.itemView.visibility = View.VISIBLE