Private message replies are now part of the original conversion, rath…

…er than starting a new one (fixes #442)
QuantumBadger · Feb 12, 2017 · 5be31d6 · 5be31d6
1 parent 764da6d
commit 5be31d6
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 7 deletions.
diff --git a/assets/changelog.txt b/assets/changelog.txt
@@ -1,4 +1,5 @@
 78/1.9.8
+Private message replies are now part of the original conversion, rather than starting a new one
 Support keyboard Go-action in custom location dialog (thanks to gaudecker)
 
 77/1.9.7

diff --git a/src/main/java/org/quantumbadger/redreader/activities/CommentReplyActivity.java b/src/main/java/org/quantumbadger/redreader/activities/CommentReplyActivity.java
@@ -47,13 +47,22 @@
 
 public class CommentReplyActivity extends BaseActivity {
 
+	private enum ParentType {
+		MESSAGE, COMMENT_OR_POST
+	}
+
 	private Spinner usernameSpinner;
 	private EditText textEdit;
 
 	private String parentIdAndType = null;
 
+	private ParentType mParentType;
+
 	private static String lastText, lastParentIdAndType;
 
+	public static final String PARENT_TYPE = "parentType";
+	public static final String PARENT_TYPE_MESSAGE = "parentTypeMessage";
+
 	public static final String PARENT_ID_AND_TYPE_KEY = "parentIdAndType";
 	public static final String PARENT_MARKDOWN_KEY = "parent_markdown";
 	private static final String COMMENT_TEXT_KEY = "comment_text";
@@ -67,7 +76,17 @@ protected void onCreate(Bundle savedInstanceState) {
 
 		final Intent intent = getIntent();
 
-		setTitle(R.string.submit_comment_actionbar);
+		if(intent != null
+				&& intent.hasExtra(PARENT_TYPE)
+				&& intent.getStringExtra(PARENT_TYPE).equals(PARENT_TYPE_MESSAGE)) {
+
+			mParentType = ParentType.MESSAGE;
+			setTitle(R.string.submit_pmreply_actionbar);
+
+		} else {
+			mParentType = ParentType.COMMENT_OR_POST;
+			setTitle(R.string.submit_comment_actionbar);
+		}
 
 		final LinearLayout layout = (LinearLayout) getLayoutInflater().inflate(R.layout.comment_reply, null);
 
@@ -183,7 +202,13 @@ protected void onSuccess() {
 						@Override
 						public void run() {
 							if(progressDialog.isShowing()) progressDialog.dismiss();
-							General.quickToast(CommentReplyActivity.this, getString(R.string.comment_reply_done));
+
+							if(mParentType == ParentType.MESSAGE) {
+								General.quickToast(CommentReplyActivity.this, getString(R.string.pm_reply_done));
+							} else {
+								General.quickToast(CommentReplyActivity.this, getString(R.string.comment_reply_done));
+							}
+
 							lastText = null;
 							lastParentIdAndType = null;
 							finish();

diff --git a/src/main/java/org/quantumbadger/redreader/reddit/prepared/RedditPreparedMessage.java b/src/main/java/org/quantumbadger/redreader/reddit/prepared/RedditPreparedMessage.java
@@ -25,7 +25,7 @@
 import android.view.View;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.quantumbadger.redreader.R;
-import org.quantumbadger.redreader.activities.PMSendActivity;
+import org.quantumbadger.redreader.activities.CommentReplyActivity;
 import org.quantumbadger.redreader.common.BetterSSB;
 import org.quantumbadger.redreader.common.LinkHandler;
 import org.quantumbadger.redreader.common.RRThemeAttributes;
@@ -65,7 +65,7 @@ public RedditPreparedMessage(final Context context, final RedditMessage message,
 			appearance.recycle();
 		}
 
-		body = MarkdownParser.parse(StringEscapeUtils.unescapeHtml4(message.body).toCharArray());
+		body = MarkdownParser.parse(message.getUnescapedBodyMarkdown().toCharArray());
 
 		idAndType = message.name;
 
@@ -92,9 +92,11 @@ public SpannableStringBuilder getHeader() {
 	}
 
 	private void openReplyActivity(final AppCompatActivity activity) {
-		final Intent intent = new Intent(activity, PMSendActivity.class);
-		intent.putExtra(PMSendActivity.EXTRA_RECIPIENT, src.author);
-		intent.putExtra(PMSendActivity.EXTRA_SUBJECT, src.subject);
+
+		final Intent intent = new Intent(activity, CommentReplyActivity.class);
+		intent.putExtra(CommentReplyActivity.PARENT_ID_AND_TYPE_KEY, idAndType);
+		intent.putExtra(CommentReplyActivity.PARENT_MARKDOWN_KEY, src.getUnescapedBodyMarkdown());
+		intent.putExtra(CommentReplyActivity.PARENT_TYPE, CommentReplyActivity.PARENT_TYPE_MESSAGE);
 		activity.startActivity(intent);
 	}
 

diff --git a/src/main/java/org/quantumbadger/redreader/reddit/things/RedditMessage.java b/src/main/java/org/quantumbadger/redreader/reddit/things/RedditMessage.java
@@ -17,6 +17,7 @@
 
 package org.quantumbadger.redreader.reddit.things;
 
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.quantumbadger.redreader.jsonwrap.JsonValue;
 
 public class RedditMessage {
@@ -25,4 +26,8 @@ public class RedditMessage {
 	public boolean _json_new, was_comment;
 	public JsonValue first_message, replies;
 	public long created, created_utc;
+
+	public String getUnescapedBodyMarkdown() {
+		return StringEscapeUtils.unescapeHtml4(body);
+	}
 }
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
@@ -952,4 +952,8 @@
 	<string name="error_403_title_nonreddit">Permission Denied</string>
 	<string name="error_403_message_nonreddit">The server responded with a permission denied error.</string>
 
+	<!-- 2017-02-12 -->
+	<string name="submit_pmreply_actionbar">Reply</string>
+	<string name="pm_reply_done">Reply sent.</string>
+
 </resources>