Merge branch 'dev' into sealed-sender

src/org/thoughtcrime/securesms/loki/LokiRSSFeedPoller.kt

@@ -4,8 +4,9 @@ import android.content.Context
 import android.os.Handler
 import android.text.Html
 import android.util.Log
-import com.prof.rssparser.Parser
-import kotlinx.coroutines.*
+import com.prof.rssparser.engine.XMLParser
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.Runnable
 import org.thoughtcrime.securesms.jobs.PushDecryptJob
 import org.whispersystems.libsignal.util.guava.Optional
 import org.whispersystems.signalservice.api.messages.SignalServiceContent
@@ -13,6 +14,8 @@ import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
 import org.whispersystems.signalservice.loki.api.LokiRSSFeed
+import org.whispersystems.signalservice.loki.api.LokiRSSProxy
+import org.whispersystems.signalservice.loki.utilities.successBackground
 import java.text.SimpleDateFormat
 import java.util.regex.Pattern
 
@@ -22,7 +25,6 @@ class LokiRSSFeedPoller(private val context: Context, private val feed: LokiRSSF
     private var hasStarted = false
 
     private val task = object : Runnable {
-
         override fun run() {
             poll()
             handler.postDelayed(this, interval)
@@ -46,11 +48,8 @@ class LokiRSSFeedPoller(private val context: Context, private val feed: LokiRSSF
     }
 
     private fun poll() {
-        CoroutineScope(Dispatchers.Main).launch {
-            try {
-                val url = feed.url
-                val parser = Parser()
-                val items = parser.getArticles(url)
+        LokiRSSProxy.fetch(feed.url).successBackground { xml ->
+            val items = XMLParser(xml).call()
             items.reversed().forEach { item ->
                 val title = item.title ?: return@forEach
                 val description = item.description ?: return@forEach
@@ -69,9 +68,8 @@ class LokiRSSFeedPoller(private val context: Context, private val feed: LokiRSSF
                 val x3 = SignalServiceContent(x2, "Loki", SignalServiceAddress.DEFAULT_DEVICE_ID, timestamp, false, false)
                 PushDecryptJob(context).handleTextMessage(x3, x2, Optional.absent(), Optional.absent())
             }
-            } catch (exception: Exception) {
-                Log.d("Loki", "Couldn't update RSS feed with ID: $feed.id.")
-            }
+        }.fail { exception ->
+            Log.d("Loki", "Couldn't update RSS feed with ID: $feed.id. $exception")
         }
     }
 }