diff options
| author | Young Gyu Park <younggyu@google.com> | 2018-09-06 19:03:19 +0900 |
|---|---|---|
| committer | Young Gyu Park <younggyu@google.com> | 2018-09-14 11:52:32 +0900 |
| commit | 5ad922ee5f85054d7b1b8fef4b6fa3f152beb0b5 (patch) | |
| tree | bad67410edb69e50518a8fbd357097c94ca4fe4c /src/main/java/com/android/vts/util/EmailHelper.java | |
| parent | 64e472e20f250cfc1ed0dc82731d816e9d6a69ef (diff) | |
| download | dashboard-5ad922ee5f85054d7b1b8fef4b6fa3f152beb0b5.tar.gz | |
Bug fix and loading speed improvement.
Test: go/vts-web-staging
Bug: 113356010
Change-Id: I4b9976fa7eb35efa3d17f69e8bc5c2bfba11066d
Diffstat (limited to 'src/main/java/com/android/vts/util/EmailHelper.java')
| -rw-r--r-- | src/main/java/com/android/vts/util/EmailHelper.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/main/java/com/android/vts/util/EmailHelper.java b/src/main/java/com/android/vts/util/EmailHelper.java index 0bec72b..de1d6e9 100644 --- a/src/main/java/com/android/vts/util/EmailHelper.java +++ b/src/main/java/com/android/vts/util/EmailHelper.java @@ -26,9 +26,11 @@ import com.google.appengine.api.datastore.Query.FilterOperator; import com.google.appengine.api.datastore.Query.FilterPredicate; import java.io.IOException; import java.io.UnsupportedEncodingException; + import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Optional; import java.util.Properties; import java.util.Set; import java.util.logging.Level; @@ -75,8 +77,8 @@ public class EmailHelper { if (testRun != null) { sb.append("VTS Build ID: " + testRun.getTestBuildId() + "<br>"); - sb.append("Start Time: " + TimeUtil.getDateTimeString(testRun.getStartTimestamp())); - sb.append("<br>End Time: " + TimeUtil.getDateTimeString(testRun.getEndTimestamp())); + sb.append("Start Time: " + TimeUtil.getDateTimeZoneString(testRun.getStartTimestamp())); + sb.append("<br>End Time: " + TimeUtil.getDateTimeZoneString(testRun.getEndTimestamp())); } sb.append( "<br><br>For details, visit the" @@ -105,11 +107,15 @@ public class EmailHelper { } for (Entity favorite : datastore.prepare(favoritesQuery).asIterable()) { UserFavoriteEntity favoriteEntity = UserFavoriteEntity.fromEntity(favorite); + // TODO this logic need to be reexamined thoroughly and improved if (favoriteEntity != null && favoriteEntity.user != null - && favoriteEntity.user.getEmail().endsWith(EMAIL_DOMAIN) && !favoriteEntity.muteNotifications) { - emailSet.add(favoriteEntity.user.getEmail()); + Optional<String> userEmail = Optional.of(favoriteEntity.user.getEmail()); + if (userEmail.isPresent() && + userEmail.orElse("").endsWith(EMAIL_DOMAIN)) { + emailSet.add(favoriteEntity.user.getEmail()); + } } } return new ArrayList<>(emailSet); |