TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-28 23:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash & photo sending bug

Browse Source
This commit is contained in:
Niels Andriesse 2021-06-29 15:17:14 +10:00
parent 7e114fc2ac
commit 05ac781b55
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
View File

@ -60,6 +60,7 @@ import org.session.libsession.utilities.MediaTypes
import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.recipients.Recipient
import org.session.libsignal.utilities.ListenableFuture import org.session.libsignal.utilities.ListenableFuture
import org.session.libsignal.utilities.ThreadUtils
import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.ApplicationContext
import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
import org.thoughtcrime.securesms.audio.AudioRecorder import org.thoughtcrime.securesms.audio.AudioRecorder
@ -818,6 +819,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
prepMediaForSending(uri, AttachmentManager.MediaType.DOCUMENT).addListener(mediaPreppedListener) prepMediaForSending(uri, AttachmentManager.MediaType.DOCUMENT).addListener(mediaPreppedListener)
} }
TAKE_PHOTO -> { TAKE_PHOTO -> {
if (resultCode != RESULT_OK) { return }
val uri = attachmentManager.captureUri ?: return val uri = attachmentManager.captureUri ?: return
prepMediaForSending(uri, AttachmentManager.MediaType.IMAGE).addListener(mediaPreppedListener) prepMediaForSending(uri, AttachmentManager.MediaType.IMAGE).addListener(mediaPreppedListener)
} }
@ -941,11 +943,13 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
} }
} }
} else { } else {
for (message in messages) { ThreadUtils.queue {
if (message.isMms) { for (message in messages) {
DatabaseFactory.getMmsDatabase(this@ConversationActivityV2).delete(message.id) if (message.isMms) {
} else { DatabaseFactory.getMmsDatabase(this@ConversationActivityV2).delete(message.id)
DatabaseFactory.getSmsDatabase(this@ConversationActivityV2).deleteMessage(message.id) } else {
DatabaseFactory.getSmsDatabase(this@ConversationActivityV2).deleteMessage(message.id)
}
} }
} }
} }