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

Commit 75bbbdde authored by Hemant Gupta's avatar Hemant Gupta Committed by Matthew Xie
Browse files

Bluetooth: Map: Trim folder name in pushMessage and setPath 

Trim folder name string passed from remote, before processing the
pushMessage and setPath request to do proper handling when a blank
folder name is passed from some Carkits. Without this change there
will be some IOT issues with some carkit(s) which will append a space
instead of empty string for pushing message to current folder.

Change-Id: I8b0bdfc1f837c53f0773057db27b81ae9acb279a
parent 25e945a4

android/app/src/com/android/bluetooth/map/BluetoothMapObexServer.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -239,7 +239,7 @@ public class BluetoothMapObexServer extends ServerRequestHandler { 
            return ResponseCodes.OBEX_HTTP_PRECON_FAILED;

            return ResponseCodes.OBEX_HTTP_PRECON_FAILED;

        }

        }

        try {

        try {

            if(folderName == null || folderName.equals("")) {

            if(folderName == null || folderName.trim().isEmpty()) {

                folderName = mCurrentFolder.getName();

                folderName = mCurrentFolder.getName();

            }

            }

            folderName = folderName.toLowerCase();

            folderName = folderName.toLowerCase();
@@ -344,7 +344,7 @@ public class BluetoothMapObexServer extends ServerRequestHandler { 
                return ResponseCodes.OBEX_HTTP_BAD_REQUEST;

                return ResponseCodes.OBEX_HTTP_BAD_REQUEST;

        }

        }





        if (folderName == null || folderName == "") {

        if (folderName == null || folderName.trim().isEmpty()) {

            if(backup == false)

            if(backup == false)

                mCurrentFolder = mCurrentFolder.getRoot();

                mCurrentFolder = mCurrentFolder.getRoot();

        }

        }