OK, I got what you mean. I implemented your suggestion and the other suggested fixes. I also changed the logic in main.cpp, because I found a bug in the previous version. It should be also more understandable.

In D13826#289245, @cullmann wrote:

Think that is ok, if the given comments are implemented.

An alternative approach for the API would btw. to have just a function that tells you "I am on activity X", then one doesn't need to send stringlists around and check for contains.