From 33e5a1ee35964b045d589b00d166c4410426d772 Mon Sep 17 00:00:00 2001 From: Christian Sadilek Date: Thu, 2 Dec 2021 14:04:09 -0500 Subject: [PATCH] [fenix] Refactor: Move historymetadata classes in separate package --- app/src/main/java/org/mozilla/fenix/components/Core.kt | 6 +++--- .../HistoryMetadataMiddleware.kt | 2 +- .../HistoryMetadataService.kt | 2 +- .../home/recentvisits/HistoryMetadataMiddlewareTest.kt | 2 ++ .../fenix/home/recentvisits/HistoryMetadataServiceTest.kt | 2 ++ 5 files changed, 9 insertions(+), 5 deletions(-) rename app/src/main/java/org/mozilla/fenix/{home/recentvisits => historymetadata}/HistoryMetadataMiddleware.kt (99%) rename app/src/main/java/org/mozilla/fenix/{home/recentvisits => historymetadata}/HistoryMetadataService.kt (99%) diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt index e9963fdb1..5e2a7e1c6 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Core.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt @@ -74,9 +74,9 @@ import org.mozilla.fenix.downloads.DownloadService import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.settings import org.mozilla.fenix.gecko.GeckoProvider -import org.mozilla.fenix.home.recentvisits.DefaultHistoryMetadataService -import org.mozilla.fenix.home.recentvisits.HistoryMetadataMiddleware -import org.mozilla.fenix.home.recentvisits.HistoryMetadataService +import org.mozilla.fenix.historymetadata.DefaultHistoryMetadataService +import org.mozilla.fenix.historymetadata.HistoryMetadataMiddleware +import org.mozilla.fenix.historymetadata.HistoryMetadataService import org.mozilla.fenix.media.MediaSessionService import org.mozilla.fenix.perf.StrictModeManager import org.mozilla.fenix.perf.lazyMonitored diff --git a/app/src/main/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataMiddleware.kt b/app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddleware.kt similarity index 99% rename from app/src/main/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataMiddleware.kt rename to app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddleware.kt index 18425a14f..39d0ccdfa 100644 --- a/app/src/main/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataMiddleware.kt +++ b/app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddleware.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.fenix.home.recentvisits +package org.mozilla.fenix.historymetadata import mozilla.components.browser.state.action.BrowserAction import mozilla.components.browser.state.action.ContentAction diff --git a/app/src/main/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataService.kt b/app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataService.kt similarity index 99% rename from app/src/main/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataService.kt rename to app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataService.kt index ca375d11c..5b708a2b0 100644 --- a/app/src/main/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataService.kt +++ b/app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataService.kt @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.fenix.home.recentvisits +package org.mozilla.fenix.historymetadata import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.asCoroutineDispatcher diff --git a/app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataMiddlewareTest.kt index 6c0e9e511..3ae554297 100644 --- a/app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataMiddlewareTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataMiddlewareTest.kt @@ -32,6 +32,8 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.helpers.FenixRobolectricTestRunner +import org.mozilla.fenix.historymetadata.HistoryMetadataMiddleware +import org.mozilla.fenix.historymetadata.HistoryMetadataService @RunWith(FenixRobolectricTestRunner::class) class HistoryMetadataMiddlewareTest { diff --git a/app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataServiceTest.kt b/app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataServiceTest.kt index 9664115e2..12168721d 100644 --- a/app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataServiceTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/recentvisits/HistoryMetadataServiceTest.kt @@ -19,6 +19,8 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Rule import org.junit.Test +import org.mozilla.fenix.historymetadata.DefaultHistoryMetadataService +import org.mozilla.fenix.historymetadata.HistoryMetadataService class HistoryMetadataServiceTest {