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

Fix crash when creating group with no avatar icon

Browse Source 
Fixes #4320
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2015-10-28 10:36:21 -07:00
parent 4271732b10
commit a086a2471c
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/recipients/Recipient.java
View File

@@ -43,8 +43,8 @@ public class Recipient {
private final long recipientId;
private String number;
private String name;
private @NonNull String number;
private @Nullable String name;
private boolean stale;
private ContactPhoto contactPhoto;
@@ -123,7 +123,7 @@ public class Recipient {
notifyListeners();
}
public String getNumber() {
public @NonNull String getNumber() {
return number;
}

4
src/org/thoughtcrime/securesms/recipients/RecipientFactory.java
View File

@@ -58,11 +58,11 @@ public class RecipientFactory {
return provider.getRecipients(context, ids, asynchronous);
}
public static Recipient getRecipientForId(Context context, long recipientId, boolean asynchronous) {
public @NonNull static Recipient getRecipientForId(Context context, long recipientId, boolean asynchronous) {
return provider.getRecipient(context, recipientId, asynchronous);
}
public static Recipients getRecipientsForIds(Context context, long[] recipientIds, boolean asynchronous) {
public @NonNull static Recipients getRecipientsForIds(Context context, long[] recipientIds, boolean asynchronous) {
return provider.getRecipients(context, recipientIds, asynchronous);
}

4
src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
View File

@@ -70,7 +70,7 @@ public class RecipientProvider {
ContactColors.UNKNOWN_COLOR));
}};
Recipient getRecipient(Context context, long recipientId, boolean asynchronous) {
@NonNull Recipient getRecipient(Context context, long recipientId, boolean asynchronous) {
Recipient cachedRecipient = recipientCache.get(recipientId);
if (cachedRecipient != null && !cachedRecipient.isStale()) return cachedRecipient;
@@ -86,7 +86,7 @@ public class RecipientProvider {
return cachedRecipient;
}
Recipients getRecipients(Context context, long[] recipientIds, boolean asynchronous) {
@NonNull Recipients getRecipients(Context context, long[] recipientIds, boolean asynchronous) {
Recipients cachedRecipients = recipientsCache.get(new RecipientIds(recipientIds));
if (cachedRecipients != null && !cachedRecipients.isStale()) return cachedRecipients;