Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 06:09:55 +01:00
Code Issues Projects Releases Wiki Activity

Use a unique transition name for each AttachmentItem.

Browse Source
This commit is contained in:
akwizgran
2019-01-09 15:17:18 +00:00
parent 4faf535801
commit d7c72c4d68
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentItem.java
View File

@@ -7,6 +7,8 @@ import android.support.annotation.Nullable;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.MessageId;
import java.util.concurrent.atomic.AtomicLong;
import javax.annotation.concurrent.Immutable; import javax.annotation.concurrent.Immutable;
@Immutable @Immutable
@@ -18,6 +20,7 @@ public class AttachmentItem implements Parcelable {
private final String mimeType, extension; private final String mimeType, extension;
private final int thumbnailWidth, thumbnailHeight; private final int thumbnailWidth, thumbnailHeight;
private final boolean hasError; private final boolean hasError;
private final long instanceId;
public static final Creator<AttachmentItem> CREATOR = public static final Creator<AttachmentItem> CREATOR =
new Creator<AttachmentItem>() { new Creator<AttachmentItem>() {
@@ -32,6 +35,8 @@ public class AttachmentItem implements Parcelable {
} }
}; };
private static final AtomicLong NEXT_INSTANCE_ID = new AtomicLong(0);
AttachmentItem(MessageId messageId, int width, int height, String mimeType, AttachmentItem(MessageId messageId, int width, int height, String mimeType,
String extension, int thumbnailWidth, int thumbnailHeight, String extension, int thumbnailWidth, int thumbnailHeight,
boolean hasError) { boolean hasError) {
@@ -43,6 +48,7 @@ public class AttachmentItem implements Parcelable {
this.thumbnailWidth = thumbnailWidth; this.thumbnailWidth = thumbnailWidth;
this.thumbnailHeight = thumbnailHeight; this.thumbnailHeight = thumbnailHeight;
this.hasError = hasError; this.hasError = hasError;
instanceId = NEXT_INSTANCE_ID.getAndIncrement();
} }
protected AttachmentItem(Parcel in) { protected AttachmentItem(Parcel in) {
@@ -56,6 +62,7 @@ public class AttachmentItem implements Parcelable {
thumbnailWidth = in.readInt(); thumbnailWidth = in.readInt();
thumbnailHeight = in.readInt(); thumbnailHeight = in.readInt();
hasError = in.readByte() != 0; hasError = in.readByte() != 0;
instanceId = in.readLong();
} }
public MessageId getMessageId() { public MessageId getMessageId() {
@@ -90,9 +97,8 @@ public class AttachmentItem implements Parcelable {
return hasError; return hasError;
} }
// TODO use counter instead, because in theory one attachment can appear in more than one messages
String getTransitionName() { String getTransitionName() {
return String.valueOf(messageId.hashCode()); return String.valueOf(instanceId);
} }
@Override @Override
@@ -110,12 +116,13 @@ public class AttachmentItem implements Parcelable {
dest.writeInt(thumbnailWidth); dest.writeInt(thumbnailWidth);
dest.writeInt(thumbnailHeight); dest.writeInt(thumbnailHeight);
dest.writeByte((byte) (hasError ? 1 : 0)); dest.writeByte((byte) (hasError ? 1 : 0));
dest.writeLong(instanceId);
} }
@Override @Override
public boolean equals(@Nullable Object o) { public boolean equals(@Nullable Object o) {
return o instanceof AttachmentItem && return o instanceof AttachmentItem &&
messageId.equals(((AttachmentItem) o).messageId); instanceId == ((AttachmentItem) o).instanceId;
} }
} }