From 05cf3d6370d7d320772b0aba98928d79f3b524d5 Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Tue, 9 Apr 2019 13:53:32 -0700 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/1459 - Try more ways to get title for history item --- .../mozilla/fenix/library/history/HistoryFragment.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt index 28d79f942c..ae03bd8d5b 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt @@ -5,6 +5,7 @@ package org.mozilla.fenix.library.history import android.os.Bundle +import android.text.TextUtils import android.view.LayoutInflater import android.view.Menu import android.view.MenuInflater @@ -30,6 +31,7 @@ import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.mvi.ActionBusFactory import org.mozilla.fenix.mvi.getAutoDisposeObservable import org.mozilla.fenix.mvi.getManagedEmitter +import java.net.MalformedURLException import java.net.URL import kotlin.coroutines.CoroutineContext @@ -154,7 +156,15 @@ class HistoryFragment : Fragment(), CoroutineScope, BackHandler { // See https://github.com/mozilla-mobile/android-components/issues/2643 .filter { allowedVisitTypes.contains(it.visitType) } - .mapIndexed { id, item -> HistoryItem(id, item.title ?: URL(item.url).host, item.url, item.visitTime) } + .mapIndexed { id, item -> + HistoryItem( + id, if (TextUtils.isEmpty(item.title!!)) try { + URL(item.url).host + } catch (e: MalformedURLException) { + item.url + } else item.title!!, item.url, item.visitTime + ) + } .toList() coroutineScope {