avoid loading an object for just saving the id to the Address object

This commit is contained in:
B. Petersen
2018-09-18 15:35:53 +02:00
parent 9d7dedeb8f
commit 686e3ebbc6
4 changed files with 8 additions and 9 deletions
@@ -229,7 +229,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
Intent intent = new Intent(this, ConversationActivity.class);
intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, (long)chatId);
intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT);
intent.putExtra(ConversationActivity.ADDRESS_EXTRA, Address.fromChat(dcContext.getChat((int)chatId)));
intent.putExtra(ConversationActivity.ADDRESS_EXTRA, Address.fromChat(chatId));
startActivity(intent);
finish();
}
@@ -91,10 +91,9 @@ public class NewConversationActivity extends ContactSelectionActivity {
private void openConversation(int chatId) {
final DcContext dcContext = DcHelper.getContext(this);
DcChat dcChat = dcContext.getChat(chatId);
Intent intent = new Intent(this, ConversationActivity.class);
intent.putExtra(ConversationActivity.ADDRESS_EXTRA, Address.fromChat(dcChat));
intent.putExtra(ConversationActivity.ADDRESS_EXTRA, Address.fromChat(chatId));
intent.putExtra(ConversationActivity.TEXT_EXTRA, getIntent().getStringExtra(ConversationActivity.TEXT_EXTRA));
intent.setDataAndType(getIntent().getData(), getIntent().getType());
@@ -102,13 +102,13 @@ public class ApplicationDcContext extends DcContext {
@NonNull
public Recipient getRecipient(DcChat chat) {
RecipientProvider.RecipientDetails recipientDetails = new RecipientProvider.RecipientDetails(chat.getName(), null, false, null, null);
return new Recipient(Address.fromChat(chat), recipientDetails);
return new Recipient(Address.fromChat(chat.getId()), recipientDetails);
}
@NonNull
public Recipient getRecipient(DcContact contact) {
RecipientProvider.RecipientDetails recipientDetails = new RecipientProvider.RecipientDetails(contact.getDisplayName(), null, false, null, null);
return new Recipient(Address.fromContact(contact), recipientDetails);
return new Recipient(Address.fromContact(contact.getId()), recipientDetails);
}
@NonNull
@@ -53,12 +53,12 @@ public class Address implements Parcelable, Comparable<Address> {
private final String address;
public static Address fromChat(DcChat chat) {
return new Address("dc:" + chat.getId());
public static Address fromChat(int chatId) {
return new Address("dc:" + chatId);
}
public static Address fromContact(DcContact contact) {
return new Address("dcc:" + contact.getId());
public static Address fromContact(int contactId) {
return new Address("dcc:" + contactId);
}
private Address(@NonNull String address) {