TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix progress bar showing for self-sends.

Browse Source 
For self-sends, we were never marking attachments as uploaded. I made is
so that happens now, but to prevent it for showing for already-sent
messages, we also don't show controls for self-send conversations.
This commit is contained in:
Greyson Parrelli 2018-06-28 12:07:20 -07:00
parent 8e186f7c62
commit 0d386d3c14
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/ConversationItem.java
View File

@ -212,7 +212,7 @@ public class ConversationItem extends LinearLayout
this.recipient.addListener(this); this.recipient.addListener(this);
this.conversationRecipient.addListener(this); this.conversationRecipient.addListener(this);
setMediaAttributes(messageRecord); setMediaAttributes(messageRecord, conversationRecipient);
setInteractionState(messageRecord, pulseHighlight); setInteractionState(messageRecord, pulseHighlight);
setBodyText(messageRecord); setBodyText(messageRecord);
setBubbleState(messageRecord, recipient); setBubbleState(messageRecord, recipient);
@ -412,8 +412,8 @@ public class ConversationItem extends LinearLayout
} }
} }
private void setMediaAttributes(MessageRecord messageRecord) { private void setMediaAttributes(MessageRecord messageRecord, Recipient conversationRecipient) {
boolean showControls = !messageRecord.isFailed(); boolean showControls = !messageRecord.isFailed() && !Util.isOwnNumber(context, conversationRecipient.getAddress());
if (hasSharedContact(messageRecord)) { if (hasSharedContact(messageRecord)) {
sharedContactStub.get().setVisibility(VISIBLE); sharedContactStub.get().setVisibility(VISIBLE);

8
src/org/thoughtcrime/securesms/database/MmsDatabase.java
View File

@ -67,6 +67,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.libsignal.util.guava.Optional;
import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom; import java.security.SecureRandom;
@ -1176,7 +1177,7 @@ public class MmsDatabase extends MessagingDatabase {
} }
} }
public class Reader { public class Reader implements Closeable {
private final Cursor cursor; private final Cursor cursor;
@ -1337,8 +1338,11 @@ public class MmsDatabase extends MessagingDatabase {
} }
} }
@Override
public void close() { public void close() {
cursor.close(); if (cursor != null) {
cursor.close();
}
} }
} }

17
src/org/thoughtcrime/securesms/sms/MessageSender.java
View File

@ -17,17 +17,22 @@
package org.thoughtcrime.securesms.sms; package org.thoughtcrime.securesms.sms;
import android.content.Context; import android.content.Context;
import android.database.Cursor;
import android.support.annotation.NonNull;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.attachments.Attachment;
import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.Address;
import org.thoughtcrime.securesms.database.AttachmentDatabase;
import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MmsDatabase; import org.thoughtcrime.securesms.database.MmsDatabase;
import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.RecipientDatabase;
import org.thoughtcrime.securesms.database.SmsDatabase; import org.thoughtcrime.securesms.database.SmsDatabase;
import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.database.ThreadDatabase;
import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
import org.thoughtcrime.securesms.jobmanager.JobManager; import org.thoughtcrime.securesms.jobmanager.JobManager;
import org.thoughtcrime.securesms.jobs.MmsSendJob; import org.thoughtcrime.securesms.jobs.MmsSendJob;
import org.thoughtcrime.securesms.jobs.PushGroupSendJob; import org.thoughtcrime.securesms.jobs.PushGroupSendJob;
@ -180,6 +185,7 @@ public class MessageSender {
database.markAsSent(messageId, true); database.markAsSent(messageId, true);
database.copyMessageInbox(messageId); database.copyMessageInbox(messageId);
markAttachmentsAsUploaded(messageId, database, DatabaseFactory.getAttachmentDatabase(context));
if (expiresIn > 0) { if (expiresIn > 0) {
database.markExpireStarted(messageId); database.markExpireStarted(messageId);
@ -277,4 +283,15 @@ public class MessageSender {
} }
} }
private static void markAttachmentsAsUploaded(long mmsId, @NonNull MmsDatabase mmsDatabase, @NonNull AttachmentDatabase attachmentDatabase) {
try (MmsDatabase.Reader reader = mmsDatabase.readerFor(mmsDatabase.getMessage(mmsId))) {
MessageRecord message = reader.getNext();
if (message != null && message.isMms()) {
for (Attachment attachment : ((MmsMessageRecord) message).getSlideDeck().asAttachments()) {
attachmentDatabase.markAttachmentUploaded(mmsId, attachment);
}
}
}
}
} }