Add noinspection comment to avoid warning on known AS issue
Add noinspection comment to avoid warning on known AS issue
Code cleanup. Added a couple of TODOs