wip updating dependencies

19 files changed, 64 insertions, 69 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/Application.kt b/app/src/main/java/net/lacolaco/smileessence/Application.kt
index 7c4350b6..9158a6b8 100644
--- a/app/src/main/java/net/lacolaco/smileessence/Application.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/Application.kt
@@ -3,7 +3,7 @@ package net.lacolaco.smileessence
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
 import android.widget.Toast
 import com.squareup.leakcanary.LeakCanary
 
diff --git a/app/src/main/java/net/lacolaco/smileessence/World.kt b/app/src/main/java/net/lacolaco/smileessence/World.kt
index 589347a0..aa37a6a6 100644
--- a/app/src/main/java/net/lacolaco/smileessence/World.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/World.kt
@@ -4,8 +4,8 @@ import android.content.ContentValues
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
-import android.support.annotation.StringRes
-import android.support.design.widget.Snackbar
+import androidx.annotation.StringRes
+import com.google.android.material.snackbar.Snackbar
 import android.view.View
 import com.beust.klaxon.JsonArray
 import com.beust.klaxon.JsonObject
@@ -32,7 +32,7 @@ import twitter4j.auth.AccessToken
 import twitter4j.conf.ConfigurationBuilder
 import java.lang.ref.WeakReference
 import java.util.*
-import kotlin.coroutines.experimental.suspendCoroutine
+import kotlin.coroutines.*
 
 /**
  * World contains data that are specific to a profile.
@@ -380,7 +380,7 @@ class World private constructor(private val persistentData: PersistentData) {
             }
 
             private fun parsePageInfos(input: String): MutableList<PageInfo> {
-                val json = Parser().parse(StringBuilder(input)) as JsonArray<*>
+                val json = Parser.default().parse(StringBuilder(input)) as JsonArray<*>
                 return json.map { PageInfo.fromJsonObject(it as JsonObject) }.toMutableList()
             }
 
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)
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 7f8d1f6b..ee67d8a4 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/ManagePagesActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/ManagePagesActivity.kt
@@ -2,12 +2,12 @@ package net.lacolaco.smileessence.activity
 
 import android.app.ActivityManager
 import android.os.Bundle
-import android.support.design.widget.Snackbar
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.DividerItemDecoration
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.helper.ItemTouchHelper
+import com.google.android.material.snackbar.Snackbar
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.ItemTouchHelper
 import android.view.View
 import android.view.ViewGroup
 
@@ -89,7 +89,7 @@ class ManagePagesActivity : AppCompatActivity() {
                     mainActivityNeedsRestart = true
                     val item = types[i].second()
                     world.pages.add(item)
-                    recycler_view.adapter.notifyItemInserted(world.pages.size - 1)
+                    recycler_view.adapter!!.notifyItemInserted(world.pages.size - 1)
                     openItemEditor(item)
                 }.show()
     }
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 14d81dbf..d9961700 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt
@@ -6,20 +6,23 @@ import android.content.pm.PackageManager
 import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
-import android.support.design.widget.Snackbar
-import android.support.v4.app.ActivityCompat
-import android.support.v4.content.ContextCompat
-import android.support.v4.content.pm.ShortcutInfoCompat
-import android.support.v4.content.pm.ShortcutManagerCompat
-import android.support.v4.graphics.drawable.IconCompat
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.*
+import com.google.android.material.snackbar.Snackbar
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.core.content.pm.ShortcutInfoCompat
+import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.graphics.drawable.IconCompat
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.*
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.Toast
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import kotlinx.android.synthetic.main.activity_manage_profiles.*
 import kotlinx.android.synthetic.main.list_item_profile.view.*
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 5e877b22..c9d9ba1a 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/OAuthActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/OAuthActivity.kt
@@ -5,7 +5,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.text.Editable
 import android.text.TextWatcher
 import android.widget.Toast
diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/Tweets.kt b/app/src/main/java/net/lacolaco/smileessence/twitter/Tweets.kt
index 236289af..3cf94271 100644
--- a/app/src/main/java/net/lacolaco/smileessence/twitter/Tweets.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/twitter/Tweets.kt
@@ -1,14 +1,12 @@
 package net.lacolaco.smileessence.twitter
 
-import kotlinx.coroutines.experimental.CommonPool
-import kotlinx.coroutines.experimental.async
 import net.lacolaco.smileessence.World
 import net.lacolaco.smileessence.entity.Tweet
 import net.lacolaco.smileessence.util.bg
 import twitter4j.StatusUpdate
 import java.io.InputStream
 
-fun World.getTweetAsync(id: Long, fetchAlways: Boolean = true) = async(CommonPool) {
+fun World.getTweetAsync(id: Long, fetchAlways: Boolean = true) = bg {
     if (!fetchAlways) {
         Tweet.fetch(id)
     } else {
@@ -18,7 +16,7 @@ fun World.getTweetAsync(id: Long, fetchAlways: Boolean = true) = async(CommonPoo
     }
 }
 
-fun World.deleteTweetAsync(id: Long) = async(CommonPool) {
+fun World.deleteTweetAsync(id: Long) = bg {
     Tweet.fromTwitter(TwitterTaskException.wrap {
         twitter.tweets().destroyStatus(id)
     }, id)
diff --git a/app/src/main/java/net/lacolaco/smileessence/util/UIHelpers.kt b/app/src/main/java/net/lacolaco/smileessence/util/UIHelpers.kt
index 1bea55ab..898a9221 100644
--- a/app/src/main/java/net/lacolaco/smileessence/util/UIHelpers.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/util/UIHelpers.kt
@@ -1,8 +1,7 @@
 package net.lacolaco.smileessence.util
 
 import android.util.Log
-import kotlinx.coroutines.experimental.*
-import kotlinx.coroutines.experimental.android.UI
+import kotlinx.coroutines.*
 import net.lacolaco.smileessence.World
 import java.lang.ref.WeakReference
 
@@ -12,18 +11,14 @@ private val exceptionHandler = CoroutineExceptionHandler { c, throwable ->
     throw throwable
 }
 
-val uiContext = UI + exceptionHandler
-val bgContext = CommonPool + exceptionHandler
-
-fun launchUi(block: suspend CoroutineScope.() -> Unit) {
-    launch(uiContext, CoroutineStart.DEFAULT, null, null, block)
-}
+fun launchUi(block: suspend CoroutineScope.() -> Unit) =
+        GlobalScope.launch(Dispatchers.Main, block = block)
 
 fun <T> bg(block: suspend CoroutineScope.() -> T) =
-        async(bgContext, CoroutineStart.DEFAULT, null, null, block)
+        GlobalScope.async(Dispatchers.Default + exceptionHandler, block = block)
 
 fun launchBg(block: suspend CoroutineScope.() -> Unit) =
-        launch(bgContext, CoroutineStart.DEFAULT, null, null, block)
+        GlobalScope.launch(Dispatchers.Default + exceptionHandler, block = block)
 
 fun World.getMainActivityOrCancel() =
         getMainActivity() ?: throw CancellationException("MainActivity is gone")
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 e8126136..97bd8cc0 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/ActionMenuView.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/ActionMenuView.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.MenuItem
 
-class ActionMenuView : android.support.v7.widget.ActionMenuView {
+class ActionMenuView : androidx.appcompat.widget.ActionMenuView {
     constructor(context: Context) : super(context)
     constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
 
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/Confirmation.kt b/app/src/main/java/net/lacolaco/smileessence/view/Confirmation.kt
index 73a8e139..587e471c 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/Confirmation.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/Confirmation.kt
@@ -2,7 +2,7 @@ package net.lacolaco.smileessence.view
 
 import android.app.Fragment
 import android.content.Context
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import net.lacolaco.smileessence.R
 
 fun Context.confirm(text: String, onOk: () -> Unit) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/EmbeddedMenuLayout.kt b/app/src/main/java/net/lacolaco/smileessence/view/EmbeddedMenuLayout.kt
index 76990ff4..b0df97c9 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/EmbeddedMenuLayout.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/EmbeddedMenuLayout.kt
@@ -3,7 +3,7 @@ package net.lacolaco.smileessence.view
 import android.annotation.TargetApi
 import android.content.Context
 import android.os.Build
-import android.support.v7.widget.AppCompatTextView
+import androidx.appcompat.widget.AppCompatTextView
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/MainFragmentPagerAdapter.kt b/app/src/main/java/net/lacolaco/smileessence/view/MainFragmentPagerAdapter.kt
index c0f62992..14a9fc14 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/MainFragmentPagerAdapter.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/MainFragmentPagerAdapter.kt
@@ -3,8 +3,8 @@ package net.lacolaco.smileessence.view
 import android.app.Fragment
 import android.app.FragmentManager
 import android.os.Bundle
-import android.support.v13.app.FragmentPagerAdapter
-import android.support.v4.view.ViewPager
+import androidx.legacy.app.FragmentPagerAdapter
+import androidx.viewpager.widget.ViewPager
 import android.view.ViewGroup
 import net.lacolaco.smileessence.World
 import net.lacolaco.smileessence.data.PageInfo
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 7980368f..f0476fe7 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/PopupMenu.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/PopupMenu.kt
@@ -5,7 +5,7 @@ import android.view.MenuItem
 import android.view.View
 
 class PopupMenu(context: Context, anchor: View) {
-    private val popupMenu = android.support.v7.widget.PopupMenu(context, anchor)
+    private val popupMenu = androidx.appcompat.widget.PopupMenu(context, anchor)
     private val menuItems = LinkedHashMap<MenuItem, (MenuItem) -> Unit>()
 
     init {
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 7c98a118..7210a228 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
@@ -2,9 +2,9 @@ package net.lacolaco.smileessence.view.dialog
 
 import android.app.DialogFragment
 import android.os.Bundle
-import android.support.v7.widget.DividerItemDecoration
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -19,7 +19,7 @@ import net.lacolaco.smileessence.view.confirm
 
 class EditTweetsPageDialogFragment : DialogFragment() {
     private val pageInfo by lazy {
-        PageInfo.fromJsonObject(Parser().parse(arguments.getString(KEY_PAGE_INFO)) as JsonObject) as
+        PageInfo.fromJsonObject(Parser.default().parse(arguments.getString(KEY_PAGE_INFO)) as JsonObject) as
                 PageInfo.TweetsPageInfo
     }
     private val patterns: MutableList<String> by lazy {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StackableDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StackableDialogFragment.kt
index 8b08c271..1989a2cb 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/StackableDialogFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/StackableDialogFragment.kt
@@ -3,7 +3,7 @@ package net.lacolaco.smileessence.view.dialog
 import android.app.Dialog
 import android.app.DialogFragment
 import android.os.Bundle
-import android.support.v7.app.AppCompatDialog
+import androidx.appcompat.app.AppCompatDialog
 import android.view.Window
 import net.lacolaco.smileessence.World
 import net.lacolaco.smileessence.activity.MainActivity
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 e9014a4c..6692f8f9 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
@@ -1,9 +1,9 @@
 package net.lacolaco.smileessence.view.dialog
 
 import android.os.Bundle
-import android.support.v7.widget.DividerItemDecoration
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.text.Html
 import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
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 018184f7..e8e3737b 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
@@ -7,8 +7,8 @@ import android.net.Uri
 import android.os.Bundle
 import android.os.Parcelable
 import android.provider.MediaStore
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.text.Editable
 import android.text.Spannable
 import android.text.TextWatcher
@@ -115,10 +115,7 @@ class ComposePageFragment : PageFragment<PageInfo.ComposePageInfo>(), TextWatche
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        if (savedInstanceState != null)
-            postState = savedInstanceState.getParcelable(KEY_POST_STATE)
-        else
-            postState = PostState()
+        postState = savedInstanceState?.getParcelable(KEY_POST_STATE) ?: PostState()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -198,7 +195,7 @@ class ComposePageFragment : PageFragment<PageInfo.ComposePageInfo>(), TextWatche
             REQUEST_OPEN_DOCUMENT -> {
                 if (resultCode != Activity.RESULT_OK)
                     return
-                setMediaFile(data!!.data)
+                setMediaFile(data!!.data!!)
             }
             else -> super.onActivityResult(requestCode, resultCode, data)
         }
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/ListPageFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/ListPageFragment.kt
index b97824f2..99652d52 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/ListPageFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/ListPageFragment.kt
@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.omadahealth.github.swipyrefreshlayout.library.SwipyRefreshLayout
 import kotlinx.android.synthetic.main.page_fragment_list.*
-import kotlinx.coroutines.experimental.Deferred
+import kotlinx.coroutines.Deferred
 import net.lacolaco.smileessence.R
 import net.lacolaco.smileessence.data.PageInfo
 import net.lacolaco.smileessence.entity.Tweet
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/TimelinePageFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/TimelinePageFragment.kt
index f664bd5b..a18efc03 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/TimelinePageFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/TimelinePageFragment.kt
@@ -1,9 +1,9 @@
 package net.lacolaco.smileessence.view.page
 
 import android.os.Bundle
-import android.support.v7.widget.DividerItemDecoration
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -36,7 +36,7 @@ abstract class TimelinePageFragment<T : IdObject, out PI : PageInfo> : PageFragm
             override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
                 if (positionStart == 0 && itemCount == 1 &&
                         lm.findFirstVisibleItemPosition() == 0 &&
-                        (lm.getChildAt(0) != null || lm.getChildAt(0).top == 0)) {
+                        (lm.getChildAt(0) == null || lm.getChildAt(0)!!.top == 0)) {
                     tweets_recycler_view.scrollToPosition(0)
                 }
             }