Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Signal-Android
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
GitHub Mirror
Signal
Signal-Android
Commits
32c4fcb0
Commit
32c4fcb0
authored
3 years ago
by
Greyson Parrelli
Committed by
Alex Hart
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Improve handling of empty profiles.
parent
e2703b45
Branches
release-0.13
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
+5
-4
5 additions, 4 deletions
...a/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
with
5 additions
and
4 deletions
app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
+
5
−
4
View file @
32c4fcb0
...
@@ -451,6 +451,11 @@ public class RetrieveProfileJob extends BaseJob {
...
@@ -451,6 +451,11 @@ public class RetrieveProfileJob extends BaseJob {
String
plaintextProfileName
=
Util
.
emptyIfNull
(
ProfileUtil
.
decryptString
(
profileKey
,
profileName
));
String
plaintextProfileName
=
Util
.
emptyIfNull
(
ProfileUtil
.
decryptString
(
profileKey
,
profileName
));
if
(
TextUtils
.
isEmpty
(
plaintextProfileName
))
{
Log
.
w
(
TAG
,
"No name set on the profile for "
+
recipient
.
getId
()
+
" -- Leaving it alone"
);
return
;
}
ProfileName
remoteProfileName
=
ProfileName
.
fromSerialized
(
plaintextProfileName
);
ProfileName
remoteProfileName
=
ProfileName
.
fromSerialized
(
plaintextProfileName
);
ProfileName
localProfileName
=
recipient
.
getProfileName
();
ProfileName
localProfileName
=
recipient
.
getProfileName
();
...
@@ -474,10 +479,6 @@ public class RetrieveProfileJob extends BaseJob {
...
@@ -474,10 +479,6 @@ public class RetrieveProfileJob extends BaseJob {
recipient
.
isBlocked
(),
recipient
.
isGroup
(),
recipient
.
isSelf
(),
localDisplayName
.
isEmpty
(),
!
remoteDisplayName
.
equals
(
localDisplayName
)));
recipient
.
isBlocked
(),
recipient
.
isGroup
(),
recipient
.
isSelf
(),
localDisplayName
.
isEmpty
(),
!
remoteDisplayName
.
equals
(
localDisplayName
)));
}
}
}
}
if
(
TextUtils
.
isEmpty
(
plaintextProfileName
))
{
Log
.
i
(
TAG
,
"No profile name set for "
+
recipient
.
getId
());
}
}
catch
(
InvalidCiphertextException
e
)
{
}
catch
(
InvalidCiphertextException
e
)
{
Log
.
w
(
TAG
,
"Bad profile key for "
+
recipient
.
getId
());
Log
.
w
(
TAG
,
"Bad profile key for "
+
recipient
.
getId
());
}
catch
(
IOException
e
)
{
}
catch
(
IOException
e
)
{
...
...
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