Updated for latest Android releases and change made so that application only switches back to distance search after an appropriate distance has been traveled.