Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
ed6383fa
Commit
ed6383fa
authored
3 years ago
by
Amirhossein Naghshzan
Committed by
Adrien Béraud
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
conversation: fix copy paste crash
#1066
Change-Id: Ic512750e26c2ba2f9f0ebf99be171f3c5e2472b0
parent
b4046980
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.kt
+6
-2
6 additions, 2 deletions
...p/src/main/java/cx/ring/fragments/ConversationFragment.kt
with
6 additions
and
2 deletions
ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.kt
+
6
−
2
View file @
ed6383fa
...
...
@@ -215,8 +215,12 @@ class ConversationFragment : BaseSupportFragment<ConversationPresenter, Conversa
ViewCompat
.
setOnReceiveContentListener
(
binding
.
msgInputTxt
,
SUPPORTED_MIME_TYPES
)
{
_
,
contentInfo
->
for
(
i
in
0
until
contentInfo
.
clip
.
itemCount
)
{
val
item
:
ClipData
.
Item
=
contentInfo
.
clip
.
getItemAt
(
i
)
startFileSend
(
AndroidFileUtils
.
getCacheFile
(
requireContext
(),
item
.
uri
)
.
flatMapCompletable
{
sendFile
(
it
)
})
if
(
item
.
uri
==
null
&&
item
.
text
!=
null
)
{
binding
.
msgInputTxt
.
setText
(
item
.
text
)
}
else
{
startFileSend
(
AndroidFileUtils
.
getCacheFile
(
requireContext
(),
item
.
uri
)
.
flatMapCompletable
{
sendFile
(
it
)
})
}
}
null
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment