From 135a8ac29615e7b7ee50dfaf103a289983cbbc8a Mon Sep 17 00:00:00 2001 From: "Randall E. Barker" Date: Wed, 29 Apr 2020 08:28:26 -0700 Subject: [PATCH] Ensure mUri is not null in Window save (#3279) Speculative fix for https://crash-stats.mozilla.org/report/index/6b13ce7f-7f54-48f3-acf4-ebb540200428 --- .../shared/org/mozilla/vrbrowser/ui/widgets/Windows.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java index 92f11c674..4a077cd9c 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java @@ -194,7 +194,9 @@ public void saveState() { ArrayList sessions = SessionStore.get().getSortedSessions(false); state.tabs = sessions.stream() .map(Session::getSessionState) - .filter(sessionState -> SAVE_BLACKLIST.stream().noneMatch(uri -> sessionState.mUri.startsWith(uri))) + .filter(sessionState -> SAVE_BLACKLIST.stream().noneMatch(uri -> + sessionState.mUri != null && sessionState.mUri.startsWith(uri) + )) .collect(Collectors.toCollection(ArrayList::new)); for (WindowWidget window : mRegularWindows) { if (window.getSession() != null) {