Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
adb8c982
Commit
adb8c982
authored
Mar 25, 2022
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
conversationsadapter: fix swarm photobooth
GitLab:
#670
Change-Id: Ie8eb123c0fc7506863b06c7b588ef7806b9a077a
parent
8e2d600f
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/conversationsadapter.cpp
+2
-2
2 additions, 2 deletions
src/conversationsadapter.cpp
src/utilsadapter.cpp
+5
-5
5 additions, 5 deletions
src/utilsadapter.cpp
with
7 additions
and
7 deletions
src/conversationsadapter.cpp
+
2
−
2
View file @
adb8c982
...
@@ -494,7 +494,7 @@ ConversationsAdapter::updateConversationTitle(const QString& convId, const QStri
...
@@ -494,7 +494,7 @@ ConversationsAdapter::updateConversationTitle(const QString& convId, const QStri
auto
convModel
=
lrcInstance_
->
getCurrentConversationModel
();
auto
convModel
=
lrcInstance_
->
getCurrentConversationModel
();
QMap
<
QString
,
QString
>
details
;
QMap
<
QString
,
QString
>
details
;
details
[
"title"
]
=
newTitle
;
details
[
"title"
]
=
newTitle
;
convModel
->
updateConversationInfo
(
convId
,
details
);
convModel
->
updateConversationInfo
s
(
convId
,
details
);
}
}
void
void
...
@@ -504,7 +504,7 @@ ConversationsAdapter::updateConversationDescription(const QString& convId,
...
@@ -504,7 +504,7 @@ ConversationsAdapter::updateConversationDescription(const QString& convId,
auto
convModel
=
lrcInstance_
->
getCurrentConversationModel
();
auto
convModel
=
lrcInstance_
->
getCurrentConversationModel
();
QMap
<
QString
,
QString
>
details
;
QMap
<
QString
,
QString
>
details
;
details
[
"description"
]
=
newDescription
;
details
[
"description"
]
=
newDescription
;
convModel
->
updateConversationInfo
(
convId
,
details
);
convModel
->
updateConversationInfo
s
(
convId
,
details
);
}
}
QString
QString
...
...
This diff is collapsed.
Click to expand it.
src/utilsadapter.cpp
+
5
−
5
View file @
adb8c982
...
@@ -495,7 +495,7 @@ UtilsAdapter::setSwarmCreationImageFromString(const QString& image, const QStrin
...
@@ -495,7 +495,7 @@ UtilsAdapter::setSwarmCreationImageFromString(const QString& image, const QStrin
{
{
// Compress the image before saving
// Compress the image before saving
auto
img
=
Utils
::
imageFromBase64String
(
image
,
false
);
auto
img
=
Utils
::
imageFromBase64String
(
image
,
false
);
setSwarmCreationImageFromImage
(
img
);
setSwarmCreationImageFromImage
(
img
,
imageId
);
}
}
void
void
...
@@ -504,7 +504,7 @@ UtilsAdapter::setSwarmCreationImageFromFile(const QString& path, const QString&
...
@@ -504,7 +504,7 @@ UtilsAdapter::setSwarmCreationImageFromFile(const QString& path, const QString&
// Compress the image before saving
// Compress the image before saving
auto
image
=
Utils
::
QByteArrayFromFile
(
path
);
auto
image
=
Utils
::
QByteArrayFromFile
(
path
);
auto
img
=
Utils
::
imageFromBase64Data
(
image
,
false
);
auto
img
=
Utils
::
imageFromBase64Data
(
image
,
false
);
setSwarmCreationImageFromImage
(
img
);
setSwarmCreationImageFromImage
(
img
,
imageId
);
}
}
void
void
...
@@ -524,7 +524,7 @@ UtilsAdapter::setSwarmCreationImageFromImage(const QImage& image, const QString&
...
@@ -524,7 +524,7 @@ UtilsAdapter::setSwarmCreationImageFromImage(const QImage& image, const QString&
file
.
close
();
file
.
close
();
Q_EMIT
lrcInstance_
->
base64SwarmAvatarChanged
();
Q_EMIT
lrcInstance_
->
base64SwarmAvatarChanged
();
}
else
{
}
else
{
lrcInstance_
->
getCurrentConversationModel
()
->
updateConversationInfo
(
imageId
,
lrcInstance_
->
getCurrentConversationModel
()
->
updateConversationInfo
s
(
imageId
,
{{
"avatar"
,
{{
"avatar"
,
ba
.
toBase64
()}});
ba
.
toBase64
()}});
}
}
...
...
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