Merge branch 'dev' into rtc_calls

# Conflicts:
#	app/build.gradle

app/build.gradle

@@ -155,8 +155,8 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.4'
 }
 
-def canonicalVersionCode = 234
-def canonicalVersionName = "1.12.0-ALPHA2"
+def canonicalVersionCode = 235
+def canonicalVersionName = "1.12.0-ALPHA3"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt

@@ -214,7 +214,7 @@ object OpenGroupAPIV2 {
         val parameters = mapOf( "file" to base64EncodedFile )
         val request = Request(verb = POST, room = room, server = server, endpoint = "files", parameters = parameters)
         return send(request).map { json ->
-            json["result"] as? Long ?: throw Error.ParsingFailed
+            (json["result"] as? Number)?.toLong() ?: throw Error.ParsingFailed
         }
     }