From 44e3b6883bdfe9724cad7247118864bfb4b26731 Mon Sep 17 00:00:00 2001
From: John-Ashton Allen <allenjohnashton@gmail.com>
Date: Mon, 2 Apr 2012 15:21:15 -0700
Subject: [PATCH] Changed MetaMta Body Parser to handle HTC mail application
 correctly

Summary: Added a regex to remove the text

Test Plan: Tested a few messages, from mail application them gmail, both seemed fine, will add unit tests

Reviewers: epriestley

Reviewed By: epriestley

CC: aran

Differential Revision: https://secure.phabricator.com/D2078
---
 .../parser/PhabricatorMetaMTAEmailBodyParser.php   |  8 +++++++-
 .../PhabricatorMetaMTAEmailBodyParserTestCase.php  | 14 +++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php b/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php
index dd07422bcb..4b2b5a398c 100644
--- a/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php
+++ b/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,12 @@ final class PhabricatorMetaMTAEmailBodyParser {
       '',
       $body);
 
+    // HTC Mail application (mobile)
+    $body = preg_replace(
+      '/^\s*Sent from my HTC smartphone.*?/msU',
+      '',
+      $body);
+
     return rtrim($body);
   }
 
diff --git a/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php b/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php
index a7f1a87fa3..a85ec1f3e2 100644
--- a/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php
+++ b/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,6 +72,18 @@ OKAY
 
 -----Original Message-----
 
+> ...
+EOEMAIL
+,
+<<<EOEMAIL
+OKAY
+
+Sent from my HTC smartphone on the Now Network from Sprint!
+
+-Reply message ----- From: "somebody (someone)" <
+somebody@somewhere.com>
+To: <somebody@somewhere.com>
+Subject: Some Text Date: Mon, Apr 2, 2012 1:42 pm
 > ...
 EOEMAIL
     );