Added logs and handle CompletableFutures exception (#1600)

* Added logs and handle CompletableFutures exception * Avoid PII leaking moving error logs to debug level
MozillaReality · Aug 22, 2019 · e7b20eb · e7b20eb
1 parent 13233fb
commit e7b20eb
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/search/suggestions/SuggestionsProvider.java b/app/src/common/shared/org/mozilla/vrbrowser/search/suggestions/SuggestionsProvider.java
@@ -1,6 +1,7 @@
 package org.mozilla.vrbrowser.search.suggestions;
 
 import android.content.Context;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 
@@ -17,6 +18,8 @@
 
 public class SuggestionsProvider {
 
+    private static final String LOGTAG = SuggestionsProvider.class.getSimpleName();
+
     public class DefaultSuggestionsComparator implements Comparator {
 
         public int compare(Object obj1, Object obj2) {
@@ -90,6 +93,11 @@ public CompletableFuture<List<SuggestionItem>> getBookmarkSuggestions(@NonNull L
                 items.sort(mComparator);
             }
             future.complete(items);
+
+        }).exceptionally(th -> {
+            Log.d(LOGTAG, "Error getting bookmarks suggestions: " + th.getLocalizedMessage());
+            future.complete(items);
+            return null;
         });
 
         return future;
@@ -111,6 +119,11 @@ public CompletableFuture<List<SuggestionItem>> getHistorySuggestions(@NonNull fi
                 items.sort(mComparator);
             }
             future.complete(items);
+
+        }).exceptionally(th -> {
+            Log.d(LOGTAG, "Error getting history suggestions: " + th.getLocalizedMessage());
+            future.complete(items);
+           return null;
         });
 
         return future;
@@ -152,6 +165,11 @@ public CompletableFuture<List<SuggestionItem>> getSearchEngineSuggestions(@NonNu
                 items.sort(mComparator);
             }
             future.complete(items);
+
+        }).exceptionally(th -> {
+            Log.d(LOGTAG, "Error getting search engine suggestions: " + th.getLocalizedMessage());
+            future.complete(items);
+            return null;
         });
 
         return future;

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java
@@ -12,6 +12,7 @@
 import android.text.TextWatcher;
 import android.text.style.ForegroundColorSpan;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.util.TypedValue;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
@@ -52,6 +53,9 @@
 import mozilla.components.ui.autocomplete.InlineAutocompleteEditText;
 
 public class NavigationURLBar extends FrameLayout {
+
+    private static final String LOGTAG = NavigationURLBar.class.getSimpleName();
+
     private InlineAutocompleteEditText mURL;
     private UIButton mMicrophoneButton;
     private UIButton mUAModeButton;
@@ -255,7 +259,10 @@ private void handleBookmarkClick() {
                 bookmarkStore.deleteBookmarkByURL(url);
                 setBookmarked(false);
             }
-        }, mUIThreadExecutor);
+        }, mUIThreadExecutor).exceptionally(th -> {
+            Log.d(LOGTAG, "Error getting bookmarks: " + th.getLocalizedMessage());
+            return null;
+        });
 
     }
 

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
@@ -53,7 +53,7 @@ public class NavigationBarWidget extends UIWidget implements GeckoSession.Naviga
         SharedPreferences.OnSharedPreferenceChangeListener, SuggestionsWidget.URLBarPopupDelegate,
         BookmarkListener, TrayListener {
 
-    private static final String LOGTAG = "VRB";
+    private static final String LOGTAG = NavigationBarWidget.class.getSimpleName();
 
     private AudioEngine mAudio;
     private UIButton mBackButton;
@@ -901,7 +901,10 @@ public void OnShowSearchPopup() {
                         mPopup.show(CLEAR_FOCUS);
                     }
 
-                }, new UIThreadExecutor());
+                }, new UIThreadExecutor()).exceptionally(th -> {
+                    Log.d(LOGTAG, "Error getting suggestions: " + th.getLocalizedMessage());
+                    return null;
+        });
     }
 
     @Override