Loading src/com/android/launcher3/notification/NotificationKeyData.java +8 −8 Original line number Diff line number Diff line Loading @@ -20,15 +20,13 @@ import android.app.Notification; import android.app.Person; import android.service.notification.StatusBarNotification; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.launcher3.Utilities; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; import androidx.annotation.NonNull; import androidx.annotation.Nullable; /** * The key data associated with the notification, used to determine what to include Loading @@ -39,8 +37,9 @@ import androidx.annotation.Nullable; public class NotificationKeyData { public final String notificationKey; public final String shortcutId; @NonNull public final String[] personKeysFromNotification; public int count; @NonNull public final String[] personKeysFromNotification; private NotificationKeyData(String notificationKey, String shortcutId, int count, String[] personKeysFromNotification) { Loading Loading @@ -70,7 +69,8 @@ public class NotificationKeyData { if (people == null || people.isEmpty()) { return Utilities.EMPTY_STRING_ARRAY; } return people.stream().map(Person::getKey).sorted().toArray(String[]::new); return people.stream().filter(person -> person.getKey() != null) .map(Person::getKey).sorted().toArray(String[]::new); } @Override Loading Loading
src/com/android/launcher3/notification/NotificationKeyData.java +8 −8 Original line number Diff line number Diff line Loading @@ -20,15 +20,13 @@ import android.app.Notification; import android.app.Person; import android.service.notification.StatusBarNotification; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.launcher3.Utilities; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; import androidx.annotation.NonNull; import androidx.annotation.Nullable; /** * The key data associated with the notification, used to determine what to include Loading @@ -39,8 +37,9 @@ import androidx.annotation.Nullable; public class NotificationKeyData { public final String notificationKey; public final String shortcutId; @NonNull public final String[] personKeysFromNotification; public int count; @NonNull public final String[] personKeysFromNotification; private NotificationKeyData(String notificationKey, String shortcutId, int count, String[] personKeysFromNotification) { Loading Loading @@ -70,7 +69,8 @@ public class NotificationKeyData { if (people == null || people.isEmpty()) { return Utilities.EMPTY_STRING_ARRAY; } return people.stream().map(Person::getKey).sorted().toArray(String[]::new); return people.stream().filter(person -> person.getKey() != null) .map(Person::getKey).sorted().toArray(String[]::new); } @Override Loading