Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed compose activity crash

This commit is contained in:
Mariotaku Lee 2016-04-05 11:48:42 +08:00
parent 269138a26a
commit 8507cb3a20
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
twidere/src/main/java/org/mariotaku/twidere/activity/ComposeActivity.java
View File

@ -950,26 +950,34 @@ public class ComposeActivity extends BaseActivity implements OnMenuItemClickList
}
if (Intent.ACTION_SEND.equals(action)) {
mShouldSaveAccounts = false;
final Uri[] src = {intent.getParcelableExtra(Intent.EXTRA_STREAM)};
final Uri[] dst = {createTempImageUri(0)};
AsyncTaskUtils.executeTask(new AddMediaTask(this, src, dst, getMediaType(intent.getType(),
ParcelableMedia.Type.IMAGE), false));
final Uri stream = intent.getParcelableExtra(Intent.EXTRA_STREAM);
if (stream != null) {
final Uri[] src = {stream};
final Uri[] dst = {createTempImageUri(0)};
AsyncTaskUtils.executeTask(new AddMediaTask(this, src, dst, getMediaType(intent.getType(),
ParcelableMedia.Type.IMAGE), false));
}
} else if (Intent.ACTION_SEND_MULTIPLE.equals(action)) {
mShouldSaveAccounts = false;
final List<Uri> extraStream = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
final Uri[] src = extraStream.toArray(new Uri[extraStream.size()]);
final Uri[] dst = new Uri[extraStream.size()];
for (int i = 0; i < dst.length; i++) {
dst[i] = createTempImageUri(i);
if (extraStream != null) {
final Uri[] src = extraStream.toArray(new Uri[extraStream.size()]);
final Uri[] dst = new Uri[extraStream.size()];
for (int i = 0; i < dst.length; i++) {
dst[i] = createTempImageUri(i);
}
AsyncTaskUtils.executeTask(new AddMediaTask(this, src, dst, getMediaType(intent.getType(),
ParcelableMedia.Type.IMAGE), false));
}
AsyncTaskUtils.executeTask(new AddMediaTask(this, src, dst, getMediaType(intent.getType(),
ParcelableMedia.Type.IMAGE), false));
} else {
final Uri[] src = {intent.getData()};
final Uri[] dst = {createTempImageUri(0)};
AsyncTaskUtils.executeTask(new AddMediaTask(this, src, dst, getMediaType(intent.getType(),
ParcelableMedia.Type.IMAGE), false));
mShouldSaveAccounts = !hasAccountIds;
final Uri data = intent.getData();
if (data != null) {
final Uri[] src = {data};
final Uri[] dst = {createTempImageUri(0)};
AsyncTaskUtils.executeTask(new AddMediaTask(this, src, dst, getMediaType(intent.getType(),
ParcelableMedia.Type.IMAGE), false));
}
}
final CharSequence extraSubject = intent.getCharSequenceExtra(Intent.EXTRA_SUBJECT);
final CharSequence extraText = intent.getCharSequenceExtra(Intent.EXTRA_TEXT);

1
twidere/src/main/java/org/mariotaku/twidere/util/InternalTwitterContentUtils.java
View File

@ -240,6 +240,7 @@ public class InternalTwitterContentUtils {
public static Pair<String, List<SpanItem>> formatStatusTextWithIndices(final Status status) {
if (status == null) return null;
//TODO handle twitter video url
final HtmlBuilder builder = new HtmlBuilder(status.getText(), false, true, false);
parseEntities(builder, status);
return builder.buildWithIndices();