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

Save draft when redrafting a post (#1744)

This commit is contained in:
Levi Bard 2020-10-02 18:32:46 +02:00 committed by GitHub
parent 26a051220b
commit e237639adc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/keylesspalace/tusky/SavedTootActivity.java
View File

@ -178,7 +178,8 @@ public final class SavedTootActivity extends BaseActivity implements SavedTootAd
/*mediaAttachments*/null, /*mediaAttachments*/null,
/*scheduledAt*/null, /*scheduledAt*/null,
/*sensitive*/null, /*sensitive*/null,
/*poll*/null /*poll*/null,
/* modifiedInitialState */ true
); );
Intent intent = ComposeActivity.startIntent(this, composeOptions); Intent intent = ComposeActivity.startIntent(this, composeOptions);
startActivity(intent); startActivity(intent);

3
app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
View File

@ -1008,7 +1008,8 @@ class ComposeActivity : BaseActivity(),
var mediaAttachments: List<Attachment>? = null, var mediaAttachments: List<Attachment>? = null,
var scheduledAt: String? = null, var scheduledAt: String? = null,
var sensitive: Boolean? = null, var sensitive: Boolean? = null,
var poll: NewPoll? = null var poll: NewPoll? = null,
var modifiedInitialState: Boolean? = null
) : Parcelable ) : Parcelable
companion object { companion object {

5
app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
View File

@ -63,6 +63,7 @@ class ComposeViewModel
private var startingVisibility: Status.Visibility = Status.Visibility.UNKNOWN private var startingVisibility: Status.Visibility = Status.Visibility.UNKNOWN
private var contentWarningStateChanged: Boolean = false private var contentWarningStateChanged: Boolean = false
private var modifiedInitialState: Boolean = false
private val instance: MutableLiveData<InstanceEntity?> = MutableLiveData(null) private val instance: MutableLiveData<InstanceEntity?> = MutableLiveData(null)
@ -197,7 +198,7 @@ class ComposeViewModel
val mediaChanged = !media.value.isNullOrEmpty() val mediaChanged = !media.value.isNullOrEmpty()
val pollChanged = poll.value != null val pollChanged = poll.value != null
return textChanged || contentWarningChanged || mediaChanged || pollChanged return modifiedInitialState || textChanged || contentWarningChanged || mediaChanged || pollChanged
} }
fun contentWarningChanged(value: Boolean) { fun contentWarningChanged(value: Boolean) {
@ -369,7 +370,7 @@ class ComposeViewModel
preferredVisibility.num.coerceAtLeast(replyVisibility.num)) preferredVisibility.num.coerceAtLeast(replyVisibility.num))
inReplyToId = composeOptions?.inReplyToId inReplyToId = composeOptions?.inReplyToId
modifiedInitialState = composeOptions?.modifiedInitialState == true
val contentWarning = composeOptions?.contentWarning val contentWarning = composeOptions?.contentWarning
if (contentWarning != null) { if (contentWarning != null) {

1
app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
View File

@ -457,6 +457,7 @@ public abstract class SFragment extends BaseFragment implements Injectable {
composeOptions.setContentWarning(deletedStatus.getSpoilerText()); composeOptions.setContentWarning(deletedStatus.getSpoilerText());
composeOptions.setMediaAttachments(deletedStatus.getAttachments()); composeOptions.setMediaAttachments(deletedStatus.getAttachments());
composeOptions.setSensitive(deletedStatus.getSensitive()); composeOptions.setSensitive(deletedStatus.getSensitive());
composeOptions.setModifiedInitialState(true);
if (deletedStatus.getPoll() != null) { if (deletedStatus.getPoll() != null) {
composeOptions.setPoll(deletedStatus.getPoll().toNewPoll(deletedStatus.getCreatedAt())); composeOptions.setPoll(deletedStatus.getPoll().toNewPoll(deletedStatus.getCreatedAt()));
} }