Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b42cdb21 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "MAP: PushMessage Email parsing issue"

parents c57c2b89 65d863e4

src/com/android/bluetooth/map/BluetoothMapbMessageMmsEmail.java

+4 −2
Original line number Diff line number Diff line
@@ -749,7 +749,8 @@ public class BluetoothMapbMessageMmsEmail extends BluetoothMapbMessage { 
               if (beginMsg == -1) {

                   throw new IllegalArgumentException("Ill-formatted bMessage, no BEGIN:MSG");

               }

               int endMsg = body.lastIndexOf("END:MSG", beginMsg);

               //Last occurence of END:MSG

               int endMsg = body.lastIndexOf("END:MSG");

               if (endMsg == -1) {

                   throw new IllegalArgumentException("Ill-formatted bMessage, no END:MSG");

               }
@@ -764,7 +765,8 @@ public class BluetoothMapbMessageMmsEmail extends BluetoothMapbMessage { 
       int endVersionPos;

       if(rfc822Flag == 0){

          if(mimeFlag == 0) {

             endVersionPos = body.lastIndexOf("END:MSG", beginVersionPos) ;

             //Last occurence of END:MSG

             endVersionPos = body.lastIndexOf("END:MSG") ;

             if (endVersionPos != -1) {

                 setEmailBody(body.substring(beginVersionPos, (endVersionPos - CRLF.length())));

             } else {