@@ -50,7 +50,7 @@ class EmojisFragment : Fragment() {
5050 super .onStart()
5151
5252 // Download Emojis from REST API, and store them in the database
53- val baseApplication = activity!! .application as BaseApplication
53+ val baseApplication = activity? .application as ? BaseApplication ? : return
5454 val retrofit = baseApplication.retrofit
5555 val emojisService = retrofit.create(EmojisService ::class .java)
5656 val emojiGsonsCall = emojisService.listEmojis()
@@ -64,7 +64,7 @@ class EmojisFragment : Fragment() {
6464
6565 Log .i(javaClass.name, " response: $response " )
6666 if (response.isSuccessful) {
67- val emojiGsons = response.body()!!
67+ val emojiGsons = response.body() ? : return
6868 Log .i(javaClass.name, " emojiGsons.size(): " + emojiGsons.size)
6969
7070 if (emojiGsons.isNotEmpty()) {
@@ -114,29 +114,31 @@ class EmojisFragment : Fragment() {
114114
115115 // Store the Emoji in the database
116116 val emoji = getEmoji(emojiGson)
117- emojiDao.insert(emoji)
118- Log .i(javaClass.name, " Stored Emoji in database with ID " + emoji!! .id)
117+ emoji?.let {
118+ emojiDao.insert(emoji)
119+ Log .i(javaClass.name, " Stored Emoji in database with ID " + emoji.id)
120+ }
119121
120122 // Store all the Emoji's Word labels in the database
121123 val wordGsons = emojiGson.words
122124 Log .i(javaClass.name, " wordGsons.size(): " + wordGsons.size)
123125 for (wordGson in wordGsons) {
124126 Log .i(javaClass.name, " wordGson.getId(): " + wordGson.id)
125- val emoji_Word = Emoji_Word ()
126- emoji_Word .emoji_id = emojiGson.id
127- emoji_Word .words_id = wordGson.id
128- emojiWordDao.insert(emoji_Word )
127+ val emojiWord = Emoji_Word ()
128+ emojiWord .emoji_id = emojiGson.id
129+ emojiWord .words_id = wordGson.id
130+ emojiWordDao.insert(emojiWord )
129131 Log .i(
130132 javaClass.name,
131- " Stored Emoji_Word in database. Emoji_id: " + emoji_Word .emoji_id + " , words_id: " + emoji_Word .words_id
133+ " Stored Emoji_Word in database. Emoji_id: " + emojiWord .emoji_id + " , words_id: " + emojiWord .words_id
132134 )
133135 }
134136 }
135137
136138 // Update the UI
137139 val emojis = emojiDao.loadAll()
138140 Log .i(javaClass.name, " emojis.size(): " + emojis.size)
139- activity!! .runOnUiThread {
141+ activity? .runOnUiThread {
140142 binding.textEmojis.text = " emojis.size(): " + emojis.size
141143 Snackbar .make(binding.textEmojis, " emojis.size(): " + emojis.size, Snackbar .LENGTH_LONG )
142144 .show()
0 commit comments