Yeah, I experienced a similar issue on iOS last night as well and devised a similar workaround for it. I can’t even be bothered though - I love Nintendo, and I’ve come to accept these sorts of shenanigans as par for the course when it comes to anything internet-related.