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

Commit 37d0e409 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Sanitize file name displayed in notification 

Bug: 169851269
Change-Id: Iae70e8dbd81aebf165c6be9164746ab6c529ff85
parent a0aaab85

android/app/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 


    <!-- Bluetooth File Transfer Acceptance Notification item -->

    <string name="incoming_file_confirm_Notification_title">Incoming file</string>

    <string name="incoming_file_confirm_Notification_content"><xliff:g id="sender">%1$s</xliff:g> is ready to send <xliff:g id="file">%2$s</xliff:g></string>

    <string name="incoming_file_confirm_Notification_content"><xliff:g id="sender">%1$s</xliff:g> is ready to send a file: <xliff:g id="file">%2$s</xliff:g></string>



    <!-- Inbound File Transfer Progress Notification item -->

    <!-- label for the notification item of receiving file -->

android/app/src/com/android/bluetooth/opp/BluetoothOppNotification.java

+5 −4
Original line number Diff line number Diff line
@@ -562,6 +562,7 @@ class BluetoothOppNotification { 
            BluetoothOppTransferInfo info = new BluetoothOppTransferInfo();

            BluetoothOppUtility.fillRecord(mContext, cursor, info);

            Uri contentUri = Uri.parse(BluetoothShare.CONTENT_URI + "/" + info.mID);

            String fileNameSafe = info.mFileName.replaceAll("\\s", "_");

            Intent baseIntent = new Intent().setDataAndNormalize(contentUri)

                    .setClassName(Constants.THIS_PACKAGE_NAME,

                            BluetoothOppReceiver.class.getName());
@@ -605,10 +606,10 @@ class BluetoothOppNotification { 
                                            mContext.getTheme()))

                            .setContentTitle(mContext.getText(

                                    R.string.incoming_file_confirm_Notification_title))

                            .setContentText(info.mFileName)

                            .setContentText(fileNameSafe)

                            .setStyle(new Notification.BigTextStyle().bigText(mContext.getString(

                                    R.string.incoming_file_confirm_Notification_content,

                                    info.mDeviceName, info.mFileName)))

                                    info.mDeviceName, fileNameSafe)))

                            .setSubText(Formatter.formatFileSize(mContext, info.mTotalBytes))

                            .setSmallIcon(R.drawable.bt_incomming_file_notification)

                            .setLocalOnly(true)
@@ -634,10 +635,10 @@ class BluetoothOppNotification { 
                                            mContext.getTheme()))

                            .setContentTitle(mContext.getText(

                                    R.string.incoming_file_confirm_Notification_title))

                            .setContentText(info.mFileName)

                            .setContentText(fileNameSafe)

                            .setStyle(new Notification.BigTextStyle().bigText(mContext.getString(

                                    R.string.incoming_file_confirm_Notification_content,

                                    info.mDeviceName, info.mFileName)))

                                    info.mDeviceName, fileNameSafe)))

                            .setSubText(Formatter.formatFileSize(mContext, info.mTotalBytes))

                            .setSmallIcon(R.drawable.bt_incomming_file_notification)

                            .setLocalOnly(true)