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

fix sharing multiple files (#901)

Browse source
This commit is contained in:
cyBerta 2019-05-15 02:10:40 +02:00 • committed by B. Petersen
parent 84bdc42c7c
commit 06e62903ef
No known key found for this signature in database
GPG key ID: 3B88E92DEA8E9AFC
3 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -640,7 +640,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
.setNegativeButton(android.R.string.cancel, ((dialog, which) -> {
finish();
}))
.setPositiveButton(R.string.menu_send, (dialog, which) -> new RelayingTask(this, chatId).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR))
.setPositiveButton(R.string.menu_send, (dialog, which) -> new RelayingTask(this, chatId).execute())
.show();
} else {
if (uriList.size() == 1) {
@ -1129,9 +1129,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
for(Uri uri : uris) {
DcMsg message = createMessage(activityRef.get(), uri);
dcContext.sendMsg(chatId, message);
}
for(Uri uri : uris) {
cleanup(activity, uri);
}
} catch (NullPointerException npe) {

3
src/org/thoughtcrime/securesms/ShareActivity.java
View file

@ -40,7 +40,6 @@ import org.thoughtcrime.securesms.connect.DcHelper;
import org.thoughtcrime.securesms.database.Address;
import org.thoughtcrime.securesms.mms.PartAuthority;
import org.thoughtcrime.securesms.permissions.Permissions;
import org.thoughtcrime.securesms.providers.PersistentBlobProvider;
import org.thoughtcrime.securesms.util.DynamicLanguage;
import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
import org.thoughtcrime.securesms.util.DynamicTheme;
@ -183,7 +182,7 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity implement
if (streamExtra != null && PartAuthority.isLocalUri(streamExtra)) {
resolvedExtras.add(streamExtra);
} else {
new ResolveMediaTask(this, this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, streamExtra);
new ResolveMediaTask(this, this).execute(streamExtra);
}
}

1
src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java
View file

@ -122,7 +122,6 @@ public class PersistentBlobProvider {
switch (MATCHER.match(uri)) {
case MATCH_OLD:
case MATCH_NEW:
long id = ContentUris.parseId(uri);
return getFile(context, ContentUris.parseId(uri)).delete();
}