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

Commit ef8cb92b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Limit bluetooth broadcast password to single byte characters" into main... 

Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe50108 am: 9c21429a am: ed9bbf31 am: c9e0efd5 am: e4d9d80f

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234



Change-Id: Icfbdf2683a06b4720c9819c8f7658587ab503e49
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a9a819a5 e4d9d80f

src/com/android/settings/bluetooth/BluetoothFindBroadcastsFragment.java

+61 −0
Original line number Diff line number Diff line
@@ -30,10 +30,16 @@ import android.bluetooth.le.ScanFilter; 
import android.content.Context;

import android.content.Intent;

import android.os.Bundle;

import android.text.Editable;

import android.text.InputFilter;

import android.text.InputType;

import android.text.Spanned;

import android.text.TextWatcher;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.view.WindowManager;

import android.widget.Button;

import android.widget.EditText;

import android.widget.TextView;

import android.widget.Toast;
@@ -474,9 +480,64 @@ public class BluetoothFindBroadcastsFragment extends RestrictedDashboardFragment 
                .create();



        alertDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);

        addTextWatcher(alertDialog, editText);

        alertDialog.show();

        updateBtnState(alertDialog, false);

    }



    private void addTextWatcher(AlertDialog alertDialog, EditText editText) {

        if (alertDialog == null || editText == null) {

            return;

        }

        final InputFilter[] filter = new InputFilter[] {mInputFilter};

        editText.setFilters(filter);

        editText.setInputType(InputType.TYPE_CLASS_TEXT

                | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);

        TextWatcher bCodeTextWatcher = new TextWatcher() {

            @Override

            public void beforeTextChanged(CharSequence s, int start, int count, int after) {

                // Do nothing

            }



            @Override

            public void onTextChanged(CharSequence s, int start, int before, int count) {

                // Do nothing

            }



            @Override

            public void afterTextChanged(Editable s) {

                boolean breakBroadcastCodeRuleTextLengthLessThanMin =

                        s.length() > 0 && s.toString().getBytes().length < 4;

                boolean breakBroadcastCodeRuleTextLengthMoreThanMax =

                        s.toString().getBytes().length > 16;

                boolean breakRule = breakBroadcastCodeRuleTextLengthLessThanMin

                        || breakBroadcastCodeRuleTextLengthMoreThanMax;

                updateBtnState(alertDialog, !breakRule);

            }

        };

        editText.addTextChangedListener(bCodeTextWatcher);

    }



    private void updateBtnState(AlertDialog alertDialog, boolean isEnable) {

        Button positiveBtn = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);

        if (positiveBtn != null) {

            positiveBtn.setEnabled(isEnable ? true : false);

        }

    }



    private InputFilter mInputFilter = new InputFilter() {

        @Override

        public CharSequence filter(CharSequence source, int start, int end,

                Spanned dest, int dstart, int dend) {

            byte[] bytes = source.toString().getBytes(StandardCharsets.UTF_8);

            if (bytes.length == source.length()) {

                return source;

            } else {

                return "";

            }

        }

    };



    private void handleSearchStarted() {

        cacheRemoveAllPrefs(mBroadcastSourceListCategory);

        addConnectedSourcePreference();