Commit aa4bfdb3 authored by Shakti Sahu's avatar Shakti Sahu Committed by Commit Bot

Download Home : Fixed crash on spinner

This crash was introduced due to the changes for URL backstack introduced
in https://chromium-review.googlesource.com/c/chromium/src/+/1309428

Bug: 903716
Change-Id: Idfb7c09fde27ed546628b875f6fa2ac68b6f1cd7
Reviewed-on: https://chromium-review.googlesource.com/c/1338484
Commit-Queue: Shakti Sahu <shaktisahu@chromium.org>
Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608895}
parent 0d1b4a26
...@@ -11,10 +11,10 @@ import android.os.Bundle; ...@@ -11,10 +11,10 @@ import android.os.Bundle;
import org.chromium.base.VisibleForTesting; import org.chromium.base.VisibleForTesting;
import org.chromium.chrome.browser.IntentHandler; import org.chromium.chrome.browser.IntentHandler;
import org.chromium.chrome.browser.SnackbarActivity; import org.chromium.chrome.browser.SnackbarActivity;
import org.chromium.chrome.browser.UrlConstants;
import org.chromium.chrome.browser.download.home.DownloadManagerCoordinator; import org.chromium.chrome.browser.download.home.DownloadManagerCoordinator;
import org.chromium.chrome.browser.download.home.DownloadManagerCoordinatorFactory; import org.chromium.chrome.browser.download.home.DownloadManagerCoordinatorFactory;
import org.chromium.chrome.browser.download.home.DownloadManagerUiConfig; import org.chromium.chrome.browser.download.home.DownloadManagerUiConfig;
import org.chromium.chrome.browser.download.home.filter.Filters;
import org.chromium.chrome.browser.download.items.OfflineContentAggregatorNotificationBridgeUiFactory; import org.chromium.chrome.browser.download.items.OfflineContentAggregatorNotificationBridgeUiFactory;
import org.chromium.chrome.browser.download.ui.DownloadManagerUi; import org.chromium.chrome.browser.download.ui.DownloadManagerUi;
import org.chromium.chrome.browser.util.IntentUtils; import org.chromium.chrome.browser.util.IntentUtils;
...@@ -65,14 +65,12 @@ public class DownloadActivity extends SnackbarActivity { ...@@ -65,14 +65,12 @@ public class DownloadActivity extends SnackbarActivity {
mIsOffTheRecord = isOffTheRecord; mIsOffTheRecord = isOffTheRecord;
mDownloadCoordinator.addObserver(mUiObserver); mDownloadCoordinator.addObserver(mUiObserver);
if (savedInstanceState != null) { // TODO(crbug/905893) : Use {@link Filters.toUrl) once old download home is removed.
mCurrentUrl = savedInstanceState.getString(BUNDLE_KEY_CURRENT_URL); mCurrentUrl = savedInstanceState == null
} else { ? UrlConstants.DOWNLOADS_URL
mCurrentUrl = Filters.toUrl( : savedInstanceState.getString(BUNDLE_KEY_CURRENT_URL);
showPrefetchContent ? Filters.FilterType.PREFETCHED : Filters.FilterType.NONE);
}
mDownloadCoordinator.updateForUrl(mCurrentUrl); mDownloadCoordinator.updateForUrl(mCurrentUrl);
if (showPrefetchContent) mDownloadCoordinator.showPrefetchSection();
} }
@Override @Override
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment