cleanup

19 files changed, 46 insertions, 55 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/Application.kt b/app/src/main/java/net/lacolaco/smileessence/Application.kt
index a0c3fa25..7c4350b6 100644
--- a/app/src/main/java/net/lacolaco/smileessence/Application.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/Application.kt
@@ -71,8 +71,8 @@ class Application : android.app.Application() {
         }
 
         companion object {
-            private val DATABASE_NAME = "main.db"
-            private val DATABASE_VERSION = 2
+            private const val DATABASE_NAME = "main.db"
+            private const val DATABASE_VERSION = 2
         }
     }
 
diff --git a/app/src/main/java/net/lacolaco/smileessence/World.kt b/app/src/main/java/net/lacolaco/smileessence/World.kt
index a03c90b7..58f994cd 100644
--- a/app/src/main/java/net/lacolaco/smileessence/World.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/World.kt
@@ -89,7 +89,7 @@ class World private constructor(private val persistentData: PersistentData) {
                 val ssl = getSavedSearchesAsync().await()
                 savedSearches.clear()
                 for (ss in ssl)
-                    savedSearches.put(ss.id, ss)
+                    savedSearches[ss.id] = ss
             } catch (e: TwitterTaskException) {
             }
         }
@@ -202,12 +202,12 @@ class World private constructor(private val persistentData: PersistentData) {
     fun addTimeline(key: Any, callback: (Tweet) -> Unit) {
         for ((_, item) in tweets)
             callback(item)
-        tweetNotifiers.put(key, callback)
+        tweetNotifiers[key] = callback
     }
 
     @Synchronized
     fun addTweet(item: Tweet) {
-        tweets.put(item.id, item)
+        tweets[item.id] = item
         for ((_, callback) in tweetNotifiers)
             callback(item)
     }
@@ -215,7 +215,7 @@ class World private constructor(private val persistentData: PersistentData) {
     @Synchronized
     fun addTweetAll(collection: Collection<Tweet>) {
         for (item in collection) {
-            tweets.put(item.id, item)
+            tweets[item.id] = item
             for ((_, callback) in tweetNotifiers)
                 callback(item)
         }
@@ -227,7 +227,7 @@ class World private constructor(private val persistentData: PersistentData) {
     fun addEventNotifier(key: Any, notify: (Event) -> Unit) {
         for (item in events)
             notify(item)
-        eventNotifiers.put(key, notify)
+        eventNotifiers[key] = notify
     }
 
     fun addEvent(item: Event) {
@@ -241,16 +241,6 @@ class World private constructor(private val persistentData: PersistentData) {
     val isStreaming: Boolean
         get() = stream.connected
 
-    // Lists
-
-    fun addListSubscription(fullName: String): Boolean {
-        return listSubscriptions.add(fullName)
-    }
-
-    fun removeListSubscription(fullName: String): Boolean {
-        return listSubscriptions.remove(fullName)
-    }
-
     // Notifications
 
     fun notify(text: String) {
@@ -317,7 +307,8 @@ class World private constructor(private val persistentData: PersistentData) {
         }
 
         fun register(token: String, tokenSecret: String, userId: Long, screenName: String): World {
-            val world = cache[userId] ?: World(PersistentData(userId, token, tokenSecret, screenName))
+            val world = cache[userId]
+                    ?: World(PersistentData(userId, token, tokenSecret, screenName))
             world.persistentData.oauthToken = token
             world.persistentData.oauthTokenSecret = tokenSecret
             world.persistentData.screenName = screenName
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 0e58fec0..0a039da0 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
@@ -36,7 +36,8 @@ import java.util.regex.Pattern
 class MainActivity : AppCompatActivity() {
     val world by lazy {
         val uri = intent.data ?: throw IllegalStateException("[BUG] data not set")
-        val userIdValue = uri.getQueryParameter("user_id") ?: throw IllegalStateException("[BUG] user_id not set")
+        val userIdValue = uri.getQueryParameter("user_id")
+                ?: throw IllegalStateException("[BUG] user_id not set")
         World[userIdValue.toLong()]
     }
     private lateinit var pagerAdapter: MainFragmentPagerAdapter
@@ -113,13 +114,13 @@ class MainActivity : AppCompatActivity() {
                     var text = uri.getQueryParameter("text") ?: ""
                     val url = uri.getQueryParameter("url")
                     if (!TextUtils.isEmpty(url))
-                        text += " " + url
+                        text += " $url"
                     val hashtags = uri.getQueryParameter("hashtags")
                     if (!TextUtils.isEmpty(hashtags))
                         text += " " + hashtags.trim { it <= ' ' }.replace(",".toRegex(), " #")
                     val via = uri.getQueryParameter("via")
                     if (!TextUtils.isEmpty(via))
-                        text += " via @" + via
+                        text += " via @$via"
                     val postPagePosition = world.pages.indexOfFirst { it is PageInfo.ComposePageInfo }
                     assert(postPagePosition != -1)
                     (pagerAdapter.getPageFragmentAt(postPagePosition) as ComposePageFragment).setText(text)
@@ -276,7 +277,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     companion object {
-        private val REQUEST_CODE_MANAGE_PAGES = 12
+        private const val REQUEST_CODE_MANAGE_PAGES = 12
         private val TWITTER_POST_PATTERN = Pattern.compile("\\A/(intent/tweet|share)\\z")
         private val TWITTER_STATUS_PATTERN = Pattern.compile("\\A(?:/#!)?/(?:\\w{1,15})/status(?:es)?/(\\d+)\\z")
         private val TWITTER_USER_PATTERN = Pattern.compile("\\A(?:/#!)?/(\\w{1,15})/?\\z")
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/ManagePagesActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/ManagePagesActivity.kt
index da3e2232..7f8d1f6b 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/ManagePagesActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/ManagePagesActivity.kt
@@ -102,8 +102,8 @@ class ManagePagesActivity : AppCompatActivity() {
     }
 
     companion object {
-        val INTENT_KEY_WORLD_ID = "WORLD_ID"
-        private val KEY_IS_CHANGED = "IS_CHANGED"
+        const val INTENT_KEY_WORLD_ID = "WORLD_ID"
+        private const val KEY_IS_CHANGED = "IS_CHANGED"
     }
 
     private inner class PagesAdapter : RecyclerView.Adapter<PagesAdapter.ViewHolder>() {
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt
index 0d771f42..aef591b1 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt
@@ -242,8 +242,8 @@ class ManageProfilesActivity : AppCompatActivity() {
     }
 
     companion object {
-        val INTENT_KEY_NOINIT = "noInit"
-        private val REQUEST_OAUTH = 10
-        private val REQUEST_WRITE_EXTERNAL_STORAGE_PERMISSION = 11
+        const val INTENT_KEY_NOINIT = "noInit"
+        private const val REQUEST_OAUTH = 10
+        private const val REQUEST_WRITE_EXTERNAL_STORAGE_PERMISSION = 11
     }
 }
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 11a912f0..5e877b22 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/OAuthActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/OAuthActivity.kt
@@ -44,7 +44,7 @@ class OAuthActivity : AppCompatActivity() {
             }
 
         button_oauth_auth.isEnabled = false
-        editText_oauth_pin.addTextChangedListener(object : TextWatcher {
+        editText_oauth_verifier.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(p0: Editable) {}
 
             override fun beforeTextChanged(p0: CharSequence, p1: Int, p2: Int, p3: Int) {}
@@ -53,7 +53,7 @@ class OAuthActivity : AppCompatActivity() {
                 button_oauth_auth.isEnabled = requestTokenPair != null && p0.isNotEmpty()
             }
         })
-        button_oauth_auth.setOnClickListener { verify(editText_oauth_pin.text.toString()) }
+        button_oauth_auth.setOnClickListener { verify(editText_oauth_verifier.text.toString()) }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -85,11 +85,11 @@ class OAuthActivity : AppCompatActivity() {
     }
 
     companion object {
-        val KEY_TOKEN = "token"
-        val KEY_TOKEN_SECRET = "tokenSecret"
-        val KEY_SCREEN_NAME = "screenName"
-        val KEY_USER_ID = "userID"
-        private val KEY_REQUEST_TOKEN = "REQUEST_TOKEN"
+        const val KEY_TOKEN = "token"
+        const val KEY_TOKEN_SECRET = "tokenSecret"
+        const val KEY_SCREEN_NAME = "screenName"
+        const val KEY_USER_ID = "userID"
+        private const val KEY_REQUEST_TOKEN = "REQUEST_TOKEN"
     }
 
     @Parcelize
diff --git a/app/src/main/java/net/lacolaco/smileessence/entity/Tweet.kt b/app/src/main/java/net/lacolaco/smileessence/entity/Tweet.kt
index 373d37dd..1c4b34c1 100644
--- a/app/src/main/java/net/lacolaco/smileessence/entity/Tweet.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/entity/Tweet.kt
@@ -72,7 +72,7 @@ class Tweet private constructor(
                     favoriteCount = st.favoriteCount
                     retweetCount = st.retweetCount
                 }
-                storage.put(st.id, t)
+                storage[st.id] = t
             } else {
                 User.fromTwitter(st.user)
                 st.retweetedStatus?.let { Tweet.fromTwitter(it, myUserId) }
diff --git a/app/src/main/java/net/lacolaco/smileessence/entity/User.kt b/app/src/main/java/net/lacolaco/smileessence/entity/User.kt
index 899bd65c..098faf56 100644
--- a/app/src/main/java/net/lacolaco/smileessence/entity/User.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/entity/User.kt
@@ -66,7 +66,7 @@ class User private constructor(override val id: Long, screenName: String, rawPro
             var user = fetch(t4juser.id)
             if (user == null) {
                 user = User(t4juser.id, t4juser.screenName, "<not set>")
-                storage.put(t4juser.id, user)
+                storage[t4juser.id] = user
             }
 
             user.isProtected = t4juser.isProtected
@@ -91,9 +91,9 @@ class User private constructor(override val id: Long, screenName: String, rawPro
 
         @Synchronized
         fun makeSkeletonForInternalUseOnly(id: Long, screenName: String, profileImageUrl: String) =
-                fetch(id) ?: User(id, screenName, profileImageUrl).apply { storage.put(id, this) }
+                fetch(id) ?: User(id, screenName, profileImageUrl).apply { storage[id] = this }
 
-        val DEFAULT_PROFILE_IMAGE_URL =
+        const val DEFAULT_PROFILE_IMAGE_URL =
                 "https://abs.twimg.com/sticky/default_profile_images/default_profile.png"
 
         val placeHolder = makeSkeletonForInternalUseOnly(-1, "<place holder>",
diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/Timelines.kt b/app/src/main/java/net/lacolaco/smileessence/twitter/Timelines.kt
index 02205b04..a5af917c 100644
--- a/app/src/main/java/net/lacolaco/smileessence/twitter/Timelines.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/twitter/Timelines.kt
@@ -35,7 +35,7 @@ fun World.getUserTimelineAsync(id: Long, sinceId: Long? = null, maxId: Long? = n
 
 // XXX: Use numeric ID
 fun World.getListTimelineAsync(listName: String, sinceId: Long? = null, maxId: Long? = null) = bg {
-    val strings = listName.split("/".toRegex()).dropLastWhile({ it.isEmpty() }).toTypedArray()
+    val strings = listName.split("/".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
     Tweet.fromTwitter(TwitterTaskException.wrap {
         twitter.list().getUserListStatuses(strings[0], strings[1], makePaging(sinceId, maxId))
     }, id)
diff --git a/app/src/main/java/net/lacolaco/smileessence/util/SortedList.kt b/app/src/main/java/net/lacolaco/smileessence/util/SortedList.kt
index 2030dbac..e4369643 100644
--- a/app/src/main/java/net/lacolaco/smileessence/util/SortedList.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/util/SortedList.kt
@@ -35,6 +35,5 @@ class SortedList<T : IdObject> constructor(
     val size
         get() = arrayList.size
 
-    private fun applyReversedOrder(pos: Int): Int
-            = arrayList.size - pos - 1
+    private fun applyReversedOrder(pos: Int): Int = arrayList.size - pos - 1
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/ActionMenuView.kt b/app/src/main/java/net/lacolaco/smileessence/view/ActionMenuView.kt
index 9223e684..e8126136 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/ActionMenuView.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/ActionMenuView.kt
@@ -18,11 +18,11 @@ class ActionMenuView : android.support.v7.widget.ActionMenuView {
 
     fun add(title: String, cb: (MenuItem) -> Unit) = apply {
         val item = menu.add(title)
-        menuItems.put(item, cb)
+        menuItems[item] = cb
     }
 
     fun add(titleRes: Int, cb: (MenuItem) -> Unit) = apply {
         val item = menu.add(titleRes)
-        menuItems.put(item, cb)
+        menuItems[item] = cb
     }
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/PopupMenu.kt b/app/src/main/java/net/lacolaco/smileessence/view/PopupMenu.kt
index bb765792..7980368f 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/PopupMenu.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/PopupMenu.kt
@@ -17,12 +17,12 @@ class PopupMenu(context: Context, anchor: View) {
 
     fun add(title: String, cb: (MenuItem) -> Unit) = apply {
         val item = popupMenu.menu.add(title)
-        menuItems.put(item, cb)
+        menuItems[item] = cb
     }
 
     fun add(titleRes: Int, cb: (MenuItem) -> Unit) = apply {
         val item = popupMenu.menu.add(titleRes)
-        menuItems.put(item, cb)
+        menuItems[item] = cb
     }
 
     fun show() = popupMenu.show()
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/EditTweetsPageDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/EditTweetsPageDialogFragment.kt
index c8be4fb7..7c98a118 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/EditTweetsPageDialogFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/EditTweetsPageDialogFragment.kt
@@ -75,8 +75,8 @@ class EditTweetsPageDialogFragment : DialogFragment() {
     }
 
     companion object {
-        private val KEY_WORLD_USER_ID = "KEY_WORLD_USER_ID"
-        private val KEY_PAGE_INFO = "KEY_PAGE_INFO"
+        private const val KEY_WORLD_USER_ID = "KEY_WORLD_USER_ID"
+        private const val KEY_PAGE_INFO = "KEY_PAGE_INFO"
 
         fun newInstance(world: World, item: PageInfo.TweetsPageInfo): EditTweetsPageDialogFragment {
             val obj = EditTweetsPageDialogFragment()
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 d0d42bf3..cb6d0b4d 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
@@ -192,7 +192,7 @@ class StatusDetailDialogFragment : StackableDialogFragment() {
     }
 
     companion object {
-        private val KEY_STATUS_ID = "status_id"
+        private const val KEY_STATUS_ID = "status_id"
 
         fun newInstance(tweet: Tweet): StatusDetailDialogFragment {
             val obj = StatusDetailDialogFragment()
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 c7b170db..33353d17 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
@@ -227,7 +227,7 @@ class UserDetailDialogFragment : StackableDialogFragment() {
     }
 
     companion object {
-        private val KEY_USER_ID = "userID"
+        private const val KEY_USER_ID = "userID"
 
         fun newInstance(user: User): UserDetailDialogFragment {
             val obj = UserDetailDialogFragment()
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 3fdfaaed..018184f7 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
@@ -232,8 +232,8 @@ class ComposePageFragment : PageFragment<PageInfo.ComposePageInfo>(), TextWatche
     }
 
     companion object {
-        private val REQUEST_OPEN_DOCUMENT = 10
-        val KEY_POST_STATE = "POST_STATE"
+        private const val REQUEST_OPEN_DOCUMENT = 10
+        const val KEY_POST_STATE = "POST_STATE"
     }
 
     private inner class MediaAdapter : RecyclerView.Adapter<MediaAdapter.ViewHolder>() {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/PageFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/PageFragment.kt
index bd25207f..4f70899f 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/PageFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/PageFragment.kt
@@ -27,7 +27,7 @@ abstract class PageFragment<out T : PageInfo> : Fragment() {
     open fun refresh() {}
 
     companion object {
-        val KEY_WORLD_USER_ID = "KEY_WORLD_USER_ID"
-        val KEY_PAGE_POSITION = "KEY_PAGE_POSITION"
+        const val KEY_WORLD_USER_ID = "KEY_WORLD_USER_ID"
+        const val KEY_PAGE_POSITION = "KEY_PAGE_POSITION"
     }
 }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/SearchPageFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/SearchPageFragment.kt
index c9afb02f..3b52185f 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/SearchPageFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/SearchPageFragment.kt
@@ -138,7 +138,7 @@ class SearchPageFragment : RefreshableTimelinePageFragment<Tweet, PageInfo.Searc
         try {
             val ss = world.createSavedSearchAsync(text).await()
             world.notify(R.string.notice_query_saved)
-            world.savedSearches.put(ss.id, ss)
+            world.savedSearches[ss.id] = ss
         } catch (e: TwitterTaskException) {
             world.notifyError("Query is not saved")
         }
diff --git a/app/src/main/res/layout/layout_oauth.xml b/app/src/main/res/layout/layout_oauth.xml
index d7151d37..61911a30 100644
--- a/app/src/main/res/layout/layout_oauth.xml
+++ b/app/src/main/res/layout/layout_oauth.xml
@@ -20,7 +20,7 @@
         android:autoLink="web" />
 
     <EditText
-        android:id="@+id/editText_oauth_pin"
+        android:id="@+id/editText_oauth_verifier"
         android:layout_width="200sp"
         android:layout_height="wrap_content"
         android:layout_gravity="center"