arun/Husky
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ComposeActivity: if our instance is pleroma, disable mastodon-specific attachments limits

Browse Source
This commit is contained in:
Alibek Omarov 2019-12-08 06:01:39 +03:00
parent cdc3dafdda
commit ee4fd2c351
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
View File

@ -262,6 +262,7 @@ public final class ComposeActivity
private Integer maxPollOptionLength = null;
private @Px
int thumbnailViewSize;
private boolean isPleroma = false;
private SaveTootHelper saveTootHelper;
private Gson gson = new Gson();
@ -978,7 +979,9 @@ public final class ComposeActivity
public void updatePoll(NewPoll poll) {
this.poll = poll;
enableButton(pickButton, false, false);
if (!isPleroma) {
enableButton(pickButton, false, false);
}
if(pollPreview == null) {
@ -1341,18 +1344,21 @@ public final class ComposeActivity
mediaQueued.add(item);
updateContentDescription(item);
int queuedCount = mediaQueued.size();
if (queuedCount == 1) {
// If there's one video in the queue it is full, so disable the button to queue more.
if (item.type == QueuedMedia.Type.VIDEO) {
if (!isPleroma) {
if (queuedCount == 1) {
// If there's one video in the queue it is full, so disable the button to queue more.
if (item.type == QueuedMedia.Type.VIDEO) {
enableButton(pickButton, false, false);
}
} else if (queuedCount >= Status.MAX_MEDIA_ATTACHMENTS) {
// Limit the total media attachments, also.
enableButton(pickButton, false, false);
}
} else if (queuedCount >= Status.MAX_MEDIA_ATTACHMENTS) {
// Limit the total media attachments, also.
enableButton(pickButton, false, false);
enablePollButton(false);
}
updateHideMediaToggle();
enablePollButton(false);
if (item.readyStage != QueuedMedia.ReadyStage.UPLOADED) {
waitForMediaLatch.countUp();
@ -2004,6 +2010,8 @@ public final class ComposeActivity
maxPollOptions = instance.getPollLimits().getMaxOptions();
maxPollOptionLength = instance.getPollLimits().getMaxOptionChars();
}
isPleroma = instance.isPleroma();
cacheInstanceMetadata(accountManager.getActiveAccount());
}