Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
2dee6e0a
Commit
2dee6e0a
authored
Sep 06, 2018
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Compress image before checking for the file size.
parent
9567523e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
8 deletions
+4
-8
ChatRoomPresenter.kt
...rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+4
-8
No files found.
app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
View file @
2dee6e0a
...
...
@@ -33,6 +33,7 @@ import chat.rocket.android.server.domain.uploadMimeTypeFilter
import
chat.rocket.android.server.domain.useRealName
import
chat.rocket.android.server.infraestructure.ConnectionManagerFactory
import
chat.rocket.android.server.infraestructure.state
import
chat.rocket.android.util.extension.compressImageAndGetByteArray
import
chat.rocket.android.util.extension.compressImageAndGetInputStream
import
chat.rocket.android.util.extension.launchUI
import
chat.rocket.android.util.extensions.avatarUrl
...
...
@@ -353,8 +354,9 @@ class ChatRoomPresenter @Inject constructor(
try
{
withContext
(
DefaultDispatcher
)
{
val
fileName
=
uriInteractor
.
getFileName
(
uri
)
?:
uri
.
toString
()
val
fileSize
=
uriInteractor
.
getFileSize
(
uri
)
val
mimeType
=
uriInteractor
.
getMimeType
(
uri
)
val
byteArray
=
bitmap
?.
compressImageAndGetByteArray
(
mimeType
)
val
fileSize
=
byteArray
?.
size
?:
uriInteractor
.
getFileSize
(
uri
)
val
maxFileSizeAllowed
=
settings
.
uploadMaxFileSize
()
when
{
...
...
@@ -362,12 +364,6 @@ class ChatRoomPresenter @Inject constructor(
fileSize
>
maxFileSizeAllowed
&&
maxFileSizeAllowed
!
in
-
1
..
0
->
view
.
showInvalidFileSize
(
fileSize
,
maxFileSizeAllowed
)
else
->
{
var
inputStream
:
InputStream
?
=
uriInteractor
.
getInputStream
(
uri
)
bitmap
?.
compressImageAndGetInputStream
(
mimeType
)
?.
let
{
inputStream
=
it
}
retryIO
(
"uploadFile($roomId, $fileName, $mimeType"
)
{
client
.
uploadFile
(
roomId
,
...
...
@@ -376,7 +372,7 @@ class ChatRoomPresenter @Inject constructor(
msg
,
description
=
fileName
)
{
inputStream
byteArray
?.
inputStream
()
?:
uriInteractor
.
getInputStream
(
uri
)
}
}
logMediaUploaded
(
mimeType
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment