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

Commit 93df4e18 authored by Wei Wang's avatar Wei Wang
Browse files

init: move empty string check to InitTriggers 

Test: mma
Bug: 32838381
Change-Id: I69203734ef7d3640da75f3e3cbe9254bf468d916
parent d67a4abc

init/action.cpp

+11 −4
Original line number Original line Diff line number Diff line
@@ -157,6 +157,11 @@ bool Action::ParsePropertyTrigger(const std::string& trigger, std::string* err) 
bool Action::InitTriggers(const std::vector<std::string>& args, std::string* err) {

bool Action::InitTriggers(const std::vector<std::string>& args, std::string* err) {

    const static std::string prop_str("property:");

    const static std::string prop_str("property:");

    for (std::size_t i = 0; i < args.size(); ++i) {

    for (std::size_t i = 0; i < args.size(); ++i) {

        if (args[i].empty()) {

            *err = "empty trigger is not valid";

            return false;

        }



        if (i % 2) {

        if (i % 2) {

            if (args[i] != "&&") {

            if (args[i] != "&&") {

                *err = "&& is the only symbol allowed to concatenate actions";

                *err = "&& is the only symbol allowed to concatenate actions";
@@ -186,7 +191,11 @@ bool Action::InitTriggers(const std::vector<std::string>& args, std::string* err 
bool Action::InitSingleTrigger(const std::string& trigger) {

bool Action::InitSingleTrigger(const std::string& trigger) {

    std::vector<std::string> name_vector{trigger};

    std::vector<std::string> name_vector{trigger};

    std::string err;

    std::string err;

    return InitTriggers(name_vector, &err);

    bool ret = InitTriggers(name_vector, &err);

    if (!ret) {

        LOG(ERROR) << "InitSingleTrigger failed due to: " << err;

    }

    return ret;

}

}





// This function checks that all property triggers are satisfied, that is

// This function checks that all property triggers are satisfied, that is
@@ -252,9 +261,7 @@ std::string Action::BuildTriggersString() const { 
        result += event_trigger_;

        result += event_trigger_;

        result += ' ';

        result += ' ';

    }

    }

    if (!result.empty()) {

    result.pop_back();

    result.pop_back();

    }

    return result;

    return result;

}

}