Remove fetchmessageDetailsEvent and its observer as never executed
Given no value is ever posted on _fetchMessageDetailsEvent, the public live data fetchmessageDetailsEvent will never emit any values and the observer in the activity will never be triggered. MAILAND-2448
This commit is contained in:
parent
657e8cb79c
commit
ecde01a6ea
|
@ -433,25 +433,6 @@ public class ComposeMessageActivity
|
|||
|
||||
composeMessageViewModel.getDbIdWatcher().observe(ComposeMessageActivity.this, new SendMessageObserver());
|
||||
|
||||
composeMessageViewModel.getFetchMessageDetailsEvent().observe(this, messageBuilderDataEvent -> {
|
||||
try {
|
||||
binding.composerProgressLayout.setVisibility(View.GONE);
|
||||
MessageBuilderData messageBuilderData = messageBuilderDataEvent.getContentIfNotHandled();
|
||||
if (messageBuilderData != null) {
|
||||
String mimeType = messageBuilderData.getMessage().getMimeType();
|
||||
setMessageBodyInContainers(composeMessageViewModel.setMessageBody
|
||||
(messageBuilderData.getDecryptedMessage(), false,
|
||||
mimeType != null && mimeType.equals(Constants.MIME_TYPE_PLAIN_TEXT), getString(R.string.sender_name_address),
|
||||
getString(R.string.original_message_divider),
|
||||
getString(R.string.reply_prefix_on),
|
||||
DateUtil.formatDetailedDateTime(this, composeMessageViewModel.getMessageDataResult().getMessageTimestamp())));
|
||||
}
|
||||
composeMessageViewModel.setBeforeSaveDraft(false, messageBodyEditText.getText().toString());
|
||||
} catch (Exception exc) {
|
||||
Timber.tag("588").e(exc, "Exception on fetch message details event");
|
||||
}
|
||||
});
|
||||
|
||||
composeMessageViewModel.getFetchKeyDetailsResult().observe(
|
||||
this,
|
||||
this::onFetchEmailKeysEvent
|
||||
|
|
|
@ -67,8 +67,6 @@ import ch.protonmail.android.usecase.model.FetchPublicKeysResult
|
|||
import ch.protonmail.android.utils.Event
|
||||
import ch.protonmail.android.utils.MailToData
|
||||
import ch.protonmail.android.utils.MessageUtils
|
||||
import ch.protonmail.android.utils.ServerTime
|
||||
import ch.protonmail.android.utils.ServerTimeProvider
|
||||
import ch.protonmail.android.utils.UiUtil
|
||||
import ch.protonmail.android.utils.resources.StringResourceResolver
|
||||
import ch.protonmail.android.viewmodel.ConnectivityBaseViewModel
|
||||
|
@ -140,7 +138,6 @@ class ComposeMessageViewModel @Inject constructor(
|
|||
private val _openAttachmentsScreenResult: MutableLiveData<List<LocalAttachment>> = MutableLiveData()
|
||||
private val _buildingMessageCompleted: MutableLiveData<Event<Message>> = MutableLiveData()
|
||||
private val _dbIdWatcher: MutableLiveData<Long> = MutableLiveData()
|
||||
private val _fetchMessageDetailsEvent: MutableLiveData<Event<MessageBuilderData>> = MutableLiveData()
|
||||
private val fetchKeyDetailsTrigger = MutableLiveData<List<FetchPublicKeysRequest>>()
|
||||
|
||||
private val _androidContacts = java.util.ArrayList<MessageRecipient>()
|
||||
|
@ -206,8 +203,6 @@ class ComposeMessageViewModel @Inject constructor(
|
|||
get() = _buildingMessageCompleted
|
||||
val dbIdWatcher: LiveData<Long>
|
||||
get() = _dbIdWatcher
|
||||
val fetchMessageDetailsEvent: LiveData<Event<MessageBuilderData>>
|
||||
get() = _fetchMessageDetailsEvent
|
||||
var androidContactsLoaded: Boolean
|
||||
get() = _androidContactsLoaded
|
||||
set(value) {
|
||||
|
|
Loading…
Reference in New Issue