Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

allow polls with media for Pleroma

This commit is contained in:
tom79 2019-06-30 18:24:47 +02:00
parent cc4442f180
commit 544fe5b64b
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/app/fedilab/android/activities/TootActivity.java
View File

@ -1883,9 +1883,16 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
if( tootReply != null)
toot.setIn_reply_to_id(tootReply.getId());
toot.setContent(tootContent);
if( poll != null) {
toot.setPoll(poll);
if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
if (poll != null) {
toot.setPoll(poll);
} else {
toot.setMedia_attachments(attachments);
}
}else{
if (poll != null) {
toot.setPoll(poll);
}
toot.setMedia_attachments(attachments);
}
if( timestamp == null)
@ -2663,8 +2670,10 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
if( status.getPoll() != null) {
poll = status.getPoll();
poll_action.setVisibility(View.VISIBLE);
toot_picture.setVisibility(View.GONE);
picture_scrollview.setVisibility(View.GONE);
if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
toot_picture.setVisibility(View.GONE);
picture_scrollview.setVisibility(View.GONE);
}
}
if( attachments != null && attachments.size() > 0){
@ -3307,8 +3316,10 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
dialog.dismiss();
}
poll_action.setVisibility(View.VISIBLE);
toot_picture.setVisibility(View.GONE);
picture_scrollview.setVisibility(View.GONE);
if(MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
toot_picture.setVisibility(View.GONE);
picture_scrollview.setVisibility(View.GONE);
}
}
});