empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Improve logging around profile uploads.

Browse source
This commit is contained in:
Greyson Parrelli 2022-02-22 10:19:37 -05:00
parent 1b404cef34
commit cbfa573d3d
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt
View file

@ -940,6 +940,7 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) :
}
if (remoteKey != localKey) {
Log.w(TAG, "Profile key changed during storage sync! Scheduling jobs to refresh things.")
ApplicationDependencies.getJobManager().add(RefreshAttributesJob())
}

20
app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java
View file

@ -191,6 +191,7 @@ public final class ProfileUtil {
* successfully before persisting the change to disk.
*/
public static void uploadProfileWithBadges(@NonNull Context context, @NonNull List<Badge> badges) throws IOException {
Log.d(TAG, "uploadProfileWithBadges()");
try (StreamDetails avatar = AvatarHelper.getSelfProfileAvatarStream(context)) {
uploadProfile(context,
Recipient.self().getProfileName(),
@ -208,6 +209,7 @@ public final class ProfileUtil {
* successfully before persisting the change to disk.
*/
public static void uploadProfileWithName(@NonNull Context context, @NonNull ProfileName profileName) throws IOException {
Log.d(TAG, "uploadProfileWithName()");
try (StreamDetails avatar = AvatarHelper.getSelfProfileAvatarStream(context)) {
uploadProfile(context,
profileName,
@ -225,6 +227,7 @@ public final class ProfileUtil {
* successfully before persisting the change to disk.
*/
public static void uploadProfileWithAbout(@NonNull Context context, @NonNull String about, @NonNull String emoji) throws IOException {
Log.d(TAG, "uploadProfileWithAbout()");
try (StreamDetails avatar = AvatarHelper.getSelfProfileAvatarStream(context)) {
uploadProfile(context,
Recipient.self().getProfileName(),
@ -240,6 +243,7 @@ public final class ProfileUtil {
* Uploads the profile based on all state that's already written to disk.
*/
public static void uploadProfile(@NonNull Context context) throws IOException {
Log.d(TAG, "uploadProfile()");
try (StreamDetails avatar = AvatarHelper.getSelfProfileAvatarStream(context)) {
uploadProfileWithAvatar(context, avatar);
}
@ -251,13 +255,14 @@ public final class ProfileUtil {
* successfully before persisting the change to disk.
*/
public static void uploadProfileWithAvatar(@NonNull Context context, @Nullable StreamDetails avatar) throws IOException {
uploadProfile(context,
Recipient.self().getProfileName(),
Optional.fromNullable(Recipient.self().getAbout()).or(""),
Optional.fromNullable(Recipient.self().getAboutEmoji()).or(""),
getSelfPaymentsAddressProtobuf(),
avatar,
Recipient.self().getBadges());
Log.d(TAG, "uploadProfileWithAvatar()");
uploadProfile(context,
Recipient.self().getProfileName(),
Optional.fromNullable(Recipient.self().getAbout()).or(""),
Optional.fromNullable(Recipient.self().getAboutEmoji()).or(""),
getSelfPaymentsAddressProtobuf(),
avatar,
Recipient.self().getBadges());
}
private static void uploadProfile(@NonNull Context context,
@ -275,6 +280,7 @@ public final class ProfileUtil {
.map(Badge::getId)
.collect(Collectors.toList());
Log.d(TAG, "Uploading " + (!profileName.isEmpty() ? "non-" : "") + "empty profile name.");
Log.d(TAG, "Uploading " + (!Util.isEmpty(about) ? "non-" : "") + "empty about.");
Log.d(TAG, "Uploading " + (!Util.isEmpty(aboutEmoji) ? "non-" : "") + "empty emoji.");
Log.d(TAG, "Uploading " + (paymentsAddress != null ? "non-" : "") + "empty payments address.");