Refactored mediaPlayer.setOnCompletionListener into Globals.onCreate method and removed ClientStreamThread nested class which was not being used any more.