allow polls with media for Pleroma
This commit is contained in:
parent
cc4442f180
commit
544fe5b64b
|
@ -1883,9 +1883,16 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
|
||||||
if( tootReply != null)
|
if( tootReply != null)
|
||||||
toot.setIn_reply_to_id(tootReply.getId());
|
toot.setIn_reply_to_id(tootReply.getId());
|
||||||
toot.setContent(tootContent);
|
toot.setContent(tootContent);
|
||||||
if( poll != null) {
|
if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
|
||||||
toot.setPoll(poll);
|
if (poll != null) {
|
||||||
|
toot.setPoll(poll);
|
||||||
|
} else {
|
||||||
|
toot.setMedia_attachments(attachments);
|
||||||
|
}
|
||||||
}else{
|
}else{
|
||||||
|
if (poll != null) {
|
||||||
|
toot.setPoll(poll);
|
||||||
|
}
|
||||||
toot.setMedia_attachments(attachments);
|
toot.setMedia_attachments(attachments);
|
||||||
}
|
}
|
||||||
if( timestamp == null)
|
if( timestamp == null)
|
||||||
|
@ -2663,8 +2670,10 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
|
||||||
if( status.getPoll() != null) {
|
if( status.getPoll() != null) {
|
||||||
poll = status.getPoll();
|
poll = status.getPoll();
|
||||||
poll_action.setVisibility(View.VISIBLE);
|
poll_action.setVisibility(View.VISIBLE);
|
||||||
toot_picture.setVisibility(View.GONE);
|
if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
|
||||||
picture_scrollview.setVisibility(View.GONE);
|
toot_picture.setVisibility(View.GONE);
|
||||||
|
picture_scrollview.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if( attachments != null && attachments.size() > 0){
|
if( attachments != null && attachments.size() > 0){
|
||||||
|
@ -3307,8 +3316,10 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
|
||||||
dialog.dismiss();
|
dialog.dismiss();
|
||||||
}
|
}
|
||||||
poll_action.setVisibility(View.VISIBLE);
|
poll_action.setVisibility(View.VISIBLE);
|
||||||
toot_picture.setVisibility(View.GONE);
|
if(MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
|
||||||
picture_scrollview.setVisibility(View.GONE);
|
toot_picture.setVisibility(View.GONE);
|
||||||
|
picture_scrollview.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue