Changed Date.getTime to System.currentTimeMillis