Fix build errors after merge

app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt

@@ -119,7 +119,7 @@ interface MastodonApi {
             @Query("since_id") sinceId: String?,
             @Query("with_muted") withMuted: Boolean?,
             @Query("include_types[]") includeTypes: List<String>?
-    ): Call<List<Notification>>
+    ): Single<List<Notification>>
 
     @POST("api/v1/notifications/clear")
     fun clearNotifications(): Call<ResponseBody>

app/src/main/java/com/keylesspalace/tusky/util/EmojiCompatFont.kt

@@ -6,8 +6,8 @@ import android.util.Pair
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.annotation.VisibleForTesting
-import androidx.emoji.text.EmojiCompat;
-import androidx.emoji.bundled.BundledEmojiCompatConfig;
+import androidx.emoji.text.EmojiCompat
+import androidx.emoji.bundled.BundledEmojiCompatConfig
 import com.keylesspalace.tusky.R
 import de.c1710.filemojicompat.FileEmojiCompatConfig
 import io.reactivex.Observable
@@ -67,7 +67,7 @@ class EmojiCompatFont(
         }
     }
 
-    fun getConfig(context: Context): FileEmojiCompatConfig {
+    fun getConfig(context: Context): EmojiCompat.Config {
         if(this === SYSTEM_DEFAULT)
             return BundledEmojiCompatConfig(context);
         return FileEmojiCompatConfig(context, getLatestFontFile(context))

app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt

@@ -278,7 +278,7 @@ class StatusViewHelper(private val itemView: View) {
             val votes = NumberFormat.getNumberInstance().format(poll.votersCount.toLong())
             context.resources.getQuantityString(R.plurals.poll_info_people, poll.votersCount, votes)
         }
-        pollDurationInfo = if (poll.expired) {
+        val pollDurationInfo = if (poll.expired) {
             context.getString(R.string.poll_info_closed)
         } else {
             if (useAbsoluteTime) {