yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 17:59:39 +02:00
Code Issues Releases Wiki Activity

do not ask on forwarding messages to 'saved messages'

Browse source
This commit is contained in:
B. Petersen 2020-03-10 00:26:32 +01:00
parent b4c0d56a8c
commit e2a5d93adb
No known key found for this signature in database
GPG key ID: 3B88E92DEA8E9AFC
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/ConversationActivity.java
View file

@ -603,6 +603,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private void handleForwarding() { private void handleForwarding() {
DcChat dcChat = dcContext.getChat(chatId); DcChat dcChat = dcContext.getChat(chatId);
if (dcChat.isSelfTalk()) {
new RelayingTask(this, chatId).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} else {
String name = dcChat.getName(); String name = dcChat.getName();
if (!dcChat.isGroup()) { if (!dcChat.isGroup()) {
int[] contactIds = dcContext.getChatContacts(chatId); int[] contactIds = dcContext.getChatContacts(chatId);
@ -616,6 +619,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
.setNegativeButton(R.string.cancel, (dialogInterface, i) -> finish()) .setNegativeButton(R.string.cancel, (dialogInterface, i) -> finish())
.show(); .show();
} }
}
private void handleSharing() { private void handleSharing() {
ArrayList<Uri> uriList = RelayUtil.getSharedUris(this); ArrayList<Uri> uriList = RelayUtil.getSharedUris(this);