TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 05:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge Signal 4.41.0

Browse Source
This commit is contained in:
Niels Andriesse
2019-08-07 16:48:54 +10:00
parent 781a8500df 56c17e32f1
commit 1822e87f7c
584 changed files with 9504 additions and 1558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java
View File

@@ -50,7 +50,7 @@ public class GroupRecordContactPhoto implements ContactPhoto {
}
@Override
public void updateDiskCacheKey(MessageDigest messageDigest) {
public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
messageDigest.update(address.serialize().getBytes());
messageDigest.update(Conversions.longToByteArray(avatarId));
}

2
src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
View File

@@ -40,7 +40,7 @@ public class ProfileContactPhoto implements ContactPhoto {
}
@Override
public void updateDiskCacheKey(MessageDigest messageDigest) {
public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
messageDigest.update(address.serialize().getBytes());
messageDigest.update(avatarObject.getBytes());
}

5
src/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java
View File

@@ -30,9 +30,8 @@ public class SystemContactPhoto implements ContactPhoto {
return context.getContentResolver().openInputStream(contactPhotoUri);
}
@Nullable
@Override
public Uri getUri(@NonNull Context context) {
public @Nullable Uri getUri(@NonNull Context context) {
return contactPhotoUri;
}
@@ -42,7 +41,7 @@ public class SystemContactPhoto implements ContactPhoto {
}
@Override
public void updateDiskCacheKey(MessageDigest messageDigest) {
public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
messageDigest.update(address.serialize().getBytes());
messageDigest.update(contactPhotoUri.toString().getBytes());
messageDigest.update(Conversions.longToByteArray(lastModifiedTime));