Preference to disable swipe-down-to-refresh

QuantumBadger · Sep 8, 2016 · 7392c6e · 7392c6e
1 parent e17dab7
commit 7392c6e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 13 deletions.
diff --git a/assets/changelog.txt b/assets/changelog.txt
@@ -9,6 +9,7 @@ Preference to hide floating toolbar over images
 Preference to make link text non-clickable
 Preference to disable swipe-down-to-refresh
 For albums with only one image, the image is now shown immediately
+When sending PMs, input fields are cleared if send succeeded
 Fixed bug with huge "load more comments" links
 Support for imgflip links
 

diff --git a/src/main/java/org/quantumbadger/redreader/activities/PMSendActivity.java b/src/main/java/org/quantumbadger/redreader/activities/PMSendActivity.java
@@ -60,6 +60,8 @@ public class PMSendActivity extends BaseActivity {
 	private EditText subjectEdit;
 	private EditText textEdit;
 
+	private boolean mSendSuccess;
+
 	private static String lastText, lastRecipient, lastSubject;
 
 	@Override
@@ -87,20 +89,23 @@ protected void onCreate(Bundle savedInstanceState) {
 			initialSubject = savedInstanceState.getString(SAVED_STATE_SUBJECT);
 			initialText = savedInstanceState.getString(SAVED_STATE_TEXT);
 
-		} else if(getIntent() != null && getIntent().hasExtra(EXTRA_RECIPIENT)) {
-			initialRecipient = getIntent().getStringExtra(EXTRA_RECIPIENT);
-			initialSubject = getIntent().getStringExtra(EXTRA_SUBJECT);
-			initialText = lastText;
+		} else {
 
-		} else if(lastText != null) {
-			initialRecipient = lastRecipient;
-			initialSubject = lastSubject;
-			initialText = lastText;
+			final Intent intent = getIntent();
 
-		} else {
-			initialRecipient = null;
-			initialSubject = null;
-			initialText = null;
+			if(intent != null && intent.hasExtra(EXTRA_RECIPIENT)) {
+				initialRecipient = intent.getStringExtra(EXTRA_RECIPIENT);
+			} else {
+				initialRecipient = lastRecipient;
+			}
+
+			if(intent != null && intent.hasExtra(EXTRA_SUBJECT)) {
+				initialSubject = intent.getStringExtra(EXTRA_SUBJECT);
+			} else {
+				initialSubject = lastSubject;
+			}
+
+			initialText = lastText;
 		}
 
 		if(initialRecipient != null) {
@@ -195,7 +200,15 @@ protected void onSuccess() {
 					AndroidApi.UI_THREAD_HANDLER.post(new Runnable() {
 						@Override
 						public void run() {
+
 							if(progressDialog.isShowing()) progressDialog.dismiss();
+
+							mSendSuccess = true;
+
+							lastText = null;
+							lastRecipient = null;
+							lastSubject = null;
+
 							General.quickToast(PMSendActivity.this, getString(R.string.pm_send_done));
 							finish();
 						}
@@ -289,7 +302,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 	protected void onDestroy() {
 		super.onDestroy();
 
-		if(textEdit != null) {
+		if(!mSendSuccess && textEdit != null) {
 			lastRecipient = recipientEdit.getText().toString();
 			lastSubject = subjectEdit.getText().toString();
 			lastText = textEdit.getText().toString();