Fix community file download and restoring account (session-foundation#1862)

Author: SessionHero01

app/src/main/java/org/session/libsession/messaging/open_groups/api/CommunityApiBatcher.kt

@@ -45,6 +45,11 @@ class CommunityApiBatcher @Inject constructor(
             return null
         }
 
+        // Shouldn't batch APIs that return large amount of data
+        if (req.api is CommunityFileDownloadApi) {
+            return null
+        }
+
         // Only batch requests that require signing
         if (!req.api.requiresSigning) {
             return null

app/src/main/java/org/session/libsession/messaging/open_groups/api/CommunityFileDownloadApi.kt

@@ -1,6 +1,7 @@
 package org.session.libsession.messaging.open_groups.api
 
 import android.net.Uri
+import android.util.Base64
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -26,6 +27,18 @@ class CommunityFileDownloadApi @AssistedInject constructor(
         baseUrl: String,
         response: HttpResponse
     ): HttpBody {
+        // If the response body is text, it's very likely they were base64 encoded
+        // before being sent over the network. Try to decode it.
+        if (response.body is HttpBody.Text) {
+            val bytes = runCatching {
+                Base64.decode(response.body.text, Base64.DEFAULT)
+            }.getOrNull()
+
+            if (bytes != null) {
+                return HttpBody.Bytes(bytes)
+            }
+        }
+
         return response.body
     }
 

app/src/main/java/org/session/libsession/network/snode/SwarmDirectory.kt

@@ -32,7 +32,7 @@ class SwarmDirectory @Inject constructor(
     }
 
     suspend fun fetchSwarm(publicKey: String): List<Snode> {
-        val pool = snodeDirectory.getSnodePool()
+        val pool = snodeDirectory.ensurePoolPopulated()
         require(pool.isNotEmpty()) {
             "Snode pool is empty"
         }

app/src/main/java/org/thoughtcrime/securesms/api/batch/Batcher.kt

@@ -3,6 +3,10 @@ package org.thoughtcrime.securesms.api.batch
 import org.thoughtcrime.securesms.api.ApiExecutorContext
 
 interface Batcher<Req, Res, T> {
+
+    /**
+     * Returns a key that identifies requests that can be batched together.
+     */
     fun batchKey(req: Req): Any?
 
     fun transformRequestForBatching(ctx: ApiExecutorContext, req: Req): T