cleanupoldmaster

5 files changed, 5 insertions, 14 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.kt
index d52a7707..1afbf6b9 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.kt
@@ -39,8 +39,6 @@ import net.lacolaco.smileessence.logging.Logger
 import net.lacolaco.smileessence.view.adapter.UnorderedCustomListAdapter
 import net.lacolaco.smileessence.view.dialog.EditTextDialogFragment
 
-import java.util.ArrayList
-
 class EditExtractionActivity : Activity() {
     private val adapter by lazy {
         object : UnorderedCustomListAdapter<ExtractionWord>() {
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt
index 3428cc0a..6a0630bc 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt
@@ -28,13 +28,10 @@ import android.app.Activity
 import android.os.Bundle
 import android.support.v4.app.NavUtils
 import android.view.MenuItem
-import android.widget.LinearLayout
 import android.widget.TextView
 import kotlinx.android.synthetic.main.layout_license.*
-import net.lacolaco.smileessence.Application
 import net.lacolaco.smileessence.R
-
-import java.util.ArrayList
+import java.util.*
 
 class LicenseActivity : Activity() {
 
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 cdbc94d4..21f96254 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
@@ -39,7 +39,6 @@ import android.widget.ImageView
 import de.keyboardsurfer.android.widget.crouton.Crouton
 import kotlinx.android.synthetic.main.layout_main.*
 import net.lacolaco.smileessence.*
-import net.lacolaco.smileessence.command.CommandOpenUserDetail
 import net.lacolaco.smileessence.data.ExtractionWord
 import net.lacolaco.smileessence.entity.Tweet
 import net.lacolaco.smileessence.logging.Logger
@@ -52,7 +51,7 @@ import net.lacolaco.smileessence.view.dialog.StatusDetailDialogFragment
 import net.lacolaco.smileessence.view.dialog.UserDetailDialogFragment
 import net.lacolaco.smileessence.view.page.*
 import org.jetbrains.anko.browse
-import org.jetbrains.anko.startActivity;
+import org.jetbrains.anko.startActivity
 import java.util.regex.Pattern
 
 class MainActivity : Activity(), ViewPager.OnPageChangeListener {
@@ -77,11 +76,10 @@ class MainActivity : Activity(), ViewPager.OnPageChangeListener {
         setSelectedPageIndex(pagerAdapter.getIndex(PostFragment::class.java))
     }
 
-    fun openPostPageWithImage(uri: Uri) {
+    private fun openPostPageWithImage(uri: Uri) {
         try {
-            val c = contentResolver.query(uri, null, null, null, null)
-            assert(c != null)
-            c!!.moveToFirst()
+            val c = contentResolver.query(uri, null, null, null, null)!!
+            c.moveToFirst()
             val path = c.getString(c.getColumnIndex(MediaStore.MediaColumns.DATA))
             world.postState.beginTransaction()
                     .setMediaFilePath(path)
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/OAuthActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/OAuthActivity.kt
index 403ac40b..e7b92447 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/OAuthActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/OAuthActivity.kt
@@ -29,7 +29,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
-import android.view.View
 import kotlinx.android.synthetic.main.layout_oauth.*
 import kotlinx.coroutines.experimental.android.UI
 import kotlinx.coroutines.experimental.async
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/SettingActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/SettingActivity.kt
index 07518480..9fb148ea 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/SettingActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/SettingActivity.kt
@@ -28,7 +28,6 @@ import android.app.Activity
 import android.os.Bundle
 import android.support.v4.app.NavUtils
 import android.view.MenuItem
-import net.lacolaco.smileessence.Application
 import net.lacolaco.smileessence.R
 
 class SettingActivity : Activity() {