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

improve "save draft" dialog show condition

This commit is contained in:
Konrad Pozniak 2018-04-22 21:04:19 +02:00
parent d9e29e2cb6
commit 23f7f04aa8
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,6 @@ import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.os.Parcel; import android.os.Parcel;
@ -199,6 +198,8 @@ public final class ComposeActivity
private Status.Visibility statusVisibility; // The current values of the options that will be applied private Status.Visibility statusVisibility; // The current values of the options that will be applied
private boolean statusMarkSensitive; // to the status being composed. private boolean statusMarkSensitive; // to the status being composed.
private boolean statusHideText; private boolean statusHideText;
private String startingText = "";
private String startingContentWarning = "";
private InputContentInfoCompat currentInputContentInfo; private InputContentInfoCompat currentInputContentInfo;
private int currentFlags; private int currentFlags;
private Uri photoUploadUri; private Uri photoUploadUri;
@ -340,7 +341,6 @@ public final class ComposeActivity
* state. */ * state. */
Status.Visibility startingVisibility = Status.Visibility.UNKNOWN; Status.Visibility startingVisibility = Status.Visibility.UNKNOWN;
boolean startingHideText; boolean startingHideText;
String startingContentWarning = null;
ArrayList<SavedQueuedMedia> savedMediaQueued = null; ArrayList<SavedQueuedMedia> savedMediaQueued = null;
if (savedInstanceState != null) { if (savedInstanceState != null) {
startingVisibility = Status.Visibility.byNum( startingVisibility = Status.Visibility.byNum(
@ -403,7 +403,8 @@ public final class ComposeActivity
// If come from SavedTootActivity // If come from SavedTootActivity
String savedTootText = intent.getStringExtra(SAVED_TOOT_TEXT_EXTRA); String savedTootText = intent.getStringExtra(SAVED_TOOT_TEXT_EXTRA);
if (!TextUtils.isEmpty(savedTootText)) { if (!TextUtils.isEmpty(savedTootText)) {
textEditor.append(savedTootText); startingText = savedTootText;
textEditor.setText(savedTootText);
} }
String savedJsonUrls = intent.getStringExtra(SAVED_JSON_URLS_EXTRA); String savedJsonUrls = intent.getStringExtra(SAVED_JSON_URLS_EXTRA);
@ -488,7 +489,8 @@ public final class ComposeActivity
builder.append(name); builder.append(name);
builder.append(' '); builder.append(' ');
} }
textEditor.setText(builder); startingText = builder.toString();
textEditor.setText(startingText);
textEditor.setSelection(textEditor.length()); textEditor.setSelection(textEditor.length());
} }
@ -1380,9 +1382,15 @@ public final class ComposeActivity
} }
private void handleCloseButton() { private void handleCloseButton() {
if (!TextUtils.isEmpty(textEditor.getText()) CharSequence contentText = textEditor.getText();
|| !TextUtils.isEmpty(contentWarningEditor.getText()) CharSequence contentWarning = contentWarningEditor.getText();
|| !mediaQueued.isEmpty()) {
boolean textChanged = !(TextUtils.isEmpty(contentText) || startingText.startsWith(contentText.toString()));
boolean contentWarningChanged = contentWarningBar.getVisibility() == View.VISIBLE &&
!TextUtils.isEmpty(contentWarning) && !startingContentWarning.startsWith(contentWarning.toString());
boolean mediaChanged = !mediaQueued.isEmpty();
if (textChanged || contentWarningChanged || mediaChanged) {
new AlertDialog.Builder(this) new AlertDialog.Builder(this)
.setMessage(R.string.compose_save_draft) .setMessage(R.string.compose_save_draft)
.setPositiveButton(R.string.action_save, (d, w) -> saveDraftAndFinish()) .setPositiveButton(R.string.action_save, (d, w) -> saveDraftAndFinish())
@ -1432,13 +1440,12 @@ public final class ComposeActivity
textEditor.getText().insert(textEditor.getSelectionStart(), ":"+shortcode+": "); textEditor.getText().insert(textEditor.getSelectionStart(), ":"+shortcode+": ");
} }
private void loadCachedInstanceMetadata(@NotNull AccountEntity activeAccount) private void loadCachedInstanceMetadata(@NotNull AccountEntity activeAccount) {
{
InstanceEntity instanceEntity = TuskyApplication.getDB().instanceDao().loadMetadataForInstance(activeAccount.getDomain()); InstanceEntity instanceEntity = TuskyApplication.getDB().instanceDao().loadMetadataForInstance(activeAccount.getDomain());
if(instanceEntity != null) { if(instanceEntity != null) {
Integer max = instanceEntity.getMaximumTootCharacters(); Integer max = instanceEntity.getMaximumTootCharacters();
maximumTootCharacters = (max == null ? STATUS_CHARACTER_LIMIT : max.intValue()); maximumTootCharacters = (max == null ? STATUS_CHARACTER_LIMIT : max);
emojiList = instanceEntity.getEmojiList(); emojiList = instanceEntity.getEmojiList();
if (emojiList != null) { if (emojiList != null) {
emojiView.setAdapter(new EmojiAdapter(emojiList, ComposeActivity.this)); emojiView.setAdapter(new EmojiAdapter(emojiList, ComposeActivity.this));