diff --git a/app/build.gradle b/app/build.gradle index 286c54f2ef45..130422340621 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,6 +4,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' apply from: '../versioning.gradle' +apply from: "$rootDir/ktlint.gradle" ext { USE_ORCHESTRATOR = project.hasProperty('orchestrator') ? project.property('orchestrator') : false diff --git a/app/src/androidTest/java/com/duckduckgo/app/CoroutineTestRule.kt b/app/src/androidTest/java/com/duckduckgo/app/CoroutineTestRule.kt index 114560979fd0..289b3fb4b58e 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/CoroutineTestRule.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/CoroutineTestRule.kt @@ -50,4 +50,4 @@ class CoroutineTestRule(val testDispatcher: TestCoroutineDispatcher = TestCorout @ExperimentalCoroutinesApi fun CoroutineTestRule.runBlocking(block: suspend () -> Unit) = this.testDispatcher.runBlockingTest { block() -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/FileUtilities.kt b/app/src/androidTest/java/com/duckduckgo/app/FileUtilities.kt index ccc9075a9f9c..67603b44a28c 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/FileUtilities.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/FileUtilities.kt @@ -26,4 +26,4 @@ object FileUtilities { return javaClass.classLoader!!.getResource(resourceName).openStream().bufferedReader() } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/InstantSchedulersRule.kt b/app/src/androidTest/java/com/duckduckgo/app/InstantSchedulersRule.kt index 3f0f823505a3..48ecf9ae51ba 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/InstantSchedulersRule.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/InstantSchedulersRule.kt @@ -16,7 +16,6 @@ package com.duckduckgo.app - import io.reactivex.android.plugins.RxAndroidPlugins import io.reactivex.plugins.RxJavaPlugins import io.reactivex.schedulers.Schedulers @@ -24,7 +23,6 @@ import org.junit.rules.TestRule import org.junit.runner.Description import org.junit.runners.model.Statement - class InstantSchedulersRule : TestRule { override fun apply(base: Statement, description: Description): Statement { @@ -53,4 +51,4 @@ class InstantSchedulersRule : TestRule { } } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/TestApplication.kt b/app/src/androidTest/java/com/duckduckgo/app/TestApplication.kt index aa91269d0420..65e48be2387c 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/TestApplication.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/TestApplication.kt @@ -19,7 +19,6 @@ package com.duckduckgo.app import com.duckduckgo.app.di.DaggerTestAppComponent import com.duckduckgo.app.global.DuckDuckGoApplication - class TestApplication : DuckDuckGoApplication() { /** @@ -34,4 +33,4 @@ class TestApplication : DuckDuckGoApplication() { .build() daggerAppComponent.inject(this) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/TestExtensions.kt b/app/src/androidTest/java/com/duckduckgo/app/TestExtensions.kt index 27de5eee99c1..254a8d117ae6 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/TestExtensions.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/TestExtensions.kt @@ -44,4 +44,4 @@ fun getApp(): TestApplication { fun getDaggerComponent(): TestAppComponent { return getApp().daggerAppComponent as TestAppComponent -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/TestRunner.kt b/app/src/androidTest/java/com/duckduckgo/app/TestRunner.kt index 5227c20367be..839fef7c79c8 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/TestRunner.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/TestRunner.kt @@ -20,10 +20,9 @@ import android.app.Application import android.content.Context import androidx.test.runner.AndroidJUnitRunner - @Suppress("unused") class TestRunner : AndroidJUnitRunner() { override fun newApplication(cl: ClassLoader, className: String, context: Context): Application { return super.newApplication(cl, TestApplication::class.java.name, context) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/autocomplete/api/AutoCompleteApiTest.kt b/app/src/androidTest/java/com/duckduckgo/app/autocomplete/api/AutoCompleteApiTest.kt index ea4a2e784167..175bc344fb32 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/autocomplete/api/AutoCompleteApiTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/autocomplete/api/AutoCompleteApiTest.kt @@ -75,4 +75,4 @@ class AutoCompleteApiTest { assertSame("https://example.com", value.suggestions[0].phrase) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/bookmarks/db/BookmarksDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/bookmarks/db/BookmarksDaoTest.kt index f41102294983..6664d4e6ef2e 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/bookmarks/db/BookmarksDaoTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/bookmarks/db/BookmarksDaoTest.kt @@ -92,4 +92,4 @@ class BookmarksDaoTest { assertFalse(dao.hasBookmarks()) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt index c5c7b7a568c2..8f763cfcda50 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt @@ -101,4 +101,4 @@ class BookmarksViewModelTest { assertNotNull(captor.value) assertNotNull(captor.value.bookmarks) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/brokensite/BrokenSiteDataTest.kt b/app/src/androidTest/java/com/duckduckgo/app/brokensite/BrokenSiteDataTest.kt index 77e7ec14bb36..1ce4528e7de4 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/brokensite/BrokenSiteDataTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/brokensite/BrokenSiteDataTest.kt @@ -116,4 +116,4 @@ class BrokenSiteDataTest { companion object { private const val SITE_URL = "foo.com" } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserChromeClientTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserChromeClientTest.kt index 3d0a4466187c..1a664f1b7cf0 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserChromeClientTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserChromeClientTest.kt @@ -118,4 +118,4 @@ class BrowserChromeClientTest { } private class TestWebView(context: Context) : WebView(context) -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserViewModelTest.kt index f2a7970066b6..5d0a53c52767 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserViewModelTest.kt @@ -166,4 +166,4 @@ class BrowserViewModelTest { companion object { const val TAB_ID = "TAB_ID" } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserWebViewClientTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserWebViewClientTest.kt index 147973db102c..81d528dfa42d 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserWebViewClientTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserWebViewClientTest.kt @@ -131,4 +131,4 @@ class BrowserWebViewClientTest { companion object { const val EXAMPLE_URL = "example.com" } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/DuckDuckGoRequestRewriterTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/DuckDuckGoRequestRewriterTest.kt index d7cea57645f1..87ca20cba6fd 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/DuckDuckGoRequestRewriterTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/DuckDuckGoRequestRewriterTest.kt @@ -79,4 +79,4 @@ class DuckDuckGoRequestRewriterTest { assertFalse(uri.queryParameterNames.contains(ParamKey.ATB)) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/DuckDuckGoUrlDetectorTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/DuckDuckGoUrlDetectorTest.kt index 891444ca8a4e..ee18ce82775f 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/DuckDuckGoUrlDetectorTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/DuckDuckGoUrlDetectorTest.kt @@ -71,4 +71,3 @@ class DuckDuckGoUrlDetectorTest { assertFalse(testee.isDuckDuckGoQueryUrl("https://example.com?q=test%20search")) } } - diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/DuckDuckGoWebViewTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/DuckDuckGoWebViewTest.kt index 7963b15c4032..29d61a62cecb 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/DuckDuckGoWebViewTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/DuckDuckGoWebViewTest.kt @@ -34,4 +34,4 @@ class DuckDuckGoWebViewTest { assertFalse(testee.settings.safeBrowsingEnabled) } } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/EmptyNavigationStateTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/EmptyNavigationStateTest.kt index 1b8a96a00c40..e7cedf6106cc 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/EmptyNavigationStateTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/EmptyNavigationStateTest.kt @@ -53,4 +53,4 @@ class EmptyNavigationStateTest { hasNavigationHistory = true ) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/QueryUrlConverterTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/QueryUrlConverterTest.kt index 9c8e4ef49da4..7f7cc4b1e278 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/QueryUrlConverterTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/QueryUrlConverterTest.kt @@ -82,4 +82,4 @@ class QueryUrlConverterTest { assertNotNull(encodedQuery) assertTrue("Query string doesn't match. Expected `q=$query` somewhere in query ${uri.encodedQuery}", encodedQuery!!.contains("q=$query")) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/SpecialUrlDetectorImplTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/SpecialUrlDetectorImplTest.kt index b447041d10e8..82e60b6c29f5 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/SpecialUrlDetectorImplTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/SpecialUrlDetectorImplTest.kt @@ -195,4 +195,4 @@ class SpecialUrlDetectorImplTest { val charList: List = ('a'..'z') + ('0'..'9') return List(length) { charList.random() }.joinToString("") } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/WebNavigationStateTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/WebNavigationStateComparisonTest.kt similarity index 100% rename from app/src/androidTest/java/com/duckduckgo/app/browser/WebNavigationStateTest.kt rename to app/src/androidTest/java/com/duckduckgo/app/browser/WebNavigationStateComparisonTest.kt diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/WebViewDataManagerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/WebViewDataManagerTest.kt index 167db53cb369..3c4086150e8f 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/WebViewDataManagerTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/WebViewDataManagerTest.kt @@ -121,4 +121,4 @@ class WebViewDataManagerTest { clearedFormData = true } } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/WebViewLongPressHandlerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/WebViewLongPressHandlerTest.kt index f19e50891d85..03dbf8fdfbc1 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/WebViewLongPressHandlerTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/WebViewLongPressHandlerTest.kt @@ -181,4 +181,4 @@ class WebViewLongPressHandlerTest { verify(mockMenu, never()).add(anyInt(), anyInt(), anyInt(), anyInt()) verify(mockMenu, never()).add(anyInt(), anyInt(), anyInt(), anyString()) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/WebViewRequestInterceptorTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/WebViewRequestInterceptorTest.kt index 354b6bb5e04f..462684301712 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/WebViewRequestInterceptorTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/WebViewRequestInterceptorTest.kt @@ -260,7 +260,6 @@ class WebViewRequestInterceptorTest { assertRequestCanContinueToLoad(response) } - @Test fun whenRequestShouldBlockAndNoSurrogateThenCancellingResponseReturned() = runBlocking { whenever(mockResourceSurrogates.get(any())).thenReturn(SurrogateResponse(responseAvailable = false)) diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserObserverTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserObserverTest.kt index 3a3dc820c973..9953c060b9bd 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserObserverTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserObserverTest.kt @@ -85,4 +85,4 @@ class DefaultBrowserObserverTest { verify(mockPixel).fire(Pixel.PixelName.DEFAULT_BROWSER_UNSET) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/downloader/DataUriParserTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/downloader/DataUriParserTest.kt index b3654136cc36..d33ff35f9cc2 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/downloader/DataUriParserTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/downloader/DataUriParserTest.kt @@ -72,4 +72,4 @@ class DataUriParserTest { val filename = testee.generate("data:,AAAA") as ParsedDataUri assertFalse(filename.toString().contains(".")) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/filechooser/FileChooserIntentBuilderTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/filechooser/FileChooserIntentBuilderTest.kt index e1f9dcc3ce17..24d3614c6191 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/filechooser/FileChooserIntentBuilderTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/filechooser/FileChooserIntentBuilderTest.kt @@ -159,4 +159,4 @@ class FileChooserIntentBuilderTest { val actual = flags and expectedFlag return expectedFlag == actual } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/navigation/WebViewBackForwardListSafeExtractorTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/navigation/WebViewBackForwardListSafeExtractorTest.kt index d62fd72f8d9f..df475c14899b 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/navigation/WebViewBackForwardListSafeExtractorTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/navigation/WebViewBackForwardListSafeExtractorTest.kt @@ -49,4 +49,4 @@ class TestWebViewThrowsNullPointerException(context: Context) : WebView(context) override fun copyBackForwardList(): WebBackForwardList { throw NullPointerException("Deliberate") } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/rating/db/AppEnjoymentDatabaseRepositoryTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/rating/db/AppEnjoymentDatabaseRepositoryTest.kt index 7c4b759f7e5f..b5d034621f05 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/rating/db/AppEnjoymentDatabaseRepositoryTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/rating/db/AppEnjoymentDatabaseRepositoryTest.kt @@ -42,7 +42,6 @@ class AppEnjoymentDatabaseRepositoryTest { private lateinit var database: AppDatabase private lateinit var dao: AppEnjoymentDao - @Before fun setup() { database = Room.inMemoryDatabaseBuilder(InstrumentationRegistry.getInstrumentation().targetContext, AppDatabase::class.java) @@ -127,4 +126,4 @@ class AppEnjoymentDatabaseRepositoryTest { private val FIRST_PROMPT = PromptCount(1) private val SECOND_PROMPT = PromptCount(2) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/tabpreview/FileBasedWebViewPreviewPersisterTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/tabpreview/FileBasedWebViewPreviewPersisterTest.kt index e30590c789d0..e34f4e9f1747 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/tabpreview/FileBasedWebViewPreviewPersisterTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/tabpreview/FileBasedWebViewPreviewPersisterTest.kt @@ -108,4 +108,4 @@ class FileBasedWebViewPreviewPersisterTest { private fun verifyTabPreviewDirectoryUse(path: String) { assertTrue(path.contains("/${FileBasedWebViewPreviewPersister.TAB_PREVIEW_DIRECTORY}")) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/useragent/UserAgentProviderTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/useragent/UserAgentProviderTest.kt index d155db481e24..6f5a57be8f7f 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/useragent/UserAgentProviderTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/useragent/UserAgentProviderTest.kt @@ -70,4 +70,4 @@ class UserAgentProviderTest { val actual = testee.getUserAgent(desktopSiteRequested = false) assertTrue(MOBILE_UA_REGEX_MISSING_APPLE_WEBKIT_DETAILS.matches(actual)) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/cta/db/DismissedCtaDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/cta/db/DismissedCtaDaoTest.kt index dc95d7c02270..6e1bee956497 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/cta/db/DismissedCtaDaoTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/cta/db/DismissedCtaDaoTest.kt @@ -53,4 +53,4 @@ class DismissedCtaDaoTest { dao.insert(DismissedCta(CtaId.ADD_WIDGET)) assertTrue(dao.exists(CtaId.ADD_WIDGET)) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaTest.kt b/app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaTest.kt index a85abed73028..9d436795ef63 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaTest.kt @@ -100,7 +100,6 @@ class CtaTest { assertTrue(testee.pixelShownParameters().isEmpty()) } - @Test fun whenCtaIsAddWidgetInstructionsReturnEmptyOkParameters() { val testee = HomePanelCta.AddWidgetInstructions @@ -350,4 +349,4 @@ class CtaTest { whenever(site.calculateGrades()).thenReturn(Site.SiteGrades(grade, improvedGrade)) return site } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelTest.kt index 155d7fd6c4af..2eb7e21ad725 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelTest.kt @@ -379,7 +379,6 @@ class CtaViewModelTest { assertTrue(value is DaxDialogCta.DaxSerpCta) } - @Test fun whenRefreshCtaWhileBrowsingThenReturnNoSerpCta() = coroutineRule.runBlocking { givenDaxOnboardingActive() @@ -431,7 +430,7 @@ class CtaViewModelTest { whenever(mockUserStageStore.getUserAppStage()).thenReturn(AppStage.DAX_ONBOARDING) } - private suspend fun givenDaxOnboardingCompleted() { + private suspend fun givenDaxOnboardingCompleted() { whenever(mockUserStageStore.getUserAppStage()).thenReturn(AppStage.ESTABLISHED) } diff --git a/app/src/androidTest/java/com/duckduckgo/app/di/StubAppConfigurationDownloadModule.kt b/app/src/androidTest/java/com/duckduckgo/app/di/StubAppConfigurationDownloadModule.kt index 71edc09ec795..0676b903d445 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/di/StubAppConfigurationDownloadModule.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/di/StubAppConfigurationDownloadModule.kt @@ -32,4 +32,4 @@ class StubAppConfigurationDownloadModule { } } } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/di/StubDatabaseModule.kt b/app/src/androidTest/java/com/duckduckgo/app/di/StubDatabaseModule.kt index 7ed4f02f9940..41961449731b 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/di/StubDatabaseModule.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/di/StubDatabaseModule.kt @@ -23,7 +23,6 @@ import dagger.Module import dagger.Provides import javax.inject.Singleton - @Module(includes = [DaoModule::class]) class StubDatabaseModule { @@ -34,4 +33,4 @@ class StubDatabaseModule { .allowMainThreadQueries() .build() } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/di/StubJobSchedulerModule.kt b/app/src/androidTest/java/com/duckduckgo/app/di/StubJobSchedulerModule.kt index b3f1b2654367..efeb9623f07e 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/di/StubJobSchedulerModule.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/di/StubJobSchedulerModule.kt @@ -62,4 +62,4 @@ class StubJobSchedulerModule { fun providesWorkScheduler(notificationScheduler: AndroidNotificationScheduler, jobCleaner: JobCleaner): WorkScheduler { return AndroidWorkScheduler(notificationScheduler, jobCleaner) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/di/StubStatisticsModule.kt b/app/src/androidTest/java/com/duckduckgo/app/di/StubStatisticsModule.kt index 7ce8b414125a..a6ae02bff620 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/di/StubStatisticsModule.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/di/StubStatisticsModule.kt @@ -83,4 +83,4 @@ class StubStatisticsModule { ): AtbInitializer { return AtbInitializer(statisticsDataStore, statisticsUpdater, appReferrerStateListener) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/di/TestAppComponent.kt b/app/src/androidTest/java/com/duckduckgo/app/di/TestAppComponent.kt index f9f9d7f57fca..deff144a5527 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/di/TestAppComponent.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/di/TestAppComponent.kt @@ -85,4 +85,4 @@ interface TestAppComponent : AppComponent { @Named("api") fun retrofit(): Retrofit -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt index a05976d3d3c4..60b6a58cc19f 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt @@ -180,4 +180,4 @@ class BrokenSiteViewModelTest { private const val message = "Feedback message" } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/fire/AutomaticDataClearerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/fire/AutomaticDataClearerTest.kt index 9ad981503776..5054d26a75e6 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/fire/AutomaticDataClearerTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/fire/AutomaticDataClearerTest.kt @@ -517,11 +517,10 @@ class AutomaticDataClearerTest { } } - @Test fun whenNotFreshAppLaunchAndIconNotChangedThenShouldClear() = runBlocking { val isFreshAppLaunch = false - + configureAppIconNotChanged() configureAppNotUsedSinceLastClear() configureUserOptions(ClearWhatOption.CLEAR_TABS_AND_DATA, ClearWhenOption.APP_EXIT_OR_5_MINS) diff --git a/app/src/androidTest/java/com/duckduckgo/app/fire/DataClearerTimeKeeperTest.kt b/app/src/androidTest/java/com/duckduckgo/app/fire/DataClearerTimeKeeperTest.kt index 7b7b8302428c..4614f55c333a 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/fire/DataClearerTimeKeeperTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/fire/DataClearerTimeKeeperTest.kt @@ -88,4 +88,4 @@ class DataClearerTimeKeeperTest(private val testCase: TestCase) { val durationBackgrounded: Long, val timeNow: Long ) -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/fire/GetCookieHostsToPreserveTest.kt b/app/src/androidTest/java/com/duckduckgo/app/fire/GetCookieHostsToPreserveTest.kt index 20a65f159e77..a47d32be8634 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/fire/GetCookieHostsToPreserveTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/fire/GetCookieHostsToPreserveTest.kt @@ -77,4 +77,4 @@ class GetCookieHostsToPreserveTest { private fun givenFireproofWebsitesStored(fireproofWebsiteEntity: FireproofWebsiteEntity) { fireproofWebsiteDao.insert(fireproofWebsiteEntity) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/fire/RemoveCookiesTest.kt b/app/src/androidTest/java/com/duckduckgo/app/fire/RemoveCookiesTest.kt index 957489e3e904..1e56c7dd4a62 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/fire/RemoveCookiesTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/fire/RemoveCookiesTest.kt @@ -54,4 +54,4 @@ class RemoveCookiesTest { private suspend fun CookieRemover.fails() { whenever(this.removeCookies()).thenReturn(false) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/fire/SQLCookieRemoverTest.kt b/app/src/androidTest/java/com/duckduckgo/app/fire/SQLCookieRemoverTest.kt index 1bac9bdd9130..a4ce90b608b6 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/fire/SQLCookieRemoverTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/fire/SQLCookieRemoverTest.kt @@ -141,4 +141,4 @@ class SQLCookieRemoverTest { dispatcherProvider ) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/fire/UnsentForgetAllPixelStoreSharedPreferencesTest.kt b/app/src/androidTest/java/com/duckduckgo/app/fire/UnsentForgetAllPixelStoreSharedPreferencesTest.kt index 15cb17a8740b..0684cb5a80c2 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/fire/UnsentForgetAllPixelStoreSharedPreferencesTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/fire/UnsentForgetAllPixelStoreSharedPreferencesTest.kt @@ -76,4 +76,4 @@ class UnsentForgetAllPixelStoreSharedPreferencesTest { testee.resetCount() assertEquals(0, testee.pendingPixelCountClearData) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/fire/WebViewCookieManagerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/fire/WebViewCookieManagerTest.kt index e921854b03b6..772e1b07e495 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/fire/WebViewCookieManagerTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/fire/WebViewCookieManagerTest.kt @@ -118,4 +118,4 @@ class WebViewCookieManagerTest { companion object { private const val DDG_HOST = "duckduckgo.com" } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/fire/WebViewDatabaseLocatorTest.kt b/app/src/androidTest/java/com/duckduckgo/app/fire/WebViewDatabaseLocatorTest.kt index d4940fd4d9a1..0033f77422e9 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/fire/WebViewDatabaseLocatorTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/fire/WebViewDatabaseLocatorTest.kt @@ -33,8 +33,8 @@ class WebViewDatabaseLocatorTest { val databasePath = webViewDatabaseLocator.getDatabasePath() - //If this test fails, it means WebViewDatabase path has changed its location - //If so, add a new database location to knownLocations list + // If this test fails, it means WebViewDatabase path has changed its location + // If so, add a new database location to knownLocations list assertTrue(databasePath.isNotEmpty()) } @@ -63,4 +63,4 @@ class WebViewDatabaseLocatorTest { assertTrue(databasePath.isEmpty()) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/fire/fireproofwebsite/data/FireproofWebsiteEntityKtTest.kt b/app/src/androidTest/java/com/duckduckgo/app/fire/fireproofwebsite/data/FireproofWebsiteEntityKtTest.kt index 2da7ae40e543..d961ca9e6279 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/fire/fireproofwebsite/data/FireproofWebsiteEntityKtTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/fire/fireproofwebsite/data/FireproofWebsiteEntityKtTest.kt @@ -41,4 +41,4 @@ class FireproofWebsiteEntityKtTest { val website = fireproofWebsiteEntity.website() assertEquals("mobile.example.com", website) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/AlertingUncaughtExceptionHandlerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/AlertingUncaughtExceptionHandlerTest.kt index 866dc0b73164..f453054bacbb 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/AlertingUncaughtExceptionHandlerTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/AlertingUncaughtExceptionHandlerTest.kt @@ -90,4 +90,4 @@ class AlertingUncaughtExceptionHandlerTest { verify(mockDefaultExceptionHandler).uncaughtException(any(), eq(exception)) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/HashUtilitiesTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/HashUtilitiesTest.kt index 091c8d5fc3ef..82a0490ac33c 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/HashUtilitiesTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/HashUtilitiesTest.kt @@ -49,4 +49,4 @@ class HashUtilitiesTest { const val helloWorldSha1 = "2ef7bde608ce5404e97d5f042f95f89f1c232871" const val otherSha256 = "f97e9da0e3b879f0a9df979ae260a5f7e1371edb127c1862d4f861981166cdc1" } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/UriExtensionTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/UriExtensionTest.kt index 2bcafbf93c7a..85c1ad447f21 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/UriExtensionTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/UriExtensionTest.kt @@ -20,7 +20,6 @@ import android.net.Uri import org.junit.Assert.* import org.junit.Test - class UriExtensionTest { @Test @@ -195,4 +194,4 @@ class UriExtensionTest { val absoluteString = Uri.parse("https://example.com/test?q=example/#1/anotherrandomcode").absoluteString assertEquals("https://example.com/test", absoluteString) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/UriStringTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/UriStringTest.kt index 59ef21e442ba..d09dcdbaa405 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/UriStringTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/UriStringTest.kt @@ -291,4 +291,4 @@ class UriStringTest { assertFalse(isWebUrl("33")) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/api/ApiRequestInterceptorTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/api/ApiRequestInterceptorTest.kt index b2588d86bc58..44dd11faee75 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/api/ApiRequestInterceptorTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/api/ApiRequestInterceptorTest.kt @@ -65,4 +65,4 @@ class ApiRequestInterceptorTest { private fun response(): Response { return Response.Builder().request(request()).protocol(Protocol.HTTP_2).code(200).message("").build() } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt index d3306f8e2bec..e82bc18113dd 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt @@ -263,4 +263,4 @@ class AppDatabaseTest { private const val FILE_NAME = "com.duckduckgo.app.onboarding.settings" private const val PROPERTY_KEY = "com.duckduckgo.app.onboarding.currentVersion" } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/exception/RootExceptionFinderTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/exception/RootExceptionFinderTest.kt index 1c48499a2982..8aabe50e7813 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/exception/RootExceptionFinderTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/exception/RootExceptionFinderTest.kt @@ -80,4 +80,4 @@ class RootExceptionFinderTest { } return nested } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/exception/UncaughtExceptionDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/exception/UncaughtExceptionDaoTest.kt index 6eeffdb0cd4d..c38e4ddb37e0 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/exception/UncaughtExceptionDaoTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/exception/UncaughtExceptionDaoTest.kt @@ -117,4 +117,4 @@ class UncaughtExceptionDaoTest { private fun anUncaughtExceptionEntity(id: Long? = null) = UncaughtExceptionEntity(id = id ?: 0, exceptionSource = GLOBAL, message = "foo") -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/install/AppInstallSharedPreferencesTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/install/AppInstallSharedPreferencesTest.kt index b02cb10b43ac..66ef9d213c3d 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/install/AppInstallSharedPreferencesTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/install/AppInstallSharedPreferencesTest.kt @@ -53,4 +53,4 @@ class AppInstallSharedPreferencesTest { testee.installTimestamp = timestamp assertEquals(timestamp, testee.installTimestamp) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/install/AppInstallStoreTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/install/AppInstallStoreTest.kt index 771a681106e2..cfc72d8e3f24 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/install/AppInstallStoreTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/install/AppInstallStoreTest.kt @@ -22,7 +22,6 @@ import org.junit.Assert.assertEquals import org.junit.Test import java.util.concurrent.TimeUnit - class AppInstallStoreTest { var testee: AppInstallStore = mock() @@ -46,4 +45,4 @@ class AppInstallStoreTest { whenever(testee.installTimestamp).thenReturn(timeSinceInstallation) assertEquals(7, testee.daysInstalled()) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/model/SiteMonitorTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/model/SiteMonitorTest.kt index 069127dd3e7a..ebe0a6a33859 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/model/SiteMonitorTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/model/SiteMonitorTest.kt @@ -136,4 +136,4 @@ class SiteMonitorTest { testee.surrogateDetected(SurrogateResponse()) assertEquals(1, testee.surrogates.size) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/rating/InitialPromptDeciderTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/rating/InitialPromptDeciderTest.kt index 39bf1803d551..961e0a1bedee 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/rating/InitialPromptDeciderTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/rating/InitialPromptDeciderTest.kt @@ -92,4 +92,4 @@ class InitialPromptDeciderTest { assertFalse(testee.shouldShowPrompt()) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/rating/InitialPromptTypeDeciderTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/rating/InitialPromptTypeDeciderTest.kt index bded3203b9d0..b385c6d1210c 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/rating/InitialPromptTypeDeciderTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/rating/InitialPromptTypeDeciderTest.kt @@ -93,4 +93,4 @@ class InitialPromptTypeDeciderTest { private fun assertSecondPrompt(promptCount: PromptCount) { assertEquals(PromptCount.second().value, promptCount.value) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/rating/SecondaryPromptDeciderTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/rating/SecondaryPromptDeciderTest.kt index af45b053d29d..1fddcd4c967b 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/rating/SecondaryPromptDeciderTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/rating/SecondaryPromptDeciderTest.kt @@ -77,4 +77,4 @@ class SecondaryPromptDeciderTest { private suspend fun configureNotALotOfAppUsage() { whenever(mockAppDaysUsedRepository.getNumberOfDaysAppUsedSinceDate(any())).thenReturn(0) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/uri/UriSubdomainRemoverTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/uri/UriSubdomainRemoverTest.kt index 682ca2cd6dc4..ee01571ff562 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/uri/UriSubdomainRemoverTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/uri/UriSubdomainRemoverTest.kt @@ -86,4 +86,4 @@ class UriSubdomainRemoverTest { val converted = Uri.parse("127.0.0.1").removeSubdomain() assertNull(converted) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/view/ClearPersonalDataActionTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/view/ClearPersonalDataActionTest.kt index 9962ea5b1e76..e9c0c225c432 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/global/view/ClearPersonalDataActionTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/global/view/ClearPersonalDataActionTest.kt @@ -91,4 +91,4 @@ class ClearPersonalDataActionTest { testee.clearTabsAndAllDataAsync(false, false) verify(mockTabRepository).deleteAll() } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/BloomFilterTest.kt b/app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/BloomFilterTest.kt index 71c641c357fd..732837f286ac 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/BloomFilterTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/BloomFilterTest.kt @@ -20,7 +20,6 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test - class BloomFilterTest { private lateinit var testee: BloomFilter @@ -42,4 +41,4 @@ class BloomFilterTest { const val FILTER_ELEMENT_COUNT = 5000 const val TARGET_ERROR_RATE = 0.001 } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/db/HttpsBloomFilterSpecDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/db/HttpsBloomFilterSpecDaoTest.kt index d2f7d84e83a5..b874b4dee47e 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/db/HttpsBloomFilterSpecDaoTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/db/HttpsBloomFilterSpecDaoTest.kt @@ -64,4 +64,4 @@ class HttpsBloomFilterSpecDaoTest { assertEquals("xyz", specification.sha256) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/icon/ui/ChangeIconViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/icon/ui/ChangeIconViewModelTest.kt index 8faa08085a58..be685d003f28 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/icon/ui/ChangeIconViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/icon/ui/ChangeIconViewModelTest.kt @@ -96,4 +96,4 @@ class ChangeIconViewModelTest { verify(mockCommandObserver).onChanged(Mockito.any(ChangeIconViewModel.Command.IconChanged::class.java)) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/integration/AtbIntegrationTest.kt b/app/src/androidTest/java/com/duckduckgo/app/integration/AtbIntegrationTest.kt index e39d50bf4895..9c5f8340225a 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/integration/AtbIntegrationTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/integration/AtbIntegrationTest.kt @@ -124,4 +124,4 @@ class AtbIntegrationTest { assertTrue(day >= 1) assertTrue(day <= 7) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/job/AppConfigurationSyncerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/job/AppConfigurationSyncerTest.kt index f7dc12cb3168..ead6e66f8372 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/job/AppConfigurationSyncerTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/job/AppConfigurationSyncerTest.kt @@ -107,4 +107,4 @@ class AppConfigurationSyncerTest { private fun WorkManager.getSyncWork(): List { return getWorkInfosByTag(APP_CONFIG_SYNC_WORK_TAG).get() } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/job/JobCleanerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/job/JobCleanerTest.kt index 62b81800a00c..06ac4efe2078 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/job/JobCleanerTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/job/JobCleanerTest.kt @@ -117,11 +117,10 @@ class JobCleanerTest { assertTrue(scheduledWorkers.isEmpty()) } - private fun getScheduledWorkers(tag: String): List { return workManager .getWorkInfosByTag(tag) .get() .filter { it.state == WorkInfo.State.ENQUEUED } } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/job/TestWorker.kt b/app/src/androidTest/java/com/duckduckgo/app/job/TestWorker.kt index 6787656cc76a..63257eb0224d 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/job/TestWorker.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/job/TestWorker.kt @@ -24,4 +24,4 @@ class TestWorker(context: Context, parameters: WorkerParameters) : Worker(contex override fun doWork(): Result { return Result.success() } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/job/WorkSchedulerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/job/WorkSchedulerTest.kt index 77ac299c56fe..418ec5424164 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/job/WorkSchedulerTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/job/WorkSchedulerTest.kt @@ -45,4 +45,4 @@ class WorkSchedulerTest { verify(notificationScheduler).scheduleNextNotification() verify(jobCleaner).cleanDeprecatedJobs() } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/launch/LaunchViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/launch/LaunchViewModelTest.kt index 81a364fe748a..c2b711234848 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/launch/LaunchViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/launch/LaunchViewModelTest.kt @@ -22,7 +22,6 @@ import com.duckduckgo.app.CoroutineTestRule import com.duckduckgo.app.launch.LaunchViewModel.Command.Home import com.duckduckgo.app.launch.LaunchViewModel.Command.Onboarding import com.duckduckgo.app.onboarding.store.AppStage -import com.duckduckgo.app.onboarding.store.OnboardingStore import com.duckduckgo.app.onboarding.store.UserStageStore import com.duckduckgo.app.referral.AppInstallationReferrerStateListener import com.duckduckgo.app.referral.ParsedReferrerResult @@ -37,7 +36,6 @@ import org.junit.Rule import org.junit.Test import org.mockito.Mockito.any - @ExperimentalCoroutinesApi class LaunchViewModelTest { @@ -128,4 +126,4 @@ class LaunchViewModelTest { override fun initialiseReferralRetrieval() { } } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/notification/AndroidNotificationSchedulerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/notification/AndroidNotificationSchedulerTest.kt index e3489ee94a66..d69fcab1753e 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/notification/AndroidNotificationSchedulerTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/notification/AndroidNotificationSchedulerTest.kt @@ -21,7 +21,6 @@ package com.duckduckgo.app.notification import android.util.Log import androidx.test.platform.app.InstrumentationRegistry import androidx.work.Configuration -import androidx.work.OneTimeWorkRequestBuilder import androidx.work.WorkInfo import androidx.work.WorkManager import androidx.work.impl.utils.SynchronousExecutor @@ -129,4 +128,4 @@ class AndroidNotificationSchedulerTest { .get() .filter { it.state == WorkInfo.State.ENQUEUED } } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/notification/NotificationHandlerServiceTest.kt b/app/src/androidTest/java/com/duckduckgo/app/notification/NotificationHandlerServiceTest.kt index 0629203a0096..6f1227ef632f 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/notification/NotificationHandlerServiceTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/notification/NotificationHandlerServiceTest.kt @@ -30,7 +30,6 @@ import com.nhaarman.mockitokotlin2.verify import org.junit.Before import org.junit.Test - class NotificationHandlerServiceTest { private var mockPixel: Pixel = mock() @@ -61,4 +60,4 @@ class NotificationHandlerServiceTest { testee.onHandleIntent(intent) verify(mockPixel).fire(eq("mnot_c_abc"), any(), any()) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/notification/NotificationRegistrarTest.kt b/app/src/androidTest/java/com/duckduckgo/app/notification/NotificationRegistrarTest.kt index 0be64e0ec6b6..da431914714d 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/notification/NotificationRegistrarTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/notification/NotificationRegistrarTest.kt @@ -83,4 +83,4 @@ class NotificationRegistrarTest { verify(mockPixel).fire(eq(Pixel.PixelName.NOTIFICATIONS_DISABLED), any(), any()) verify(mockSettingsDataStore).appNotificationsEnabled = false } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/notification/db/NotificationDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/notification/db/NotificationDaoTest.kt index 45457a6a1cd3..bb41a5d4f7b2 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/notification/db/NotificationDaoTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/notification/db/NotificationDaoTest.kt @@ -52,4 +52,4 @@ class NotificationDaoTest { dao.insert(Notification("abc")) assertTrue(dao.exists("abc")) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/notification/model/ClearDataNotificationTest.kt b/app/src/androidTest/java/com/duckduckgo/app/notification/model/ClearDataNotificationTest.kt index cb216fd10053..386a7d43a46f 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/notification/model/ClearDataNotificationTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/notification/model/ClearDataNotificationTest.kt @@ -64,4 +64,4 @@ class ClearDataNotificationTest { whenever(settingsDataStore.automaticallyClearWhatOption).thenReturn(ClearWhatOption.CLEAR_NONE) assertFalse(testee.canShow()) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/onboarding/store/AppUserStageStoreTest.kt b/app/src/androidTest/java/com/duckduckgo/app/onboarding/store/AppUserStageStoreTest.kt index 718172967258..4ddec2a19abb 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/onboarding/store/AppUserStageStoreTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/onboarding/store/AppUserStageStoreTest.kt @@ -72,4 +72,4 @@ class AppUserStageStoreTest { private suspend fun givenCurrentStage(appStage: AppStage) { whenever(userStageDao.currentUserAppStage()).thenReturn(UserStage(appStage = appStage)) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/OnboardingPageManagerPageCountTest.kt b/app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/OnboardingPageManagerPageCountTest.kt index a745c21431f5..3e1db1ed22a3 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/OnboardingPageManagerPageCountTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/OnboardingPageManagerPageCountTest.kt @@ -74,4 +74,4 @@ class OnboardingPageManagerPageCountTest(private val testCase: TestCase) { } data class TestCase(val defaultBrowserPage: Boolean, val expectedPageCount: Int) -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/OnboardingPageManagerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/OnboardingPageManagerTest.kt index 324318248677..6d3aacfc379a 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/OnboardingPageManagerTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/OnboardingPageManagerTest.kt @@ -70,4 +70,4 @@ class OnboardingPageManagerTest { private fun configureDeviceDoesNotSupportDefaultBrowser() { whenever(mockDefaultBrowserDetector.deviceSupportsDefaultBrowserConfiguration()).thenReturn(false) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/OnboardingViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/OnboardingViewModelTest.kt index f8f2062a5e8f..c3c22f8c6528 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/OnboardingViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/OnboardingViewModelTest.kt @@ -26,7 +26,6 @@ import kotlinx.coroutines.test.runBlockingTest import org.junit.Rule import org.junit.Test - @Suppress("EXPERIMENTAL_API_USAGE") class OnboardingViewModelTest { @@ -50,4 +49,4 @@ class OnboardingViewModelTest { testee.onOnboardingDone() verify(userStageStore).stageCompleted(AppStage.NEW) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/page/DefaultBrowserPageViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/page/DefaultBrowserPageViewModelTest.kt index 6374e802ba43..55e837b4c0f4 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/page/DefaultBrowserPageViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/onboarding/ui/page/DefaultBrowserPageViewModelTest.kt @@ -432,4 +432,4 @@ class DefaultBrowserPageViewModelTest { } private fun viewState() = testee.viewState.value!! -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/api/TermsOfServiceListAdapterTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/api/TermsOfServiceListAdapterTest.kt index 4be89b95854f..6a27cc10279e 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/api/TermsOfServiceListAdapterTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/api/TermsOfServiceListAdapterTest.kt @@ -61,4 +61,4 @@ class TermsOfServiceListAdapterTest { val json = loadText("json/tosdr_mismatched.json") jsonAdapter.fromJson(json) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/db/NetworkLeaderboardDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/db/NetworkLeaderboardDaoTest.kt index 7af438a229ce..2b4b52b20175 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/db/NetworkLeaderboardDaoTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/db/NetworkLeaderboardDaoTest.kt @@ -60,7 +60,6 @@ class NetworkLeaderboardDaoTest { assertTrue(data.contains(NetworkLeaderboardEntry("Network1", 1))) } - @Test fun whenNetworksIncrementedMultipleTimesThenReturnedWithCountInDescendingOrder() { dao.incrementNetworkCount("Network1") diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/db/PrivacyProtectionCountDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/db/PrivacyProtectionCountDaoTest.kt index 184c8b78ee47..f52653726918 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/db/PrivacyProtectionCountDaoTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/db/PrivacyProtectionCountDaoTest.kt @@ -21,7 +21,6 @@ import androidx.test.platform.app.InstrumentationRegistry import com.duckduckgo.app.global.db.AppDatabase import com.duckduckgo.app.privacy.model.PrivacyProtectionCountsEntity import org.junit.After -import org.junit.Assert import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/db/UserWhitelistDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/db/UserWhitelistDaoTest.kt index ffb3e1adb819..8facec46494c 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/db/UserWhitelistDaoTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/db/UserWhitelistDaoTest.kt @@ -87,4 +87,4 @@ class UserWhitelistDaoTest { companion object { const val DOMAIN = "www.example.com" } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/EntityTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/EntityTest.kt index d39c93aebaca..7881f6990467 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/EntityTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/EntityTest.kt @@ -32,4 +32,4 @@ class EntityTest { fun whenEntityPrevalenceIs7ThenIsMajorIsFalse() { assertFalse(TdsEntity("", "", 7.0).isMajor) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/PredefinedGradeAvailableTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/PredefinedGradeAvailableTest.kt index 12d2e5a651a9..a289adbc6c30 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/PredefinedGradeAvailableTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/PredefinedGradeAvailableTest.kt @@ -14,7 +14,6 @@ * limitations under the License. */ - package com.duckduckgo.app.privacy.model import com.duckduckgo.app.FileUtilities @@ -27,7 +26,6 @@ import org.junit.runner.RunWith import org.junit.runners.Parameterized import timber.log.Timber - @RunWith(Parameterized::class) class PredefinedGradeAvailableTest(private val testCase: GradeTestCase) { @@ -63,4 +61,4 @@ class PredefinedGradeAvailableTest(private val testCase: GradeTestCase) { .toTypedArray() } } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/PredefinedGradeDataJsonConverter.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/PredefinedGradeDataJsonConverter.kt index 181905a4883c..d15787e1d4b8 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/PredefinedGradeDataJsonConverter.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/PredefinedGradeDataJsonConverter.kt @@ -70,4 +70,4 @@ fun PredefinedGradeDataJsonConverter.JsonGradeTestCase.toGradeTestCase(): Predef private fun entity(name: String?, prevalence: Double?): Entity { if (name == null) return TestEntity("", "", 0.0) return TestEntity(name, name, prevalence ?: 0.0) -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/PredefinedGradeUnavailableTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/PredefinedGradeUnavailableTest.kt index 162da9578fd8..32d03185557b 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/PredefinedGradeUnavailableTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/PredefinedGradeUnavailableTest.kt @@ -14,7 +14,6 @@ * limitations under the License. */ - package com.duckduckgo.app.privacy.model import com.duckduckgo.app.FileUtilities @@ -27,11 +26,9 @@ import org.junit.runner.RunWith import org.junit.runners.Parameterized import timber.log.Timber - @RunWith(Parameterized::class) class PredefinedGradeUnavailableTest(private val testCase: GradeTestCase) { - @Test fun predefinedGradeTests() { @@ -64,4 +61,3 @@ class PredefinedGradeUnavailableTest(private val testCase: GradeTestCase) { } } } - diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/PrivacyPracticesTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/PrivacyPracticesTest.kt index a4815646578f..a49f4c7a4a4b 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/PrivacyPracticesTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/PrivacyPracticesTest.kt @@ -116,4 +116,4 @@ class PrivacyPracticesTest { fun whenInitialisedWithEmptyTermsStoreAndEntityListThenReturnsUnknownForUrl() = runBlocking { assertEquals(PrivacyPractices.UNKNOWN, testee.privacyPracticesFor("http://www.example.com")) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/TermsOfServicePracticesTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/TermsOfServicePracticesTest.kt index 781ef454facf..a5312b79ee59 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/TermsOfServicePracticesTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/TermsOfServicePracticesTest.kt @@ -73,4 +73,4 @@ class TermsOfServicePracticesTest(private val testCase: TermsOfServicePracticesT } -data class TermsOfServicePracticesTestCase(val expectedPractices: PrivacyPractices.Summary, val terms: TermsOfService) \ No newline at end of file +data class TermsOfServicePracticesTestCase(val expectedPractices: PrivacyPractices.Summary, val terms: TermsOfService) diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/TermsOfServiceScoreTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/TermsOfServiceScoreTest.kt index 564828a40b11..df3c5349c4c7 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/TermsOfServiceScoreTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/TermsOfServiceScoreTest.kt @@ -52,4 +52,4 @@ class TermsOfServiceScoreTest(private val testCase: TermsOfServiceScoreTestCase) } -data class TermsOfServiceScoreTestCase(val expectedScore: Int, val terms: TermsOfService) \ No newline at end of file +data class TermsOfServiceScoreTestCase(val expectedScore: Int, val terms: TermsOfService) diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/TestEntity.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/TestEntity.kt index a11235b8009e..689632ad2dca 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/TestEntity.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/TestEntity.kt @@ -23,4 +23,3 @@ data class TestEntity( override val displayName: String, override val prevalence: Double ) : Entity - diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/TrustedSitesTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/TrustedSitesTest.kt index 9b6cc3304c42..d55312958098 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/model/TrustedSitesTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/model/TrustedSitesTest.kt @@ -20,7 +20,6 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test - class TrustedSitesTest { @Test @@ -32,4 +31,4 @@ class TrustedSitesTest { fun whenSiteIsNotInTrustedListThenIsTrustedIsFalse() { assertFalse(TrustedSites.isTrusted("https://www.example.com")) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/HttpsStatusRendererExtensionTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/HttpsStatusRendererExtensionTest.kt index 5a3a2ad6784e..da42e1b3a1a1 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/HttpsStatusRendererExtensionTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/HttpsStatusRendererExtensionTest.kt @@ -71,4 +71,4 @@ class HttpsStatusRendererExtensionTest { fun whenHttpsStatusIsNoneThenSuccessFailureIconIsFailure() { assertEquals(R.drawable.icon_fail, HttpsStatus.NONE.successFailureIcon()) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/PrivacyGradeRendererExtensionTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/PrivacyGradeRendererExtensionTest.kt index 48a95078298d..927f98aa6009 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/PrivacyGradeRendererExtensionTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/PrivacyGradeRendererExtensionTest.kt @@ -21,7 +21,6 @@ import com.duckduckgo.app.privacy.model.PrivacyGrade import org.junit.Assert.assertEquals import org.junit.Test - class PrivacyGradeRendererExtensionTest { @Test @@ -123,4 +122,4 @@ class PrivacyGradeRendererExtensionTest { fun whenGradeIsUnknownAndPrivacyOffThenBannerIsUnknown() { assertEquals(R.drawable.privacygrade_banner_unknown, PrivacyGrade.UNKNOWN.banner(false)) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/PrivacyPracticesSummaryTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/PrivacyPracticesSummaryTest.kt index 08fba8190c3a..cd14aa960b6c 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/PrivacyPracticesSummaryTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/PrivacyPracticesSummaryTest.kt @@ -121,4 +121,4 @@ class PrivacyPracticesSummaryTest { val testee = UNKNOWN assertEquals(context.getString(R.string.practicesUnknown), testee.text(context)) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/PrivacyUpgradeRendererTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/PrivacyUpgradeRendererTest.kt index 5c24beb9f05c..1a9048c2b9a8 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/PrivacyUpgradeRendererTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/PrivacyUpgradeRendererTest.kt @@ -45,4 +45,4 @@ class PrivacyUpgradeRendererTest { val result = testee.heading(context, PrivacyGrade.C, PrivacyGrade.C, false) assertEquals(context.getString(R.string.privacyProtectionDisabled), result) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/TrackersRendererTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/TrackersRendererTest.kt index f8cdd3ac18b9..8b6bb13ab796 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/TrackersRendererTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/renderer/TrackersRendererTest.kt @@ -151,4 +151,4 @@ class TrackersRendererTest { fun whenCountIsNotZeroThenIconIsFailure() { assertEquals(R.drawable.icon_fail, testee.successFailureIcon(1)) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/PrivacyDashboardViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/PrivacyDashboardViewModelTest.kt index 309010324c53..83a2d01ba6b4 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/PrivacyDashboardViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/PrivacyDashboardViewModelTest.kt @@ -260,4 +260,4 @@ class PrivacyDashboardViewModelTest { whenever(site.calculateGrades()).thenReturn(Site.SiteGrades(grade, improvedGrade)) return site } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/PrivacyPracticesViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/PrivacyPracticesViewModelTest.kt index 97d8bef0c7be..2ac0cd61bd0e 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/PrivacyPracticesViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/PrivacyPracticesViewModelTest.kt @@ -30,7 +30,6 @@ import org.junit.Assert.assertEquals import org.junit.Rule import org.junit.Test - class PrivacyPracticesViewModelTest { @get:Rule @@ -84,4 +83,4 @@ class PrivacyPracticesViewModelTest { return site } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/ScorecardViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/ScorecardViewModelTest.kt index cb360b068284..00553abed8ec 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/ScorecardViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/ScorecardViewModelTest.kt @@ -182,4 +182,4 @@ class ScorecardViewModelTest { whenever(site.calculateGrades()).thenReturn(Site.SiteGrades(grade, improvedGrade)) return site } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/TrackerNetworksAdapterTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/TrackerNetworksAdapterTest.kt index f2eb69286fa0..23ce109966b1 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/TrackerNetworksAdapterTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/TrackerNetworksAdapterTest.kt @@ -58,4 +58,4 @@ class TrackerNetworksAdapterTest { TestEntity("B", "B", 0.0) to majorNetworkList ).toSortedMap(compareBy { it.displayName }) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/TrackerNetworksViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/TrackerNetworksViewModelTest.kt index acd0cd116cc1..1ecf4696518e 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/TrackerNetworksViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/TrackerNetworksViewModelTest.kt @@ -116,7 +116,6 @@ class TrackerNetworksViewModelTest { return site } - object Entity { val MINOR_ENTITY_A = TestEntity("Minor A", "Minor A", 0.0) val MINOR_ENTITY_B = TestEntity("Minor B", "Minor B", 0.0) @@ -131,4 +130,4 @@ class TrackerNetworksViewModelTest { fun tracker(number: Int): String = String.format(TRACKER, number) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/WhitelistViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/WhitelistViewModelTest.kt index e4e702f9a44b..3324824262f9 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/WhitelistViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/privacy/ui/WhitelistViewModelTest.kt @@ -151,4 +151,4 @@ class WhitelistViewModelTest { private const val NEW_DOMAIN = "new.example.com" private const val INVALID_DOMAIN = "_" } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/referral/QueryParamReferrerParserTest.kt b/app/src/androidTest/java/com/duckduckgo/app/referral/QueryParamReferrerParserTest.kt index 296e5243eeb6..9a083cd7e2f3 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/referral/QueryParamReferrerParserTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/referral/QueryParamReferrerParserTest.kt @@ -116,4 +116,4 @@ class QueryParamReferrerParserTest { private const val INSTALLATION_SOURCE_EU_AUCTION_VALUE = "eea-search-choice" } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/settings/SettingsViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/settings/SettingsViewModelTest.kt index 18aa1e551f8b..a72caadbf80d 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/settings/SettingsViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/settings/SettingsViewModelTest.kt @@ -25,7 +25,6 @@ import com.duckduckgo.app.browser.BuildConfig import com.duckduckgo.app.browser.defaultbrowsing.DefaultBrowserDetector import com.duckduckgo.app.global.DuckDuckGoTheme import com.duckduckgo.app.icon.api.AppIcon -import com.duckduckgo.app.notification.AndroidNotificationScheduler import com.duckduckgo.app.settings.SettingsViewModel.Command import com.duckduckgo.app.settings.clear.ClearWhatOption.CLEAR_NONE import com.duckduckgo.app.settings.clear.ClearWhenOption.APP_EXIT_ONLY @@ -235,4 +234,4 @@ class SettingsViewModelTest { } private fun latestViewState() = testee.viewState.value!! -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/statistics/ApiBasedPixelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/statistics/ApiBasedPixelTest.kt index c9119676618e..2a126865d002 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/statistics/ApiBasedPixelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/statistics/ApiBasedPixelTest.kt @@ -119,7 +119,6 @@ class ApiBasedPixelTest { whenever(mockDeviceInfo.formFactor()).thenReturn(DeviceInfo.FormFactor.PHONE) whenever(mockDeviceInfo.appVersion).thenReturn("1.0.0") - val pixel = ApiBasedPixel(mockPixelService, mockStatisticsDataStore, mockVariantManager, mockDeviceInfo) pixel.fire(PRIVACY_DASHBOARD_OPENED) val expectedParams = mapOf("appVersion" to "1.0.0") @@ -129,4 +128,4 @@ class ApiBasedPixelTest { private fun configurePixelFireIsSuccessful() { whenever(mockPixelService.fire(any(), any(), any(), anyOrNull(), any(), any())).thenReturn(Completable.complete()) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/statistics/AtbInitializerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/statistics/AtbInitializerTest.kt index 486b93409346..9f4155bb565c 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/statistics/AtbInitializerTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/statistics/AtbInitializerTest.kt @@ -90,4 +90,4 @@ class AtbInitializerTest { delay(delayMs) return Answer { ParsedReferrerResult.CampaignReferrerFound("") } } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/statistics/ExperimentationVariantManagerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/statistics/ExperimentationVariantManagerTest.kt index db7342dfb496..62c6437648ae 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/statistics/ExperimentationVariantManagerTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/statistics/ExperimentationVariantManagerTest.kt @@ -18,7 +18,6 @@ package com.duckduckgo.app.statistics -import com.duckduckgo.app.statistics.VariantManager.Companion.RESERVED_EU_AUCTION_VARIANT import com.duckduckgo.app.statistics.store.StatisticsDataStore import com.nhaarman.mockitokotlin2.* import org.junit.Assert.* @@ -178,4 +177,4 @@ class ExperimentationVariantManagerTest { whenever(mockStore.referrerVariant).thenReturn(key) whenever(mockStore.variant).thenReturn(key) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/statistics/api/OfflinePixelSenderTest.kt b/app/src/androidTest/java/com/duckduckgo/app/statistics/api/OfflinePixelSenderTest.kt index 5fce05ede3d1..8ee6f0326f6f 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/statistics/api/OfflinePixelSenderTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/statistics/api/OfflinePixelSenderTest.kt @@ -72,4 +72,4 @@ class OfflinePixelSenderTest { verify(mockPixel).fireCompletable(Pixel.PixelName.APPLICATION_CRASH_GLOBAL.pixelName, params) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/statistics/api/StatisticsRequesterJsonTest.kt b/app/src/androidTest/java/com/duckduckgo/app/statistics/api/StatisticsRequesterJsonTest.kt index fdedfa03b127..2dad43fb2506 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/statistics/api/StatisticsRequesterJsonTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/statistics/api/StatisticsRequesterJsonTest.kt @@ -47,7 +47,6 @@ import java.net.InetSocketAddress import java.net.Proxy import java.util.concurrent.TimeUnit - class StatisticsRequesterJsonTest { private var mockVariantManager: VariantManager = mock() diff --git a/app/src/androidTest/java/com/duckduckgo/app/statistics/api/StatisticsRequesterTest.kt b/app/src/androidTest/java/com/duckduckgo/app/statistics/api/StatisticsRequesterTest.kt index e0d6bd1154c7..112a1c54e933 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/statistics/api/StatisticsRequesterTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/statistics/api/StatisticsRequesterTest.kt @@ -28,7 +28,6 @@ import org.junit.Before import org.junit.Rule import org.junit.Test - class StatisticsRequesterTest { private var mockStatisticsStore: StatisticsDataStore = mock() @@ -154,4 +153,4 @@ class StatisticsRequesterTest { private const val ATB_WITH_VARIANT = "v105-2ma" private const val NEW_ATB = "v105-4" } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/statistics/model/AtbJsonTest.kt b/app/src/androidTest/java/com/duckduckgo/app/statistics/model/AtbJsonTest.kt index 80c24dddf8ec..3e312b4779db 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/statistics/model/AtbJsonTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/statistics/model/AtbJsonTest.kt @@ -40,4 +40,4 @@ class AtbJsonTest { fun whenFormatIsInvalidThenExceptionIsThrown() { assertNull(jsonAdapter.fromJson("invalid")) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/statistics/pixels/PixelNameTest.kt b/app/src/androidTest/java/com/duckduckgo/app/statistics/pixels/PixelNameTest.kt index 6723fab3476b..d46f98389eda 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/statistics/pixels/PixelNameTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/statistics/pixels/PixelNameTest.kt @@ -31,4 +31,4 @@ class PixelNameTest { } } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/statistics/store/OfflinePixelSharedPreferencesTest.kt b/app/src/androidTest/java/com/duckduckgo/app/statistics/store/OfflinePixelSharedPreferencesTest.kt index 39ac054cc8be..d0437072ad47 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/statistics/store/OfflinePixelSharedPreferencesTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/statistics/store/OfflinePixelSharedPreferencesTest.kt @@ -67,4 +67,4 @@ class OfflinePixelSharedPreferencesTest { testee.webRendererGoneKilledCount = 2 assertEquals(2, testee.webRendererGoneKilledCount) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/surrogates/ResourceSurrogateLoaderTest.kt b/app/src/androidTest/java/com/duckduckgo/app/surrogates/ResourceSurrogateLoaderTest.kt index ab729c748cb7..e7b3bbf3591a 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/surrogates/ResourceSurrogateLoaderTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/surrogates/ResourceSurrogateLoaderTest.kt @@ -113,4 +113,4 @@ class ResourceSurrogateLoaderTest { return javaClass.classLoader!!.getResource("binary/surrogates/$filename").readBytes() } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/surrogates/ResourceSurrogatesTest.kt b/app/src/androidTest/java/com/duckduckgo/app/surrogates/ResourceSurrogatesTest.kt index cc415121ca96..7c385705adbb 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/surrogates/ResourceSurrogatesTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/surrogates/ResourceSurrogatesTest.kt @@ -57,7 +57,6 @@ class ResourceSurrogatesTest { assertTrue(retrieved.responseAvailable) } - @Test fun whenSearchingForSubstringMatchingExistingSurrogateThenCanFindByName() { val surrogate = SurrogateResponse(name = "foo.com") @@ -73,4 +72,4 @@ class ResourceSurrogatesTest { val retrieved = testee.get(Uri.parse("bar")) assertFalse(retrieved.responseAvailable) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/survey/api/SurveyDownloaderTest.kt b/app/src/androidTest/java/com/duckduckgo/app/survey/api/SurveyDownloaderTest.kt index f947cefae092..74c4bc11faee 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/survey/api/SurveyDownloaderTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/survey/api/SurveyDownloaderTest.kt @@ -100,4 +100,4 @@ class SurveyDownloaderTest { companion object { const val SURVEY_URL = "https://survey.com" } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/survey/db/SurveyDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/survey/db/SurveyDaoTest.kt index 16667cb0e044..ff51fae335e7 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/survey/db/SurveyDaoTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/survey/db/SurveyDaoTest.kt @@ -100,4 +100,4 @@ class SurveyDaoTest { assertFalse(dao.exists("2")) assertTrue(dao.getScheduled().isEmpty()) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/survey/ui/SurveyViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/survey/ui/SurveyViewModelTest.kt index 1c0c410f3636..9a28784c6679 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/survey/ui/SurveyViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/survey/ui/SurveyViewModelTest.kt @@ -129,4 +129,4 @@ class SurveyViewModelTest { verify(mockSurveyDao, never()).update(any()) verify(mockCommandObserver).onChanged(Command.Close) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/systemsearch/DeviceAppLookupTest.kt b/app/src/androidTest/java/com/duckduckgo/app/systemsearch/DeviceAppLookupTest.kt index 771ed3ba2ef8..907af457caaf 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/systemsearch/DeviceAppLookupTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/systemsearch/DeviceAppLookupTest.kt @@ -128,4 +128,4 @@ class DeviceAppLookupTest { DeviceApp(APP_WITH_RESERVED_CHARS, "", Intent()) ) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt index 03e36b570e2c..9cf35607a05b 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/systemsearch/SystemSearchViewModelTest.kt @@ -106,7 +106,7 @@ class SystemSearchViewModelTest { testee.resetViewState() testee.userUpdatedQuery("test") - //no crash + // no crash } @Test @@ -286,4 +286,4 @@ class SystemSearchViewModelTest { val appQueryResult = listOf(deviceApp) val appBlankResult = emptyList() } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/tabs/IntentTabExtensionTest.kt b/app/src/androidTest/java/com/duckduckgo/app/tabs/IntentTabExtensionTest.kt index 1f01515ea218..ff2393e11f13 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/tabs/IntentTabExtensionTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/tabs/IntentTabExtensionTest.kt @@ -40,4 +40,4 @@ class IntentTabExtensionTest { const val TAB_ID = "abcd" } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/tabs/db/TabsDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/tabs/db/TabsDaoTest.kt index 44564eceba9f..26b056ea0e08 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/tabs/db/TabsDaoTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/tabs/db/TabsDaoTest.kt @@ -229,4 +229,4 @@ class TabsDaoTest { } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/tabs/model/TabDataRepositoryTest.kt b/app/src/androidTest/java/com/duckduckgo/app/tabs/model/TabDataRepositoryTest.kt index 28fa5720df03..7eb604824a7c 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/tabs/model/TabDataRepositoryTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/tabs/model/TabDataRepositoryTest.kt @@ -232,4 +232,4 @@ class TabDataRepositoryTest { companion object { const val TAB_ID = "abcd" } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/tabs/ui/TabRendererExtensionKtTest.kt b/app/src/androidTest/java/com/duckduckgo/app/tabs/ui/TabRendererExtensionTest.kt similarity index 99% rename from app/src/androidTest/java/com/duckduckgo/app/tabs/ui/TabRendererExtensionKtTest.kt rename to app/src/androidTest/java/com/duckduckgo/app/tabs/ui/TabRendererExtensionTest.kt index 2e02840ddfa4..8ce98bebc6c8 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/tabs/ui/TabRendererExtensionKtTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/tabs/ui/TabRendererExtensionTest.kt @@ -81,4 +81,4 @@ class TabRendererExtensionTest { private const val INVALID_URL = "notaurl" } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModelTest.kt index 5d31feeedbba..5a6e312c3d51 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModelTest.kt @@ -100,4 +100,4 @@ class TabSwitcherViewModelTest { assertEquals(Command.Close, commandCaptor.allValues[1]) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/DocumentDomainClientTest.kt b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/DocumentDomainClientTest.kt index 30795a3dbf1c..c6de056772d6 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/DocumentDomainClientTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/DocumentDomainClientTest.kt @@ -53,4 +53,4 @@ class DocumentDomainClientTest { companion object { private val CLIENT_NAME = TEMPORARY_WHITELIST } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/EntityLookupTest.kt b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/EntityLookupTest.kt index 33f50bb70333..fdf47648594f 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/EntityLookupTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/EntityLookupTest.kt @@ -113,4 +113,4 @@ class EntityLookupTest { private fun anEntityName() = "Entity Name" private fun anEntityDomain() = TdsDomainEntity("", anEntityName()) private fun anEntity() = TdsEntity(anEntityName(), "", 0.0) -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TdsClientTest.kt b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TdsClientTest.kt index 7eb3afb5c9dd..d506666f3032 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TdsClientTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TdsClientTest.kt @@ -186,4 +186,4 @@ class TdsClientTest { private const val DOCUMENT_URL = "http://example.com/index.htm" private val CATEGORY: List = emptyList() } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TdsTest.kt b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TdsTest.kt index 758c8bc0e536..f6e866efe14f 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TdsTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TdsTest.kt @@ -40,4 +40,4 @@ class TdsTest { companion object { private const val DEFAULT_TDS_HASH_VALUE = -1752095080 } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TrackerDetectorClientTypeTest.kt b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TrackerDetectorClientTypeTest.kt index 7740917b5339..596d5724f5f2 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TrackerDetectorClientTypeTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TrackerDetectorClientTypeTest.kt @@ -90,4 +90,4 @@ class TrackerDetectorClientTypeTest { const val BLOCKED_AND_WHITELISTED = "blockedAndWhitelisted.com" const val UNLISTED = "unlisted.com" } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TrackerDetectorTest.kt b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TrackerDetectorTest.kt index 2a2bbe1a1215..c64e1067105f 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TrackerDetectorTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/TrackerDetectorTest.kt @@ -151,4 +151,4 @@ class TrackerDetectorTest { private val CLIENT_A = EASYLIST private val CLIENT_B = EASYPRIVACY } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/api/TdsDomainEntityJsonTest.kt b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/api/TdsDomainEntityJsonTest.kt index fa04d4323647..7f424ed6e21b 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/api/TdsDomainEntityJsonTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/api/TdsDomainEntityJsonTest.kt @@ -52,4 +52,4 @@ class TdsDomainEntityJsonTest { assertEquals(2, domains.count()) assertNull(domains.firstOrNull { it.domain == "33across.com" }) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/api/TdsEntityJsonTest.kt b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/api/TdsEntityJsonTest.kt index 4b7cec1bd649..797c65f35075 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/api/TdsEntityJsonTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/api/TdsEntityJsonTest.kt @@ -59,4 +59,4 @@ class TdsEntityJsonTest { val entity = entities[2] assertEquals("4Cite Marketing", entity.displayName) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/api/TdsTrackerJsonTest.kt b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/api/TdsTrackerJsonTest.kt index fab6ae3ade09..feb51553d5f3 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/api/TdsTrackerJsonTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/api/TdsTrackerJsonTest.kt @@ -62,4 +62,4 @@ class TdsTrackerJsonTest { assertEquals(2, trackers.count()) assertFalse(trackers.containsKey("1dmp.io")) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/db/TdsEntityDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/db/TdsEntityDaoTest.kt index ad56df62031f..e93871e9c524 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/db/TdsEntityDaoTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/db/TdsEntityDaoTest.kt @@ -117,4 +117,4 @@ class TdsEntityDaoTest { assertEquals(0, entityDao.count()) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/db/TdsMetadataDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/db/TdsMetadataDaoTest.kt index 35c06301894d..632bdb98c37e 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/db/TdsMetadataDaoTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/trackerdetection/db/TdsMetadataDaoTest.kt @@ -68,4 +68,4 @@ class TdsMetadataDaoTest { val etag = tdsMetadataDao.eTag() assertEquals("newEtag", etag) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/usage/search/SearchCountDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/usage/search/SearchCountDaoTest.kt index d4bd2a901a82..601179ca6ed9 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/usage/search/SearchCountDaoTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/usage/search/SearchCountDaoTest.kt @@ -71,4 +71,4 @@ class SearchCountDaoTest { dao.initialiseValue(SearchCountEntity(count = 5)) assertEquals(5, dao.getSearchesMade()) } -} \ No newline at end of file +} diff --git a/app/src/androidTest/java/com/duckduckgo/app/widget/ui/AddWidgetInstructionsViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/widget/ui/AddWidgetInstructionsViewModelTest.kt index a3523e639845..dbc1145c6a6a 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/widget/ui/AddWidgetInstructionsViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/widget/ui/AddWidgetInstructionsViewModelTest.kt @@ -77,4 +77,4 @@ class AddWidgetInstructionsViewModelTest { verify(mockCommandObserver).onChanged(commandCaptor.capture()) assertEquals(Close, commandCaptor.lastValue) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/SelectedTextSearchActivity.kt b/app/src/main/java/com/duckduckgo/app/SelectedTextSearchActivity.kt index a3e719baa9c7..c4db868ba4bb 100644 --- a/app/src/main/java/com/duckduckgo/app/SelectedTextSearchActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/SelectedTextSearchActivity.kt @@ -54,4 +54,4 @@ class SelectedTextSearchActivity : AppCompatActivity() { return null } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/autocomplete/api/AutoComplete.kt b/app/src/main/java/com/duckduckgo/app/autocomplete/api/AutoComplete.kt index 1103bd8e8854..b49ae0dd7f53 100644 --- a/app/src/main/java/com/duckduckgo/app/autocomplete/api/AutoComplete.kt +++ b/app/src/main/java/com/duckduckgo/app/autocomplete/api/AutoComplete.kt @@ -83,4 +83,4 @@ class AutoCompleteApi @Inject constructor( .toList() .onErrorReturn { emptyList() } .toObservable() -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/autocomplete/api/AutoCompleteService.kt b/app/src/main/java/com/duckduckgo/app/autocomplete/api/AutoCompleteService.kt index 698f610209f0..cfd63e26356a 100644 --- a/app/src/main/java/com/duckduckgo/app/autocomplete/api/AutoCompleteService.kt +++ b/app/src/main/java/com/duckduckgo/app/autocomplete/api/AutoCompleteService.kt @@ -21,11 +21,10 @@ import io.reactivex.Observable import retrofit2.http.GET import retrofit2.http.Query - interface AutoCompleteService { @GET("${AppUrl.Url.API}/ac/") fun autoComplete(@Query("q") query: String): Observable> } -data class AutoCompleteServiceRawResult(val phrase: String) \ No newline at end of file +data class AutoCompleteServiceRawResult(val phrase: String) diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/db/BookmarksDao.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/db/BookmarksDao.kt index ec3106c2ed74..18abee46b394 100644 --- a/app/src/main/java/com/duckduckgo/app/bookmarks/db/BookmarksDao.kt +++ b/app/src/main/java/com/duckduckgo/app/bookmarks/db/BookmarksDao.kt @@ -40,4 +40,4 @@ interface BookmarksDao { @Query("select CAST(COUNT(*) AS BIT) from bookmarks") suspend fun hasBookmarks(): Boolean -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt index 3fc90ca086f2..5a904f1981f2 100644 --- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt @@ -246,4 +246,4 @@ class BookmarksActivity : DuckDuckGoActivity() { viewModel.onDeleteRequested(bookmark) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksEntityQueryListener.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksEntityQueryListener.kt index a7736f28f5b9..578eaf44e3b8 100644 --- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksEntityQueryListener.kt +++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksEntityQueryListener.kt @@ -20,8 +20,8 @@ import androidx.appcompat.widget.SearchView import com.duckduckgo.app.bookmarks.db.BookmarkEntity class BookmarksEntityQueryListener( - val bookmarks: List?, - val adapter: BookmarksActivity.BookmarksAdapter + val bookmarks: List?, + val adapter: BookmarksActivity.BookmarksAdapter ) : SearchView.OnQueryTextListener { override fun onQueryTextChange(newText: String): Boolean { @@ -43,4 +43,4 @@ class BookmarksEntityQueryListener( lowercaseTitle?.contains(lowercaseQuery) == true || it.url.contains(lowercaseQuery) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt index 89232b820b49..3dbee6a65f98 100644 --- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt @@ -71,9 +71,9 @@ class BookmarksViewModel(val dao: BookmarksDao) : EditBookmarkListener, ViewMode private fun onBookmarksChanged(bookmarks: List) { viewState.value = viewState.value?.copy( - showBookmarks = bookmarks.isNotEmpty(), - bookmarks = bookmarks, - enableSearch = bookmarks.size > MIN_BOOKMARKS_FOR_SEARCH + showBookmarks = bookmarks.isNotEmpty(), + bookmarks = bookmarks, + enableSearch = bookmarks.size > MIN_BOOKMARKS_FOR_SEARCH ) } @@ -95,4 +95,4 @@ class BookmarksViewModel(val dao: BookmarksDao) : EditBookmarkListener, ViewMode } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt index 40885845937a..d1c5aece3ee8 100644 --- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/EditBookmarkDialogFragment.kt @@ -28,7 +28,6 @@ import com.duckduckgo.app.global.view.hideKeyboard import com.duckduckgo.app.global.view.showKeyboard import org.jetbrains.anko.find - class EditBookmarkDialogFragment : DialogFragment() { interface EditBookmarkListener { @@ -113,4 +112,4 @@ class EditBookmarkDialogFragment : DialogFragment() { } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteData.kt b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteData.kt index d94af5b02c58..85b1420f0ec4 100644 --- a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteData.kt +++ b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteData.kt @@ -37,4 +37,4 @@ data class BrokenSiteData( return BrokenSiteData(url, blockedTrackers, surrogates, upgradedHttps) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt index bcc63811f367..891732a0ee44 100644 --- a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt @@ -117,4 +117,4 @@ class BrokenSiteViewModel(private val pixel: Pixel, private val brokenSiteSender const val MOBILE_SITE = "mobile" const val DESKTOP_SITE = "desktop" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt index dbcd27618987..daefa69df81b 100644 --- a/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt +++ b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt @@ -85,4 +85,4 @@ class BrokenSiteSubmitter( private const val WEBVIEW_VERSION_KEY = "wvVersion" private const val SITE_TYPE_KEY = "siteType" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/model/BrokenSite.kt b/app/src/main/java/com/duckduckgo/app/brokensite/model/BrokenSite.kt index cc49625d0f19..605181f726a2 100644 --- a/app/src/main/java/com/duckduckgo/app/brokensite/model/BrokenSite.kt +++ b/app/src/main/java/com/duckduckgo/app/brokensite/model/BrokenSite.kt @@ -51,4 +51,4 @@ sealed class BrokenSiteCategory(@StringRes val category: Int, val key: String) { const val UNSUPPORTED_CATEGORY_KEY = "unsupported" const val OTHER_CATEGORY_KEY = "other" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt index 0f9d3c7601c0..4850b08715cd 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt @@ -397,4 +397,4 @@ class BrowserActivity : DuckDuckGoActivity(), CoroutineScope by MainScope() { private data class CombinedInstanceState(val originalInstanceState: Bundle?, val newInstanceState: Bundle?) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserChromeClient.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserChromeClient.kt index fbd118810480..468e533aaacb 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserChromeClient.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserChromeClient.kt @@ -120,4 +120,4 @@ class BrowserChromeClient @Inject constructor(private val uncaughtExceptionRepos override fun onCloseWindow(window: WebView?) { webViewClientListener?.closeCurrentTab() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserPopupMenu.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserPopupMenu.kt index 5be14ac4ad16..fdc6992303ee 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserPopupMenu.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserPopupMenu.kt @@ -78,4 +78,3 @@ class BrowserPopupMenu(layoutInflater: LayoutInflater, variant: Variant, view: V } } } - diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt index 93d9825a2561..938d0dac4598 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt @@ -46,9 +46,9 @@ import androidx.constraintlayout.widget.ConstraintSet import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.content.ContextCompat import androidx.core.content.pm.ShortcutManagerCompat -import androidx.core.view.* import androidx.core.text.HtmlCompat import androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY +import androidx.core.view.* import androidx.fragment.app.Fragment import androidx.fragment.app.transaction import androidx.lifecycle.Lifecycle @@ -119,13 +119,13 @@ import kotlinx.android.synthetic.main.popup_window_browser_menu.view.addToHome import kotlinx.android.synthetic.main.popup_window_browser_menu.view.backPopupMenuItem import kotlinx.android.synthetic.main.popup_window_browser_menu.view.brokenSitePopupMenuItem import kotlinx.android.synthetic.main.popup_window_browser_menu.view.findInPageMenuItem +import kotlinx.android.synthetic.main.popup_window_browser_menu.view.fireproofWebsitePopupMenuItem import kotlinx.android.synthetic.main.popup_window_browser_menu.view.forwardPopupMenuItem import kotlinx.android.synthetic.main.popup_window_browser_menu.view.newTabPopupMenuItem import kotlinx.android.synthetic.main.popup_window_browser_menu.view.refreshPopupMenuItem import kotlinx.android.synthetic.main.popup_window_browser_menu.view.requestDesktopSiteCheckMenuItem import kotlinx.android.synthetic.main.popup_window_browser_menu.view.settingsPopupMenuItem import kotlinx.android.synthetic.main.popup_window_browser_menu.view.whitelistPopupMenuItem -import kotlinx.android.synthetic.main.popup_window_browser_menu.view.fireproofWebsitePopupMenuItem import kotlinx.coroutines.* import org.jetbrains.anko.longToast import org.jetbrains.anko.share @@ -588,7 +588,7 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope, DaxDialogLi } private fun showErrorSnackbar(command: Command.ShowErrorWithAction) { - //Snackbar is global and it should appear only the foreground fragment + // Snackbar is global and it should appear only the foreground fragment if (!errorSnackbar.view.isAttachedToWindow && isVisible) { errorSnackbar.setAction(R.string.crashedWebViewErrorAction) { command.action() }.show() } @@ -1454,7 +1454,7 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope, DaxDialogLi } private fun removeUnnecessaryLayoutBehaviour() { - val params: CoordinatorLayout.LayoutParams = bottomNavigationBar.getLayoutParams() as CoordinatorLayout.LayoutParams + val params: CoordinatorLayout.LayoutParams = bottomNavigationBar.layoutParams as CoordinatorLayout.LayoutParams params.behavior = null } @@ -1873,4 +1873,4 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope, DaxDialogLi private fun shouldUpdateOmnibarTextInput(viewState: OmnibarViewState, omnibarInput: String?) = (!viewState.isEditing || omnibarInput.isNullOrEmpty()) && omnibarTextInput.isDifferent(omnibarInput) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt index 77d961f0768a..b56c2c7cc5de 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt @@ -29,11 +29,7 @@ import android.webkit.WebView import androidx.annotation.AnyThread import androidx.annotation.VisibleForTesting import androidx.core.net.toUri -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope +import androidx.lifecycle.* import com.duckduckgo.app.autocomplete.api.AutoComplete import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteResult import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion @@ -333,7 +329,7 @@ class BrowserTabViewModel( } fun onViewVisible() { - //we expect refreshCta to be called when a site is fully loaded if browsingShowing -trackers data available-. + // we expect refreshCta to be called when a site is fully loaded if browsingShowing -trackers data available-. if (!currentBrowserViewState().browserShowing) { refreshCta() } diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTrackersAnimatorHelper.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTrackersAnimatorHelper.kt index 71505cbd01a3..dba431fa1b41 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTrackersAnimatorHelper.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTrackersAnimatorHelper.kt @@ -270,4 +270,4 @@ class BrowserTrackersAnimatorHelper { } } -data class TrackerLogo(val resId: Int, val trackerLetter: String = "") \ No newline at end of file +data class TrackerLogo(val resId: Int, val trackerLetter: String = "") diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserViewModel.kt index bc85da029e6b..6b80b16988a9 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserViewModel.kt @@ -197,4 +197,4 @@ class BrowserViewModel( override fun onUserCancelledGiveFeedbackDialog(promptCount: PromptCount) { onUserDeclinedToGiveFeedback(promptCount) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt index 005fdf1919d0..d3197171463d 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt @@ -32,7 +32,6 @@ import kotlinx.coroutines.* import timber.log.Timber import java.net.URI - class BrowserWebViewClient( private val requestRewriter: RequestRewriter, private val specialUrlDetector: SpecialUrlDetector, @@ -243,4 +242,4 @@ class BrowserWebViewClient( it.requiresAuthentication(request) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt index ccec131898f1..fd26a19d98e4 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/DownloadConfirmationFragment.kt @@ -151,4 +151,4 @@ class DownloadConfirmationFragment : BottomSheetDialogFragment() { return fragment } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoUrlDetector.kt b/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoUrlDetector.kt index f30cf906017e..bb782ef1db9e 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoUrlDetector.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoUrlDetector.kt @@ -21,7 +21,6 @@ import com.duckduckgo.app.global.AppUrl import com.duckduckgo.app.global.AppUrl.ParamKey import javax.inject.Inject - class DuckDuckGoUrlDetector @Inject constructor() { fun isDuckDuckGoUrl(uri: String): Boolean { @@ -44,4 +43,4 @@ class DuckDuckGoUrlDetector @Inject constructor() { private fun String.toUri(): Uri { return Uri.parse(this) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt b/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt index 54e7c2d1ad06..9daace06ea9f 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/DuckDuckGoWebView.kt @@ -18,14 +18,14 @@ package com.duckduckgo.app.browser import android.annotation.SuppressLint import android.content.Context -import androidx.core.view.NestedScrollingChild -import androidx.core.view.NestedScrollingChildHelper -import androidx.core.view.ViewCompat import android.util.AttributeSet import android.view.MotionEvent import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputConnection import android.webkit.WebView +import androidx.core.view.NestedScrollingChild +import androidx.core.view.NestedScrollingChildHelper +import androidx.core.view.ViewCompat /** * WebView subclass which allows the WebView to @@ -54,7 +54,6 @@ class DuckDuckGoWebView : WebView, NestedScrollingChild { return inputConnection } - private fun addNoPersonalisedFlag(outAttrs: EditorInfo) { outAttrs.imeOptions = outAttrs.imeOptions or IME_FLAG_NO_PERSONALIZED_LEARNING } @@ -140,4 +139,4 @@ class DuckDuckGoWebView : WebView, NestedScrollingChild { */ private const val IME_FLAG_NO_PERSONALIZED_LEARNING = 0x1000000 } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/LogoHidingLayoutChangeLifecycleListener.kt b/app/src/main/java/com/duckduckgo/app/browser/LogoHidingLayoutChangeLifecycleListener.kt index 50203347788c..c03590803849 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/LogoHidingLayoutChangeLifecycleListener.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/LogoHidingLayoutChangeLifecycleListener.kt @@ -24,7 +24,6 @@ import androidx.core.view.isVisible import com.duckduckgo.app.global.view.toDp import timber.log.Timber - class LogoHidingLayoutChangeLifecycleListener(private var ddgLogoView: View) : View.OnLayoutChangeListener { var callToActionView: View? = null @@ -105,4 +104,4 @@ class LogoHidingLayoutChangeLifecycleListener(private var ddgLogoView: View) : V private const val FADE_OUT_DURATION = 100L } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/SmoothProgressAnimator.kt b/app/src/main/java/com/duckduckgo/app/browser/SmoothProgressAnimator.kt index 972ce9f13b01..a54fd0b066bb 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/SmoothProgressAnimator.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/SmoothProgressAnimator.kt @@ -42,10 +42,10 @@ class SmoothProgressAnimator(private val pageLoadingIndicator: ProgressBar) { } } } - + companion object { private const val MIN_PROGRESS_BAR = 75 private const val ANIM_DURATION_PROGRESS_LONG = 1500L private const val ANIM_DURATION_PROGRESS_SHORT = 200L } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/SpecialUrlDetector.kt b/app/src/main/java/com/duckduckgo/app/browser/SpecialUrlDetector.kt index 38ab2ef88adc..64117744fe8e 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/SpecialUrlDetector.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/SpecialUrlDetector.kt @@ -112,4 +112,4 @@ class SpecialUrlDetectorImpl : SpecialUrlDetector { const val PHONE_MAX_LENGTH = 20 const val EMAIL_MAX_LENGTH = 1000 } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/TabSwitcherButton.kt b/app/src/main/java/com/duckduckgo/app/browser/TabSwitcherButton.kt index 9cdf05b2436e..990ccf7ecc46 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/TabSwitcherButton.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/TabSwitcherButton.kt @@ -20,10 +20,7 @@ import android.animation.Animator import android.animation.AnimatorListenerAdapter import android.content.Context import android.util.AttributeSet -import android.view.LayoutInflater import android.view.View -import android.widget.FrameLayout -import android.widget.LinearLayout import android.widget.RelativeLayout import kotlinx.android.synthetic.main.view_tab_switcher_button.view.* @@ -95,4 +92,4 @@ class TabSwitcherButton @JvmOverloads constructor( .start() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/WebNavigationState.kt b/app/src/main/java/com/duckduckgo/app/browser/WebNavigationState.kt index f5acd70059df..2f419b925092 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/WebNavigationState.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/WebNavigationState.kt @@ -21,7 +21,6 @@ import androidx.core.net.toUri import com.duckduckgo.app.browser.WebNavigationStateChange.* import com.duckduckgo.app.global.isHttpsVersionOfUri - interface WebNavigationState { val originalUrl: String? val currentUrl: String? @@ -126,9 +125,11 @@ data class WebViewNavigationState(private val stack: WebBackForwardList) : WebNa } @Suppress("DataClassPrivateConstructor") -data class EmptyNavigationState private constructor(override val originalUrl: String?, - override val currentUrl: String?, - override val title: String?) : WebNavigationState { +data class EmptyNavigationState private constructor( + override val originalUrl: String?, + override val currentUrl: String?, + override val title: String? +) : WebNavigationState { companion object { operator fun invoke(webNavigationState: WebNavigationState): EmptyNavigationState { return EmptyNavigationState( @@ -157,4 +158,4 @@ private val WebBackForwardList.isHttpsUpgrade: Boolean val current = originalUrl?.toUri() ?: return false val previous = getItemAtIndex(currentIndex - 1)?.originalUrl?.toUri() ?: return false return current.isHttpsVersionOfUri(previous) - } \ No newline at end of file + } diff --git a/app/src/main/java/com/duckduckgo/app/browser/WebViewClientListener.kt b/app/src/main/java/com/duckduckgo/app/browser/WebViewClientListener.kt index 750c9323503c..914d28db5bec 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/WebViewClientListener.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/WebViewClientListener.kt @@ -49,4 +49,4 @@ interface WebViewClientListener { fun closeCurrentTab() fun upgradedToHttps() fun surrogateDetected(surrogate: SurrogateResponse) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/WebViewLongPressHandler.kt b/app/src/main/java/com/duckduckgo/app/browser/WebViewLongPressHandler.kt index c195687f58ef..b74dfb335b5c 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/WebViewLongPressHandler.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/WebViewLongPressHandler.kt @@ -29,7 +29,6 @@ import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.* import timber.log.Timber import javax.inject.Inject - interface LongPressHandler { fun handleLongPress(longPressTargetType: Int, longPressTargetUrl: String?, menu: ContextMenu) fun userSelectedMenuItem(longPressTarget: LongPressTarget, item: MenuItem): RequiredAction @@ -129,7 +128,6 @@ class WebViewLongPressHandler @Inject constructor(private val context: Context, } } - companion object { const val CONTEXT_MENU_ID_OPEN_IN_NEW_TAB = 1 const val CONTEXT_MENU_ID_OPEN_IN_NEW_BACKGROUND_TAB = 2 @@ -138,4 +136,4 @@ class WebViewLongPressHandler @Inject constructor(private val context: Context, const val CONTEXT_MENU_ID_DOWNLOAD_IMAGE = 5 const val CONTEXT_MENU_ID_OPEN_IMAGE_IN_NEW_BACKGROUND_TAB = 6 } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/WebViewRequestInterceptor.kt b/app/src/main/java/com/duckduckgo/app/browser/WebViewRequestInterceptor.kt index efcd51600f13..5efcd08ad7ec 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/WebViewRequestInterceptor.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/WebViewRequestInterceptor.kt @@ -121,4 +121,4 @@ class WebViewRequestInterceptor( return trackingEvent.blocked } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/addtohome/AddToHomeCapabilityDetector.kt b/app/src/main/java/com/duckduckgo/app/browser/addtohome/AddToHomeCapabilityDetector.kt index dfe4812b5fca..833f0c4ec372 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/addtohome/AddToHomeCapabilityDetector.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/addtohome/AddToHomeCapabilityDetector.kt @@ -32,4 +32,4 @@ class AddToHomeSystemCapabilityDetector @Inject constructor(val context: Context Timber.v("Add to home is %ssupported", if (supported) "" else "not ") return supported } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/autocomplete/BrowserAutoCompleteModule.kt b/app/src/main/java/com/duckduckgo/app/browser/autocomplete/BrowserAutoCompleteModule.kt index 18efbb4c541f..8f0384d83c71 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/autocomplete/BrowserAutoCompleteModule.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/autocomplete/BrowserAutoCompleteModule.kt @@ -22,11 +22,10 @@ import com.duckduckgo.app.settings.db.SettingsSharedPreferences import dagger.Module import dagger.Provides - @Module class BrowserAutoCompleteModule { @Provides fun settingsDataStore(context: Context): SettingsDataStore = SettingsSharedPreferences(context) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/autocomplete/BrowserAutoCompleteSuggestionsAdapter.kt b/app/src/main/java/com/duckduckgo/app/browser/autocomplete/BrowserAutoCompleteSuggestionsAdapter.kt index 57f9246c14f6..2f3b7e4fa5a4 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/autocomplete/BrowserAutoCompleteSuggestionsAdapter.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/autocomplete/BrowserAutoCompleteSuggestionsAdapter.kt @@ -84,4 +84,4 @@ class BrowserAutoCompleteSuggestionsAdapter( const val SUGGESTION_TYPE = 2 const val BOOKMARK_TYPE = 3 } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/autocomplete/SuggestionViewHolderFactory.kt b/app/src/main/java/com/duckduckgo/app/browser/autocomplete/SuggestionViewHolderFactory.kt index 0193fef22b89..edf7310883c4 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/autocomplete/SuggestionViewHolderFactory.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/autocomplete/SuggestionViewHolderFactory.kt @@ -130,4 +130,4 @@ sealed class AutoCompleteViewHolder(itemView: View) : RecyclerView.ViewHolder(it } class EmptySuggestionViewHolder(itemView: View) : AutoCompleteViewHolder(itemView) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserDetector.kt b/app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserDetector.kt index 02b8164ed7eb..ecc9529f3715 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserDetector.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserDetector.kt @@ -57,4 +57,4 @@ class AndroidDefaultBrowserDetector @Inject constructor(private val context: Con companion object { const val ANDROID_PACKAGE = "android" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserObserver.kt b/app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserObserver.kt index 1134688c2cd4..f61c94165324 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserObserver.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserObserver.kt @@ -47,4 +47,4 @@ class DefaultBrowserObserver( } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserSystemSettings.kt b/app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserSystemSettings.kt index 8f3d9ba5d083..3b77c6244ab9 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserSystemSettings.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/DefaultBrowserSystemSettings.kt @@ -22,7 +22,6 @@ import android.provider.Settings import androidx.annotation.RequiresApi import androidx.core.os.bundleOf - class DefaultBrowserSystemSettings { companion object { @@ -38,4 +37,4 @@ class DefaultBrowserSystemSettings { private const val SETTINGS_SHOW_FRAGMENT_ARGS = ":settings:show_fragment_args" private const val DEFAULT_BROWSER_APP_OPTION = "default_browser" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/TopInstructionsCard.kt b/app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/TopInstructionsCard.kt index c56c6e27fe67..bd545a106ac6 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/TopInstructionsCard.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/defaultbrowsing/TopInstructionsCard.kt @@ -31,4 +31,4 @@ class TopInstructionsCard(context: Context, duration: Int = LENGTH_LONG) : Toast setGravity(Gravity.TOP or Gravity.FILL_HORIZONTAL, 0, 0) this.duration = duration } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/di/BrowserModule.kt b/app/src/main/java/com/duckduckgo/app/browser/di/BrowserModule.kt index 7351a33cc9d6..e29594b824a3 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/di/BrowserModule.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/di/BrowserModule.kt @@ -202,4 +202,4 @@ class BrowserModule { fun webViewPreviewGenerator(): WebViewPreviewGenerator { return FileBasedWebViewPreviewGenerator() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/downloader/DataUriDownloader.kt b/app/src/main/java/com/duckduckgo/app/browser/downloader/DataUriDownloader.kt index 9b684783faa0..599a15717f7f 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/downloader/DataUriDownloader.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/downloader/DataUriDownloader.kt @@ -16,8 +16,8 @@ package com.duckduckgo.app.browser.downloader -import androidx.annotation.WorkerThread import android.util.Base64 +import androidx.annotation.WorkerThread import com.duckduckgo.app.browser.downloader.DataUriParser.GeneratedFilename import com.duckduckgo.app.browser.downloader.DataUriParser.ParseResult import timber.log.Timber @@ -67,4 +67,4 @@ class DataUriDownloader @Inject constructor( if (!file.exists()) file.createNewFile() return file } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/downloader/DataUriParser.kt b/app/src/main/java/com/duckduckgo/app/browser/downloader/DataUriParser.kt index 6c107433cb4f..f8aab20eaa1f 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/downloader/DataUriParser.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/downloader/DataUriParser.kt @@ -58,7 +58,6 @@ class DataUriParser @Inject constructor() { private const val REGEX_GROUP_DATA = 5 } - sealed class ParseResult { object Invalid : ParseResult() diff --git a/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloadNotificationManager.kt b/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloadNotificationManager.kt index c89e693a8ccc..03e5ed626366 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloadNotificationManager.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloadNotificationManager.kt @@ -84,4 +84,4 @@ class FileDownloadNotificationManager @Inject constructor( companion object { private const val NOTIFICATION_ID = 1 } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloader.kt b/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloader.kt index f1824c92e802..9b42062c45d8 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloader.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/downloader/FileDownloader.kt @@ -45,7 +45,7 @@ class FileDownloader @Inject constructor( val subfolder: String, val userAgent: String, val directory: File = Environment.getExternalStoragePublicDirectory(subfolder) - ): Serializable + ) : Serializable interface FileDownloadListener { fun downloadStarted() @@ -62,4 +62,4 @@ fun FileDownloader.PendingFileDownload.guessFileName(): String { val FileDownloader.PendingFileDownload.isDataUrl get() = URLUtil.isDataUrl(url) -val FileDownloader.PendingFileDownload.isNetworkUrl get() = URLUtil.isNetworkUrl(url) \ No newline at end of file +val FileDownloader.PendingFileDownload.isNetworkUrl get() = URLUtil.isNetworkUrl(url) diff --git a/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt b/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt index 6434c1eeef6a..169961f06954 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/downloader/NetworkFileDownloader.kt @@ -40,4 +40,3 @@ class NetworkFileDownloader @Inject constructor(private val context: Context) { manager?.enqueue(request) } } - diff --git a/app/src/main/java/com/duckduckgo/app/browser/favicon/FaviconModule.kt b/app/src/main/java/com/duckduckgo/app/browser/favicon/FaviconModule.kt index ca728a234057..bb20490feabe 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/favicon/FaviconModule.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/favicon/FaviconModule.kt @@ -20,7 +20,6 @@ import android.content.Context import dagger.Module import dagger.Provides - @Module class FaviconModule { @@ -28,4 +27,4 @@ class FaviconModule { fun faviconDownloader(context: Context): FaviconDownloader { return GlideFaviconDownloader(context) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/filechooser/FileChooserIntentBuilder.kt b/app/src/main/java/com/duckduckgo/app/browser/filechooser/FileChooserIntentBuilder.kt index e799341a1cb2..6468f28ddf4f 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/filechooser/FileChooserIntentBuilder.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/filechooser/FileChooserIntentBuilder.kt @@ -21,7 +21,6 @@ import android.net.Uri import timber.log.Timber import javax.inject.Inject - class FileChooserIntentBuilder @Inject constructor() { fun intent(acceptTypes: Array, canChooseMultiple: Boolean = false): Intent { @@ -89,4 +88,4 @@ class FileChooserIntentBuilder @Inject constructor() { private fun configureAllowMultipleFile(intent: Intent, canChooseMultiple: Boolean) { intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, canChooseMultiple) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/model/Authentication.kt b/app/src/main/java/com/duckduckgo/app/browser/model/Authentication.kt index 5d1ff58d6fac..1e7614bea265 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/model/Authentication.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/model/Authentication.kt @@ -19,4 +19,4 @@ package com.duckduckgo.app.browser.model import android.webkit.HttpAuthHandler data class BasicAuthenticationRequest(val handler: HttpAuthHandler, val host: String, val realm: String, val site: String) -data class BasicAuthenticationCredentials(val username: String, val password: String) \ No newline at end of file +data class BasicAuthenticationCredentials(val username: String, val password: String) diff --git a/app/src/main/java/com/duckduckgo/app/browser/model/LongPressTarget.kt b/app/src/main/java/com/duckduckgo/app/browser/model/LongPressTarget.kt index 8321aba64b4a..419b22b0bb89 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/model/LongPressTarget.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/model/LongPressTarget.kt @@ -16,4 +16,4 @@ package com.duckduckgo.app.browser.model -data class LongPressTarget(val url: String?, val type: Int, val imageUrl: String? = null) \ No newline at end of file +data class LongPressTarget(val url: String?, val type: Int, val imageUrl: String? = null) diff --git a/app/src/main/java/com/duckduckgo/app/browser/navigation/WebViewBackForwardListSafeExtractor.kt b/app/src/main/java/com/duckduckgo/app/browser/navigation/WebViewBackForwardListSafeExtractor.kt index 16570c7dc783..f83887d6ad2f 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/navigation/WebViewBackForwardListSafeExtractor.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/navigation/WebViewBackForwardListSafeExtractor.kt @@ -35,4 +35,4 @@ fun WebView.safeCopyBackForwardList(): WebBackForwardList? { Timber.e(e, "Failed to extract WebView back forward list") null } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/omnibar/KeyboardAwareEditText.kt b/app/src/main/java/com/duckduckgo/app/browser/omnibar/KeyboardAwareEditText.kt index b9f91e09a3a8..7acf108cba03 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/omnibar/KeyboardAwareEditText.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/omnibar/KeyboardAwareEditText.kt @@ -18,9 +18,9 @@ package com.duckduckgo.app.browser.omnibar import android.content.Context import android.graphics.Rect -import androidx.appcompat.widget.AppCompatEditText import android.util.AttributeSet import android.view.KeyEvent +import androidx.appcompat.widget.AppCompatEditText import com.duckduckgo.app.global.view.showKeyboard /** diff --git a/app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarEntryConverter.kt b/app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarEntryConverter.kt index 7fd6a36d27be..319d68c1dacd 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarEntryConverter.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarEntryConverter.kt @@ -19,4 +19,4 @@ package com.duckduckgo.app.browser.omnibar interface OmnibarEntryConverter { fun convertQueryToUrl(searchQuery: String): String -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarScrolling.kt b/app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarScrolling.kt index 398b4c7eae42..b1563e5cb1df 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarScrolling.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarScrolling.kt @@ -21,7 +21,6 @@ import com.google.android.material.appbar.AppBarLayout import com.google.android.material.appbar.AppBarLayout.LayoutParams.* import javax.inject.Inject - class OmnibarScrolling @Inject constructor() { fun enableOmnibarScrolling(toolbarContainer: View) { @@ -37,4 +36,4 @@ class OmnibarScrolling @Inject constructor() { params.scrollFlags = flags toolbarContainer.layoutParams = params } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/omnibar/QueryUrlConverter.kt b/app/src/main/java/com/duckduckgo/app/browser/omnibar/QueryUrlConverter.kt index 79b4e9f20cd1..f8a09c49ea8f 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/omnibar/QueryUrlConverter.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/omnibar/QueryUrlConverter.kt @@ -55,4 +55,4 @@ class QueryUrlConverter @Inject constructor(private val requestRewriter: Request return uri.toString() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/db/AppEnjoyment.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/db/AppEnjoyment.kt index 2a48718ca50b..dbaa036d4df0 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/rating/db/AppEnjoyment.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/rating/db/AppEnjoyment.kt @@ -55,7 +55,8 @@ interface AppEnjoymentDao { data class AppEnjoymentEntity( val eventType: AppEnjoymentEventType, val promptCount: PromptCount, - val timestamp: Long = System.currentTimeMillis(), @PrimaryKey(autoGenerate = true) val primaryKey: Int = 0 + val timestamp: Long = System.currentTimeMillis(), + @PrimaryKey(autoGenerate = true) val primaryKey: Int = 0 ) enum class AppEnjoymentEventType(val value: Int) { @@ -91,4 +92,4 @@ class PromptCountConverter { @TypeConverter fun convertFromDb(promptCount: Int): PromptCount = PromptCount(promptCount) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/db/AppEnjoymentRepository.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/db/AppEnjoymentRepository.kt index 3b0a8b4c2981..7b88dd5994ce 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/rating/db/AppEnjoymentRepository.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/rating/db/AppEnjoymentRepository.kt @@ -23,7 +23,6 @@ import timber.log.Timber import java.util.* import java.util.concurrent.Executors - interface AppEnjoymentRepository { suspend fun onUserSelectedToRateApp(promptCount: PromptCount) diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/di/RatingModule.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/di/RatingModule.kt index 4da7b4a49636..6872fc5d286b 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/rating/di/RatingModule.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/rating/di/RatingModule.kt @@ -31,7 +31,6 @@ import dagger.Provides import javax.inject.Named import javax.inject.Singleton - @Module class RatingModule { @@ -104,4 +103,4 @@ class RatingModule { private const val SECONDARY_PROMPT_DECIDER_NAME = "secondary-prompt-decider" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt index 6693851a8d31..51b854c2928c 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/AppEnjoymentDialogFragment.kt @@ -24,7 +24,6 @@ import com.duckduckgo.app.global.dialog.BackKeyListener import com.duckduckgo.app.global.rating.PromptCount import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.* - class AppEnjoymentDialogFragment : EnjoymentDialog() { interface Listener { @@ -66,4 +65,4 @@ class AppEnjoymentDialogFragment : EnjoymentDialog() { } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/EnjoymentDialog.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/EnjoymentDialog.kt index 53418230d2d6..eded1f247c89 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/EnjoymentDialog.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/EnjoymentDialog.kt @@ -24,7 +24,6 @@ import com.duckduckgo.app.statistics.pixels.Pixel import dagger.android.support.AndroidSupportInjection import javax.inject.Inject - abstract class EnjoymentDialog : DialogFragment() { @Inject @@ -51,4 +50,4 @@ abstract class EnjoymentDialog : DialogFragment() { companion object { const val PROMPT_COUNT_BUNDLE_KEY = "PROMPT_COUNT" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt index 1599ae16ec1e..d11fa4ec7543 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/GiveFeedbackDialogFragment.kt @@ -24,7 +24,6 @@ import com.duckduckgo.app.global.dialog.BackKeyListener import com.duckduckgo.app.global.rating.PromptCount import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.* - class GiveFeedbackDialogFragment : EnjoymentDialog() { interface Listener { @@ -66,4 +65,4 @@ class GiveFeedbackDialogFragment : EnjoymentDialog() { } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt index 8e87bd233374..222073daaabc 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/RateAppDialogFragment.kt @@ -24,7 +24,6 @@ import com.duckduckgo.app.global.dialog.BackKeyListener import com.duckduckgo.app.global.rating.PromptCount import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.* - class RateAppDialogFragment : EnjoymentDialog() { interface Listener { @@ -66,4 +65,4 @@ class RateAppDialogFragment : EnjoymentDialog() { } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/session/WebViewSessionStorage.kt b/app/src/main/java/com/duckduckgo/app/browser/session/WebViewSessionStorage.kt index a70c3ca73d90..d16cf2b77662 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/session/WebViewSessionStorage.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/session/WebViewSessionStorage.kt @@ -22,7 +22,6 @@ import android.util.LruCache import android.webkit.WebView import timber.log.Timber - interface WebViewSessionStorage { fun saveSession(webView: WebView?, tabId: String) fun restoreSession(webView: WebView?, tabId: String): Boolean @@ -129,4 +128,4 @@ class WebViewSessionInMemoryStorage : WebViewSessionStorage { } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/shortcut/ShortcutBuilder.kt b/app/src/main/java/com/duckduckgo/app/browser/shortcut/ShortcutBuilder.kt index a88f079ef171..6b00cf252833 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/shortcut/ShortcutBuilder.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/shortcut/ShortcutBuilder.kt @@ -26,7 +26,6 @@ import com.duckduckgo.app.browser.R import java.util.* import javax.inject.Inject - class ShortcutBuilder @Inject constructor() { fun buildPinnedPageShortcut(context: Context, homeShortcut: BrowserTabViewModel.Command.AddHomeShortcut): ShortcutInfoCompat { @@ -46,4 +45,4 @@ class ShortcutBuilder @Inject constructor() { .setIcon(icon) .build() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/tabpreview/TabEntityDiffCallback.kt b/app/src/main/java/com/duckduckgo/app/browser/tabpreview/TabEntityDiffCallback.kt index 224b46c86e7d..e80e0038c91e 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/tabpreview/TabEntityDiffCallback.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/tabpreview/TabEntityDiffCallback.kt @@ -20,7 +20,6 @@ import android.os.Bundle import androidx.recyclerview.widget.DiffUtil import com.duckduckgo.app.tabs.model.TabEntity - class TabEntityDiffCallback : DiffUtil.ItemCallback() { override fun areItemsTheSame(oldItem: TabEntity, newItem: TabEntity): Boolean { @@ -57,4 +56,4 @@ class TabEntityDiffCallback : DiffUtil.ItemCallback() { const val DIFF_KEY_PREVIEW = "previewImage" const val DIFF_KEY_VIEWED = "viewed" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/tabpreview/WebViewPreviewGenerator.kt b/app/src/main/java/com/duckduckgo/app/browser/tabpreview/WebViewPreviewGenerator.kt index 4615184730ba..7154fd37d39f 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/tabpreview/WebViewPreviewGenerator.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/tabpreview/WebViewPreviewGenerator.kt @@ -23,7 +23,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import timber.log.Timber - interface WebViewPreviewGenerator { suspend fun generatePreview(webView: WebView): Bitmap } @@ -70,4 +69,4 @@ class FileBasedWebViewPreviewGenerator : WebViewPreviewGenerator { companion object { private const val COMPRESSION_RATIO = 0.5 } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/tabpreview/WebViewPreviewPersister.kt b/app/src/main/java/com/duckduckgo/app/browser/tabpreview/WebViewPreviewPersister.kt index 30a95aacd007..12f21fcfeeb3 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/tabpreview/WebViewPreviewPersister.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/tabpreview/WebViewPreviewPersister.kt @@ -16,7 +16,6 @@ package com.duckduckgo.app.browser.tabpreview - import android.content.Context import android.graphics.Bitmap import com.duckduckgo.app.global.file.FileDeleter @@ -26,7 +25,6 @@ import timber.log.Timber import java.io.File import java.io.FileOutputStream - interface WebViewPreviewPersister { fun fullPathForFile(tabId: String, previewName: String): String @@ -104,4 +102,4 @@ class FileBasedWebViewPreviewPersister(val context: Context, private val fileDel const val TAB_PREVIEW_DIRECTORY = "tabPreviews" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/ui/BottomNavigationBar.kt b/app/src/main/java/com/duckduckgo/app/browser/ui/BottomNavigationBar.kt index fe58b16530be..944d2f4b2380 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/ui/BottomNavigationBar.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/ui/BottomNavigationBar.kt @@ -73,4 +73,4 @@ class BottomNavigationBar : LinearLayout { offsetAnimator.setFloatValues(translationY, targetTranslation) offsetAnimator.start() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/ui/BottomNavigationBehavior.kt b/app/src/main/java/com/duckduckgo/app/browser/ui/BottomNavigationBehavior.kt index e08cc216218b..a6192da9924c 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/ui/BottomNavigationBehavior.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/ui/BottomNavigationBehavior.kt @@ -116,4 +116,4 @@ class BottomNavigationBehavior(context: Context, attrs: AttributeSet) snackbarLayout.layoutParams = params } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/ui/HttpAuthenticationDialogFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/ui/HttpAuthenticationDialogFragment.kt index 816e87cf5fa9..6cef5356d7c8 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/ui/HttpAuthenticationDialogFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/ui/HttpAuthenticationDialogFragment.kt @@ -106,4 +106,4 @@ class HttpAuthenticationDialogFragment : DialogFragment() { return dialog } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/browser/useragent/UserAgentProvider.kt b/app/src/main/java/com/duckduckgo/app/browser/useragent/UserAgentProvider.kt index 34d316622fb1..8735b7f4f1d5 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/useragent/UserAgentProvider.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/useragent/UserAgentProvider.kt @@ -19,7 +19,6 @@ package com.duckduckgo.app.browser.useragent import android.os.Build import com.duckduckgo.app.global.device.DeviceInfo - /** * Example Default User Agent (From Chrome): * Mozilla/5.0 (Linux; Android 8.1.0; Nexus 6P Build/OPM3.171019.014) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.137 Mobile Safari/537.36 @@ -67,4 +66,4 @@ class UserAgentProvider constructor(private val defaultUserAgent: String, privat private const val MOZILLA_PREFIX = "Mozilla/5.0" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/cta/db/DismissedCtaDao.kt b/app/src/main/java/com/duckduckgo/app/cta/db/DismissedCtaDao.kt index 2763d40c1d85..061f62fb308d 100644 --- a/app/src/main/java/com/duckduckgo/app/cta/db/DismissedCtaDao.kt +++ b/app/src/main/java/com/duckduckgo/app/cta/db/DismissedCtaDao.kt @@ -32,6 +32,3 @@ abstract class DismissedCtaDao { @Query("select count(1) > 0 from dismissed_cta where ctaId = :ctaId") abstract fun exists(ctaId: CtaId): Boolean } - - - diff --git a/app/src/main/java/com/duckduckgo/app/cta/model/DismissedCta.kt b/app/src/main/java/com/duckduckgo/app/cta/model/DismissedCta.kt index 7320f7195368..e5edb06269e7 100644 --- a/app/src/main/java/com/duckduckgo/app/cta/model/DismissedCta.kt +++ b/app/src/main/java/com/duckduckgo/app/cta/model/DismissedCta.kt @@ -52,4 +52,3 @@ data class DismissedCta( } } } - diff --git a/app/src/main/java/com/duckduckgo/app/cta/ui/Cta.kt b/app/src/main/java/com/duckduckgo/app/cta/ui/Cta.kt index 59ae8be8f08a..27a817ee4bb4 100644 --- a/app/src/main/java/com/duckduckgo/app/cta/ui/Cta.kt +++ b/app/src/main/java/com/duckduckgo/app/cta/ui/Cta.kt @@ -37,7 +37,7 @@ import kotlinx.android.synthetic.main.include_cta_buttons.view.* import kotlinx.android.synthetic.main.include_cta_content.view.* import kotlinx.android.synthetic.main.include_dax_dialog_cta.view.* import kotlinx.android.synthetic.main.include_top_cta.view.* -import java.util.Locale +import java.util.* interface DialogCta { fun createCta(activity: FragmentActivity): DaxDialog @@ -353,7 +353,7 @@ sealed class HomeTopPanelCta( fun DaxCta.addCtaToHistory(newCta: String): String { val param = onboardingStore.onboardingDialogJourney?.split("-").orEmpty().toMutableList() val daysInstalled = minOf(appInstallStore.daysInstalled().toInt(), MAX_DAYS_ALLOWED) - param.add("$newCta:${daysInstalled}") + param.add("$newCta:$daysInstalled") val finalParam = param.joinToString("-") onboardingStore.onboardingDialogJourney = finalParam return finalParam diff --git a/app/src/main/java/com/duckduckgo/app/cta/ui/CtaViewModel.kt b/app/src/main/java/com/duckduckgo/app/cta/ui/CtaViewModel.kt index aee012098653..061ae9d0f9ed 100644 --- a/app/src/main/java/com/duckduckgo/app/cta/ui/CtaViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/cta/ui/CtaViewModel.kt @@ -39,7 +39,6 @@ import com.duckduckgo.app.statistics.VariantManager import com.duckduckgo.app.statistics.pixels.Pixel import com.duckduckgo.app.survey.db.SurveyDao import com.duckduckgo.app.survey.model.Survey -import com.duckduckgo.app.trackerdetection.model.TrackingEvent import com.duckduckgo.app.widget.ui.WidgetCapabilities import kotlinx.coroutines.withContext import timber.log.Timber @@ -274,4 +273,4 @@ class CtaViewModel @Inject constructor( } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/ActivityScoped.kt b/app/src/main/java/com/duckduckgo/app/di/ActivityScoped.kt index e2576dee73f9..95f57471354b 100644 --- a/app/src/main/java/com/duckduckgo/app/di/ActivityScoped.kt +++ b/app/src/main/java/com/duckduckgo/app/di/ActivityScoped.kt @@ -18,7 +18,6 @@ package com.duckduckgo.app.di import javax.inject.Scope - /** * In Dagger, an unscoped component cannot depend on a scoped component. As * [AppComponent] is a scoped component (`@Singleton`, we create a custom @@ -28,4 +27,4 @@ import javax.inject.Scope @MustBeDocumented @Scope @Retention(AnnotationRetention.RUNTIME) -annotation class ActivityScoped \ No newline at end of file +annotation class ActivityScoped diff --git a/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt b/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt index 0d51b4f4f24c..1ba4fbff7d64 100644 --- a/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt @@ -50,7 +50,6 @@ import com.duckduckgo.app.widget.ui.AddWidgetInstructionsActivity import dagger.Module import dagger.android.ContributesAndroidInjector - @Module abstract class AndroidBindingModule { @@ -180,9 +179,11 @@ abstract class AndroidBindingModule { /* Services */ + @Suppress("DEPRECATION") @ContributesAndroidInjector abstract fun jobService(): AppConfigurationJobService @ContributesAndroidInjector abstract fun notificationHandlerService(): NotificationHandlerService -} \ No newline at end of file + +} diff --git a/app/src/main/java/com/duckduckgo/app/di/AppComponent.kt b/app/src/main/java/com/duckduckgo/app/di/AppComponent.kt index e8a829b9bea1..c4f124f44e95 100644 --- a/app/src/main/java/com/duckduckgo/app/di/AppComponent.kt +++ b/app/src/main/java/com/duckduckgo/app/di/AppComponent.kt @@ -16,7 +16,6 @@ package com.duckduckgo.app.di - import android.app.Application import com.duckduckgo.app.browser.autocomplete.BrowserAutoCompleteModule import com.duckduckgo.app.browser.di.BrowserModule @@ -83,4 +82,4 @@ interface AppComponent : AndroidInjector { } fun inject(searchWidget: SearchWidget) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/AppConfigurationDownloadModule.kt b/app/src/main/java/com/duckduckgo/app/di/AppConfigurationDownloaderModule.kt similarity index 99% rename from app/src/main/java/com/duckduckgo/app/di/AppConfigurationDownloadModule.kt rename to app/src/main/java/com/duckduckgo/app/di/AppConfigurationDownloaderModule.kt index 6f945479773c..a443cb3f06fd 100644 --- a/app/src/main/java/com/duckduckgo/app/di/AppConfigurationDownloadModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/AppConfigurationDownloaderModule.kt @@ -43,4 +43,4 @@ open class AppConfigurationDownloaderModule { surveyDownloader ) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/ApplicationModule.kt b/app/src/main/java/com/duckduckgo/app/di/ApplicationModule.kt index ccce7dd1ef41..5db314aaef36 100644 --- a/app/src/main/java/com/duckduckgo/app/di/ApplicationModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/ApplicationModule.kt @@ -22,7 +22,6 @@ import dagger.Binds import dagger.Module import javax.inject.Singleton - @Module abstract class ApplicationModule { @@ -30,4 +29,4 @@ abstract class ApplicationModule { @Binds abstract fun bindContext(application: Application): Context -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/CoroutinesModule.kt b/app/src/main/java/com/duckduckgo/app/di/CoroutinesModule.kt index 5e03fffe9d8b..93381f30a384 100644 --- a/app/src/main/java/com/duckduckgo/app/di/CoroutinesModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/CoroutinesModule.kt @@ -30,4 +30,4 @@ class CoroutinesModule { fun providesDispatcherProvider(): DispatcherProvider { return DefaultDispatcherProvider() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/DaggerWorkerFactory.kt b/app/src/main/java/com/duckduckgo/app/di/DaggerWorkerFactory.kt index db2d0bcbe6eb..c3e78ee288d0 100644 --- a/app/src/main/java/com/duckduckgo/app/di/DaggerWorkerFactory.kt +++ b/app/src/main/java/com/duckduckgo/app/di/DaggerWorkerFactory.kt @@ -24,11 +24,10 @@ import androidx.work.WorkerParameters import com.duckduckgo.app.fire.DataClearingWorker import com.duckduckgo.app.global.job.AppConfigurationWorker import com.duckduckgo.app.global.view.ClearDataAction -import com.duckduckgo.app.job.AppConfigurationDownloader import com.duckduckgo.app.job.ConfigurationDownloader +import com.duckduckgo.app.notification.NotificationFactory import com.duckduckgo.app.notification.NotificationScheduler.ClearDataNotificationWorker import com.duckduckgo.app.notification.NotificationScheduler.PrivacyNotificationWorker -import com.duckduckgo.app.notification.NotificationFactory import com.duckduckgo.app.notification.db.NotificationDao import com.duckduckgo.app.notification.model.ClearDataNotification import com.duckduckgo.app.notification.model.PrivacyProtectionNotification @@ -68,7 +67,7 @@ class DaggerWorkerFactory( } return instance - } catch (exception: Exception){ + } catch (exception: Exception) { Timber.e(exception, "Worker $workerClassName could not be created") return null } @@ -104,4 +103,4 @@ class DaggerWorkerFactory( worker.notification = privacyProtectionNotification } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/DaoModule.kt b/app/src/main/java/com/duckduckgo/app/di/DaoModule.kt index 7c745869351f..134af216b55f 100644 --- a/app/src/main/java/com/duckduckgo/app/di/DaoModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/DaoModule.kt @@ -82,4 +82,4 @@ class DaoModule { @Provides fun fireproofWebsiteDao(database: AppDatabase) = database.fireproofWebsiteDao() -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/FileModule.kt b/app/src/main/java/com/duckduckgo/app/di/FileModule.kt index 969018763861..5c5a3ab02e0c 100644 --- a/app/src/main/java/com/duckduckgo/app/di/FileModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/FileModule.kt @@ -21,7 +21,6 @@ import com.duckduckgo.app.global.file.FileDeleter import dagger.Module import dagger.Provides - @Module class FileModule { @@ -30,4 +29,4 @@ class FileModule { return AndroidFileDeleter() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/JobsModule.kt b/app/src/main/java/com/duckduckgo/app/di/JobsModule.kt index 867a8628e823..d4e57d392de8 100644 --- a/app/src/main/java/com/duckduckgo/app/di/JobsModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/JobsModule.kt @@ -48,4 +48,4 @@ class JobsModule { fun providesWorkScheduler(notificationScheduler: AndroidNotificationScheduler, jobCleaner: JobCleaner): WorkScheduler { return AndroidWorkScheduler(notificationScheduler, jobCleaner) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/JsonModule.kt b/app/src/main/java/com/duckduckgo/app/di/JsonModule.kt index 1db02f76eb36..73a2029f2504 100644 --- a/app/src/main/java/com/duckduckgo/app/di/JsonModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/JsonModule.kt @@ -34,4 +34,4 @@ class JsonModule { .add(HttpsWhitelistJsonAdapter()) .add(TermsOfServiceListAdapter()) .build() -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt b/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt index d8c231aa8d63..b110777d8cf8 100644 --- a/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt @@ -53,7 +53,6 @@ import java.io.File import javax.inject.Named import javax.inject.Singleton - @Module class NetworkModule { diff --git a/app/src/main/java/com/duckduckgo/app/di/NotificationModule.kt b/app/src/main/java/com/duckduckgo/app/di/NotificationModule.kt index dc1758152973..11ad9ceffc82 100644 --- a/app/src/main/java/com/duckduckgo/app/di/NotificationModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/NotificationModule.kt @@ -21,9 +21,9 @@ import android.content.Context import androidx.core.app.NotificationManagerCompat import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.work.WorkManager -import com.duckduckgo.app.notification.NotificationScheduler -import com.duckduckgo.app.notification.NotificationFactory import com.duckduckgo.app.notification.AndroidNotificationScheduler +import com.duckduckgo.app.notification.NotificationFactory +import com.duckduckgo.app.notification.NotificationScheduler import com.duckduckgo.app.notification.db.NotificationDao import com.duckduckgo.app.notification.model.ClearDataNotification import com.duckduckgo.app.notification.model.PrivacyProtectionNotification diff --git a/app/src/main/java/com/duckduckgo/app/di/PlayStoreReferralModule.kt b/app/src/main/java/com/duckduckgo/app/di/PlayStoreReferralModule.kt index 94d324a3bf1c..c9f3ad6cf340 100644 --- a/app/src/main/java/com/duckduckgo/app/di/PlayStoreReferralModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/PlayStoreReferralModule.kt @@ -49,4 +49,4 @@ class PlayStoreReferralModule { fun appReferrerDataStore(context: Context): AppReferrerDataStore { return AppReferenceSharePreferences(context) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/PrivacyModule.kt b/app/src/main/java/com/duckduckgo/app/di/PrivacyModule.kt index d7e1a411af07..195a56d4dcdb 100644 --- a/app/src/main/java/com/duckduckgo/app/di/PrivacyModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/PrivacyModule.kt @@ -19,7 +19,6 @@ package com.duckduckgo.app.di import android.content.Context import androidx.work.WorkManager import com.duckduckgo.app.browser.WebDataManager -import com.duckduckgo.app.trackerdetection.EntityLookup import com.duckduckgo.app.fire.* import com.duckduckgo.app.global.file.FileDeleter import com.duckduckgo.app.global.view.ClearDataAction @@ -29,6 +28,7 @@ import com.duckduckgo.app.privacy.model.PrivacyPracticesImpl import com.duckduckgo.app.privacy.store.TermsOfServiceStore import com.duckduckgo.app.settings.db.SettingsDataStore import com.duckduckgo.app.tabs.model.TabRepository +import com.duckduckgo.app.trackerdetection.EntityLookup import com.duckduckgo.app.trackerdetection.TdsEntityLookup import com.duckduckgo.app.trackerdetection.db.TdsDomainEntityDao import com.duckduckgo.app.trackerdetection.db.TdsEntityDao @@ -83,4 +83,4 @@ class PrivacyModule { fun appCacheCleaner(context: Context, fileDeleter: FileDeleter): AppCacheClearer { return AndroidAppCacheClearer(context, fileDeleter) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/StatisticsModule.kt b/app/src/main/java/com/duckduckgo/app/di/StatisticsModule.kt index 336d50e8f500..6584e2e829cf 100644 --- a/app/src/main/java/com/duckduckgo/app/di/StatisticsModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/StatisticsModule.kt @@ -34,7 +34,6 @@ import retrofit2.Retrofit import javax.inject.Named import javax.inject.Singleton - @Module class StatisticsModule { @@ -77,4 +76,4 @@ class StatisticsModule { ): AtbInitializer { return AtbInitializer(statisticsDataStore, statisticsUpdater, appReferrerStateListener) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/StoreModule.kt b/app/src/main/java/com/duckduckgo/app/di/StoreModule.kt index c3d7d8aa2a5e..dd6562647d54 100644 --- a/app/src/main/java/com/duckduckgo/app/di/StoreModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/StoreModule.kt @@ -20,8 +20,12 @@ import com.duckduckgo.app.fire.UnsentForgetAllPixelStore import com.duckduckgo.app.fire.UnsentForgetAllPixelStoreSharedPreferences import com.duckduckgo.app.global.install.AppInstallSharedPreferences import com.duckduckgo.app.global.install.AppInstallStore -import com.duckduckgo.app.onboarding.store.* -import com.duckduckgo.app.privacy.store.* +import com.duckduckgo.app.onboarding.store.AppUserStageStore +import com.duckduckgo.app.onboarding.store.OnboardingSharedPreferences +import com.duckduckgo.app.onboarding.store.OnboardingStore +import com.duckduckgo.app.onboarding.store.UserStageStore +import com.duckduckgo.app.privacy.store.TermsOfServiceRawStore +import com.duckduckgo.app.privacy.store.TermsOfServiceStore import com.duckduckgo.app.statistics.store.OfflinePixelCountDataStore import com.duckduckgo.app.statistics.store.OfflinePixelCountSharedPreferences import com.duckduckgo.app.statistics.store.StatisticsDataStore @@ -57,4 +61,4 @@ abstract class StoreModule { @Binds abstract fun bindUserStageStore(userStageDao: AppUserStageStore): UserStageStore -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/SystemComponentsModule.kt b/app/src/main/java/com/duckduckgo/app/di/SystemComponentsModule.kt index abb70a22ca19..40eb715a0fec 100644 --- a/app/src/main/java/com/duckduckgo/app/di/SystemComponentsModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/SystemComponentsModule.kt @@ -47,4 +47,4 @@ open class SystemComponentsModule { @Provides fun appIconModifier(context: Context, appShortcutCreator: AppShortcutCreator): IconModifier = AppIconModifier(context, appShortcutCreator) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/VariantModule.kt b/app/src/main/java/com/duckduckgo/app/di/VariantModule.kt index f0c56a1023b4..6d216e7ff295 100644 --- a/app/src/main/java/com/duckduckgo/app/di/VariantModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/VariantModule.kt @@ -34,4 +34,4 @@ class VariantModule { @Provides fun weightedRandomizer() = WeightedRandomizer() -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/WidgetModule.kt b/app/src/main/java/com/duckduckgo/app/di/WidgetModule.kt index 2343e02b13e5..442158b5d8e5 100644 --- a/app/src/main/java/com/duckduckgo/app/di/WidgetModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/WidgetModule.kt @@ -23,11 +23,10 @@ import dagger.Module import dagger.Provides import javax.inject.Singleton - @Module class WidgetModule { @Provides @Singleton fun widgetCapabilities(context: Context): WidgetCapabilities = AppWidgetCapabilities(context) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/di/WorkerModule.kt b/app/src/main/java/com/duckduckgo/app/di/WorkerModule.kt index 3531ec1ba556..e74bdb113335 100644 --- a/app/src/main/java/com/duckduckgo/app/di/WorkerModule.kt +++ b/app/src/main/java/com/duckduckgo/app/di/WorkerModule.kt @@ -22,7 +22,6 @@ import androidx.work.Configuration import androidx.work.WorkManager import androidx.work.WorkerFactory import com.duckduckgo.app.global.view.ClearDataAction -import com.duckduckgo.app.job.AppConfigurationDownloader import com.duckduckgo.app.job.ConfigurationDownloader import com.duckduckgo.app.notification.NotificationFactory import com.duckduckgo.app.notification.db.NotificationDao @@ -75,4 +74,4 @@ class WorkerModule { pixel ) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt index 5eadfaac76f8..e54ffd5a894a 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt @@ -21,7 +21,6 @@ import retrofit2.http.Field import retrofit2.http.FormUrlEncoded import retrofit2.http.POST - interface FeedbackService { @FormUrlEncoded @@ -45,4 +44,4 @@ interface FeedbackService { const val REASON_GENERAL = "general" private const val PLATFORM = "Android" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt index 46bf7de1af90..e3a04abcb480 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt @@ -30,7 +30,6 @@ import kotlinx.coroutines.launch import timber.log.Timber import java.util.* - interface FeedbackSubmitter { suspend fun sendNegativeFeedback(mainReason: MainReason, subReason: SubReason?, openEnded: String) @@ -40,11 +39,11 @@ interface FeedbackSubmitter { } class FireAndForgetFeedbackSubmitter( - private val feedbackService: FeedbackService, - private val variantManager: VariantManager, - private val apiKeyMapper: SubReasonApiMapper, - private val statisticsDataStore: StatisticsDataStore, - private val pixel: Pixel + private val feedbackService: FeedbackService, + private val variantManager: VariantManager, + private val apiKeyMapper: SubReasonApiMapper, + private val statisticsDataStore: StatisticsDataStore, + private val pixel: Pixel ) : FeedbackSubmitter { override suspend fun sendNegativeFeedback(mainReason: MainReason, subReason: SubReason?, openEnded: String) { Timber.i("User provided negative feedback: {$openEnded}. mainReason = $mainReason, subReason = $subReason") @@ -95,7 +94,8 @@ class FireAndForgetFeedbackSubmitter( rating = NEGATIVE_FEEDBACK, url = brokenSite, openEnded = openEnded, - category = category) + category = category + ) } .onSuccess { Timber.i("Successfully submitted broken site feedback") } .onFailure { Timber.w(it, "Failed to send broken site feedback") } @@ -166,4 +166,4 @@ class FireAndForgetFeedbackSubmitter( private const val POSITIVE_FEEDBACK = "positive" private const val NEGATIVE_FEEDBACK = "negative" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/SubReasonApiMapper.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/SubReasonApiMapper.kt index 36088a5ff1b9..ac32d50f5e40 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/api/SubReasonApiMapper.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/api/SubReasonApiMapper.kt @@ -23,7 +23,6 @@ import com.duckduckgo.app.feedback.ui.negative.FeedbackType.PerformanceSubReason import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SearchNotGoodEnoughSubReasons.* import javax.inject.Inject - class SubReasonApiMapper @Inject constructor() { fun apiKeyFromSubReason(subReason: SubReason?): String { @@ -85,4 +84,4 @@ class SubReasonApiMapper @Inject constructor() { private const val GENERIC = "submit" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt index 4dd644a7478c..6310eb87d8dc 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt @@ -40,7 +40,6 @@ import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import timber.log.Timber - class FeedbackActivity : DuckDuckGoActivity(), InitialFeedbackFragment.InitialFeedbackListener, PositiveFeedbackLandingFragment.PositiveFeedbackLandingListener, diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt index a23b0ad997d1..38c3befa78f0 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt @@ -25,7 +25,6 @@ import com.duckduckgo.app.global.ViewModelFactory import dagger.android.support.AndroidSupportInjection import javax.inject.Inject - abstract class FeedbackFragment : Fragment() { @Inject @@ -46,4 +45,4 @@ abstract class FeedbackFragment : Fragment() { open fun configureListeners() {} protected inline fun bindViewModel() = lazy { ViewModelProvider(this, viewModelFactory).get(V::class.java) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt index 3e8cbf753687..2f7016c5b358 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt @@ -32,7 +32,6 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import timber.log.Timber - class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val feedbackSubmitter: FeedbackSubmitter) : ViewModel() { val command: SingleLiveEvent = SingleLiveEvent() @@ -45,7 +44,6 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val private val currentViewState: UpdateViewCommand get() = updateViewCommand.value!! - fun userSelectedNegativeFeedbackMainReason(mainReason: MainReason) { val newState = when (mainReason) { MainReason.MISSING_BROWSING_FEATURES -> NegativeFeedbackSubReason(NAVIGATION_FORWARDS, mainReason) @@ -283,4 +281,4 @@ data class UpdateViewCommand( val previousViewState: FragmentState? = null, val mainReason: MainReason? = null, val subReason: SubReason? = null -) \ No newline at end of file +) diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/LayoutScrollingTouchListener.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/LayoutScrollingTouchListener.kt index 1ba4d5a5fd26..e73879d75f30 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/LayoutScrollingTouchListener.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/LayoutScrollingTouchListener.kt @@ -20,7 +20,6 @@ import android.view.MotionEvent import android.view.View import android.widget.ScrollView - class LayoutScrollingTouchListener(private val scrollView: ScrollView, private val desiredScrollPosition: Int) : View.OnTouchListener { override fun onTouch(v: View?, event: MotionEvent?): Boolean { @@ -35,4 +34,4 @@ class LayoutScrollingTouchListener(private val scrollView: ScrollView, private v private const val POST_DELAY_MS = 300L } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt index 1212cc219e15..97f97a8cc7a4 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt @@ -29,7 +29,6 @@ import com.duckduckgo.app.settings.db.SettingsDataStore import kotlinx.android.synthetic.main.content_feedback.* import javax.inject.Inject - class InitialFeedbackFragment : FeedbackFragment() { @Inject @@ -82,4 +81,4 @@ class InitialFeedbackFragment : FeedbackFragment() { return InitialFeedbackFragment() } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackType.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackType.kt index 031043ca6aa0..f2ece02f861a 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackType.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackType.kt @@ -41,7 +41,7 @@ sealed class FeedbackType { OTHER } - enum class SearchNotGoodEnoughSubReasons : SubReason { + enum class SearchNotGoodEnoughSubReasons : SubReason { PROGRAMMING_TECHNICAL_SEARCHES, LAYOUT_MORE_LIKE_GOOGLE, FASTER_LOAD_TIME, @@ -50,7 +50,7 @@ sealed class FeedbackType { OTHER } - enum class CustomizationSubReasons : SubReason { + enum class CustomizationSubReasons : SubReason { HOME_SCREEN_CONFIGURATION, TAB_DISPLAY, HOW_APP_LOOKS, @@ -60,10 +60,10 @@ sealed class FeedbackType { OTHER } - enum class PerformanceSubReasons : SubReason { + enum class PerformanceSubReasons : SubReason { SLOW_WEB_PAGE_LOADS, APP_CRASHES_OR_FREEZES, MEDIA_PLAYBACK_BUGS, OTHER } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt index ab8382be994e..150a51b81c9d 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt @@ -210,4 +210,4 @@ class FeedbackTypeDisplay { } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt index 4406678865a5..39c24aec7b39 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt @@ -27,7 +27,6 @@ import com.duckduckgo.app.feedback.ui.common.FeedbackFragment import com.duckduckgo.app.feedback.ui.common.LayoutScrollingTouchListener import kotlinx.android.synthetic.main.content_feedback_negative_broken_site_feedback.* - class BrokenSiteNegativeFeedbackFragment : FeedbackFragment() { interface BrokenSiteFeedbackListener { @@ -77,4 +76,4 @@ class BrokenSiteNegativeFeedbackFragment : FeedbackFragment() { return BrokenSiteNegativeFeedbackFragment() } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackViewModel.kt index e603100be98f..643bc677f8ed 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackViewModel.kt @@ -19,7 +19,6 @@ package com.duckduckgo.app.feedback.ui.negative.brokensite import androidx.lifecycle.ViewModel import com.duckduckgo.app.global.SingleLiveEvent - class BrokenSiteNegativeFeedbackViewModel : ViewModel() { val command: SingleLiveEvent = SingleLiveEvent() @@ -33,4 +32,3 @@ class BrokenSiteNegativeFeedbackViewModel : ViewModel() { object Exit : Command() } } - diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonAdapter.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonAdapter.kt index 44aaac1e31d1..ec40364f0cc7 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonAdapter.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonAdapter.kt @@ -27,7 +27,6 @@ import com.duckduckgo.app.browser.R import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.FeedbackTypeMainReasonDisplay import kotlinx.android.synthetic.main.item_feedback_reason.view.* - class MainReasonAdapter(private val itemClickListener: (FeedbackTypeMainReasonDisplay) -> Unit) : ListAdapter(DiffCallback()) { @@ -59,4 +58,4 @@ class MainReasonAdapter(private val itemClickListener: (FeedbackTypeMainReasonDi } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt index da6c8d235cea..789786c3dc42 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt @@ -30,7 +30,6 @@ import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.FeedbackTypeMainReasonDisplay import kotlinx.android.synthetic.main.content_feedback_negative_disambiguation_main_reason.* - class MainReasonNegativeFeedbackFragment : FeedbackFragment() { private lateinit var recyclerAdapter: MainReasonAdapter @@ -38,6 +37,7 @@ class MainReasonNegativeFeedbackFragment : FeedbackFragment() { fun userSelectedNegativeFeedbackMainReason(type: MainReason) } + private val listener: MainReasonNegativeFeedbackListener? get() = activity as MainReasonNegativeFeedbackListener @@ -66,7 +66,6 @@ class MainReasonNegativeFeedbackFragment : FeedbackFragment() { } } - private fun getMainReasonsDisplayText(): List { return MainReason.values().mapNotNull { FeedbackTypeDisplay.mainReasons[it] @@ -79,4 +78,4 @@ class MainReasonNegativeFeedbackFragment : FeedbackFragment() { return MainReasonNegativeFeedbackFragment() } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt index 2b4c93e9c347..b96dbaaf27d2 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt @@ -32,7 +32,6 @@ import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.Companion.sub import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedNegativeFeedbackViewModel.Command import kotlinx.android.synthetic.main.content_feedback_open_ended_feedback.* - class ShareOpenEndedFeedbackFragment : FeedbackFragment() { interface OpenEndedFeedbackListener { @@ -165,4 +164,4 @@ class ShareOpenEndedFeedbackFragment : FeedbackFragment() { return fragment } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt index 797cb240642d..8b9e7c93fd12 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt @@ -21,13 +21,12 @@ import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SubReason import com.duckduckgo.app.global.SingleLiveEvent - class ShareOpenEndedNegativeFeedbackViewModel : ViewModel() { val command: SingleLiveEvent = SingleLiveEvent() fun userSubmittingPositiveFeedback(feedback: String) { - command.value = Command.ExitAndSubmitPositiveFeedback(feedback) + command.value = Command.ExitAndSubmitPositiveFeedback(feedback) } fun userSubmittingNegativeFeedback(mainReason: MainReason, subReason: SubReason?, openEndedComment: String) { @@ -40,4 +39,3 @@ class ShareOpenEndedNegativeFeedbackViewModel : ViewModel() { object Exit : Command() } } - diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonAdapter.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonAdapter.kt index 957b19aa7f8a..702797cdcc96 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonAdapter.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonAdapter.kt @@ -27,7 +27,6 @@ import com.duckduckgo.app.browser.R import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.FeedbackTypeSubReasonDisplay import kotlinx.android.synthetic.main.item_feedback_reason.view.* - class SubReasonAdapter(private val itemClickListener: (FeedbackTypeSubReasonDisplay) -> Unit) : ListAdapter(DiffCallback()) { @@ -59,4 +58,4 @@ class SubReasonAdapter(private val itemClickListener: (FeedbackTypeSubReasonDisp } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt index a9a85bbde55f..25774ff91452 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt @@ -33,7 +33,6 @@ import com.duckduckgo.app.feedback.ui.negative.displayText import kotlinx.android.synthetic.main.content_feedback_negative_disambiguation_sub_reason.* import timber.log.Timber - class SubReasonNegativeFeedbackFragment : FeedbackFragment() { private lateinit var recyclerAdapter: SubReasonAdapter @@ -83,7 +82,6 @@ class SubReasonNegativeFeedbackFragment : FeedbackFragment() { recyclerView.adapter = recyclerAdapter recyclerView.addItemDecoration(FeedbackItemDecoration(ContextCompat.getDrawable(it, R.drawable.feedback_list_divider)!!)) - arguments?.let { args -> mainReason = args.getSerializable(MAIN_REASON_EXTRA) as MainReason diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt index 2e15d9ed0a4e..21e3a1fcb15e 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt @@ -27,7 +27,6 @@ import com.duckduckgo.app.playstore.PlayStoreUtils import kotlinx.android.synthetic.main.content_feedback_positive_landing.* import javax.inject.Inject - class PositiveFeedbackLandingFragment : FeedbackFragment() { interface PositiveFeedbackLandingListener { @@ -80,4 +79,4 @@ class PositiveFeedbackLandingFragment : FeedbackFragment() { return PositiveFeedbackLandingFragment() } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt index 5c7624447b6c..8a4b72fb89ac 100644 --- a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt @@ -19,7 +19,6 @@ package com.duckduckgo.app.feedback.ui.positive.initial import androidx.lifecycle.ViewModel import com.duckduckgo.app.global.SingleLiveEvent - class PositiveFeedbackLandingViewModel : ViewModel() { val command: SingleLiveEvent = SingleLiveEvent() @@ -43,4 +42,4 @@ sealed class Command { object LaunchPlayStore : Command() object Exit : Command() object LaunchShareFeedbackPage : Command() -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/fire/AppCacheClearer.kt b/app/src/main/java/com/duckduckgo/app/fire/AppCacheClearer.kt index de55a8157821..0be721f1f387 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/AppCacheClearer.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/AppCacheClearer.kt @@ -20,7 +20,6 @@ import android.content.Context import com.duckduckgo.app.global.api.NetworkApiCache import com.duckduckgo.app.global.file.FileDeleter - interface AppCacheClearer { suspend fun clearCache() @@ -57,4 +56,4 @@ class AndroidAppCacheClearer(private val context: Context, private val fileDelet ) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/fire/AutomaticDataClearer.kt b/app/src/main/java/com/duckduckgo/app/fire/AutomaticDataClearer.kt index 712aac1f2712..b934692bdbc5 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/AutomaticDataClearer.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/AutomaticDataClearer.kt @@ -20,11 +20,7 @@ import android.os.Handler import android.os.SystemClock import androidx.annotation.UiThread import androidx.core.os.postDelayed -import androidx.lifecycle.Lifecycle -import androidx.lifecycle.LifecycleObserver -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.OnLifecycleEvent +import androidx.lifecycle.* import androidx.work.OneTimeWorkRequestBuilder import androidx.work.WorkManager import com.duckduckgo.app.global.ApplicationClearDataState @@ -34,11 +30,7 @@ import com.duckduckgo.app.global.view.ClearDataAction import com.duckduckgo.app.settings.clear.ClearWhatOption import com.duckduckgo.app.settings.clear.ClearWhenOption import com.duckduckgo.app.settings.db.SettingsDataStore -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext +import kotlinx.coroutines.* import timber.log.Timber import java.util.concurrent.TimeUnit import kotlin.coroutines.CoroutineContext @@ -219,4 +211,4 @@ class AutomaticDataClearer( return enoughTimePassed } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/fire/ClearWhenOptionExtension.kt b/app/src/main/java/com/duckduckgo/app/fire/ClearWhenOptionExtension.kt index f6f3737706a3..d3fd89899514 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/ClearWhenOptionExtension.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/ClearWhenOptionExtension.kt @@ -19,7 +19,6 @@ package com.duckduckgo.app.fire import com.duckduckgo.app.settings.clear.ClearWhenOption import java.util.concurrent.TimeUnit - fun ClearWhenOption.durationMilliseconds(): Long { return when (this) { ClearWhenOption.APP_EXIT_ONLY -> 0 @@ -29,4 +28,4 @@ fun ClearWhenOption.durationMilliseconds(): Long { ClearWhenOption.APP_EXIT_OR_60_MINS -> TimeUnit.MINUTES.toMillis(60) ClearWhenOption.APP_EXIT_OR_5_SECONDS -> TimeUnit.SECONDS.toMillis(5) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/fire/CookieRemover.kt b/app/src/main/java/com/duckduckgo/app/fire/CookieRemover.kt index cb68c450e237..3a2642a6044f 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/CookieRemover.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/CookieRemover.kt @@ -126,4 +126,3 @@ class SQLCookieRemover( } } } - diff --git a/app/src/main/java/com/duckduckgo/app/fire/DataClearerTimeKeeper.kt b/app/src/main/java/com/duckduckgo/app/fire/DataClearerTimeKeeper.kt index 163d9d959ccb..971ceb104960 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/DataClearerTimeKeeper.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/DataClearerTimeKeeper.kt @@ -38,4 +38,4 @@ class DataClearerTimeKeeper : BackgroundTimeKeeper { private fun timeSinceAppBackgrounded(timeNow: Long, backgroundedTimestamp: Long): Long { return timeNow - backgroundedTimestamp } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/fire/DataClearingWorker.kt b/app/src/main/java/com/duckduckgo/app/fire/DataClearingWorker.kt index 83a882d386fc..101e8bf3acee 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/DataClearingWorker.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/DataClearingWorker.kt @@ -29,7 +29,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import timber.log.Timber - class DataClearingWorker(context: Context, workerParams: WorkerParameters) : CoroutineWorker(context, workerParams), CoroutineScope { lateinit var settingsDataStore: SettingsDataStore @@ -88,4 +87,3 @@ class DataClearingWorker(context: Context, workerParams: WorkerParameters) : Cor const val WORK_REQUEST_TAG = "background-clear-data" } } - diff --git a/app/src/main/java/com/duckduckgo/app/fire/DatabaseLocator.kt b/app/src/main/java/com/duckduckgo/app/fire/DatabaseLocator.kt index 8730d5fc169e..3bc58a71f941 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/DatabaseLocator.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/DatabaseLocator.kt @@ -40,4 +40,4 @@ class WebViewDatabaseLocator(private val context: Context) : DatabaseLocator { "$dataDir$nonEmptyPath" }.orEmpty() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/fire/DuckDuckGoCookieManager.kt b/app/src/main/java/com/duckduckgo/app/fire/DuckDuckGoCookieManager.kt index 628fc51e9bf8..8d31049bc804 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/DuckDuckGoCookieManager.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/DuckDuckGoCookieManager.kt @@ -73,4 +73,4 @@ class WebViewCookieManager( override fun flush() { cookieManager.flush() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/fire/RemoveCookiesStrategy.kt b/app/src/main/java/com/duckduckgo/app/fire/RemoveCookiesStrategy.kt index 8f173c0d7658..f28fcd4a5767 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/RemoveCookiesStrategy.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/RemoveCookiesStrategy.kt @@ -30,4 +30,4 @@ class RemoveCookies( cookieManagerRemover.removeCookies() } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/fire/UnsentForgetAllPixelStore.kt b/app/src/main/java/com/duckduckgo/app/fire/UnsentForgetAllPixelStore.kt index 803200aa9e80..d3ccc88c9ce2 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/UnsentForgetAllPixelStore.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/UnsentForgetAllPixelStore.kt @@ -22,7 +22,6 @@ import androidx.annotation.VisibleForTesting import androidx.core.content.edit import javax.inject.Inject - interface UnsentForgetAllPixelStore { val pendingPixelCountClearData: Int val lastClearTimestamp: Long @@ -69,4 +68,4 @@ class UnsentForgetAllPixelStoreSharedPreferences @Inject constructor(private val const val KEY_UNSENT_CLEAR_PIXELS = "KEY_UNSENT_CLEAR_PIXELS" const val KEY_TIMESTAMP_LAST_CLEARED = "KEY_TIMESTAMP_LAST_CLEARED" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/data/FireproofWebsiteDao.kt b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/data/FireproofWebsiteDao.kt index 23412a474498..d6e82ec4be41 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/data/FireproofWebsiteDao.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/data/FireproofWebsiteDao.kt @@ -33,4 +33,4 @@ interface FireproofWebsiteDao { @Delete fun delete(fireproofWebsiteEntity: FireproofWebsiteEntity): Int -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/data/FireproofWebsiteEntity.kt b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/data/FireproofWebsiteEntity.kt index 157736b89a14..15bd646d6538 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/data/FireproofWebsiteEntity.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/data/FireproofWebsiteEntity.kt @@ -29,4 +29,4 @@ data class FireproofWebsiteEntity( fun FireproofWebsiteEntity.website(): String { return domain.takeIf { it.startsWith(WWW_PREFIX, ignoreCase = true) } ?.drop(WWW_PREFIX.length) ?: domain -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsiteAdapter.kt b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsiteAdapter.kt index 42f83ba264cf..05719bdf8c71 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsiteAdapter.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsiteAdapter.kt @@ -159,4 +159,4 @@ sealed class FireproofWebSiteViewHolder(itemView: View) : RecyclerView.ViewHolde viewModel.onDeleteRequested(entity) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt index 29ecc94a6b5d..0fba754e4dfc 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt @@ -85,4 +85,4 @@ class FireproofWebsitesActivity : DuckDuckGoActivity() { return Intent(context, FireproofWebsitesActivity::class.java) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt index 21d31bada978..8e5654755cee 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt @@ -72,4 +72,4 @@ class FireproofWebsitesViewModel( pixel.fire(FIREPROOF_WEBSITE_DELETED) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/AlertingUncaughtExceptionHandler.kt b/app/src/main/java/com/duckduckgo/app/global/AlertingUncaughtExceptionHandler.kt index d2366571e4cd..a559b8c35cb2 100644 --- a/app/src/main/java/com/duckduckgo/app/global/AlertingUncaughtExceptionHandler.kt +++ b/app/src/main/java/com/duckduckgo/app/global/AlertingUncaughtExceptionHandler.kt @@ -76,4 +76,4 @@ class AlertingUncaughtExceptionHandler( } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/AppUrl.kt b/app/src/main/java/com/duckduckgo/app/global/AppUrl.kt index bf41bebba264..b5e8d5aca61c 100644 --- a/app/src/main/java/com/duckduckgo/app/global/AppUrl.kt +++ b/app/src/main/java/com/duckduckgo/app/global/AppUrl.kt @@ -16,7 +16,6 @@ package com.duckduckgo.app.global - class AppUrl { object Url { @@ -42,4 +41,4 @@ class AppUrl { const val SOURCE = "ddg_android" const val SOURCE_EU_AUCTION = "ddg_androideu" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/ApplicationClearDataState.kt b/app/src/main/java/com/duckduckgo/app/global/ApplicationClearDataState.kt index 40556b778f94..f3b64661b6b7 100644 --- a/app/src/main/java/com/duckduckgo/app/global/ApplicationClearDataState.kt +++ b/app/src/main/java/com/duckduckgo/app/global/ApplicationClearDataState.kt @@ -19,4 +19,4 @@ package com.duckduckgo.app.global enum class ApplicationClearDataState { INITIALIZING, FINISHED -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/DispatcherProvider.kt b/app/src/main/java/com/duckduckgo/app/global/DispatcherProvider.kt index 4801526fde38..a4da73920e8e 100644 --- a/app/src/main/java/com/duckduckgo/app/global/DispatcherProvider.kt +++ b/app/src/main/java/com/duckduckgo/app/global/DispatcherProvider.kt @@ -19,7 +19,6 @@ package com.duckduckgo.app.global import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers - interface DispatcherProvider { fun main(): CoroutineDispatcher = Dispatchers.Main @@ -29,4 +28,4 @@ interface DispatcherProvider { } -class DefaultDispatcherProvider : DispatcherProvider \ No newline at end of file +class DefaultDispatcherProvider : DispatcherProvider diff --git a/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoActivity.kt b/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoActivity.kt index fd4fb5983540..3668b5bee7fc 100644 --- a/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoActivity.kt @@ -30,7 +30,6 @@ import com.duckduckgo.app.settings.db.SettingsDataStore import dagger.android.AndroidInjection import javax.inject.Inject - abstract class DuckDuckGoActivity : AppCompatActivity() { @Inject diff --git a/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt b/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt index d59aed194719..8059dfe94fac 100644 --- a/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt +++ b/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt @@ -302,5 +302,4 @@ open class DuckDuckGoApplication : HasAndroidInjector, Application(), LifecycleO private const val APP_RESTART_CAUSED_BY_FIRE_GRACE_PERIOD: Long = 10_000L } - -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/HashUtilities.kt b/app/src/main/java/com/duckduckgo/app/global/HashUtilities.kt index 7b1ced28ca1b..58119e894097 100644 --- a/app/src/main/java/com/duckduckgo/app/global/HashUtilities.kt +++ b/app/src/main/java/com/duckduckgo/app/global/HashUtilities.kt @@ -22,7 +22,6 @@ import java.security.MessageDigest val ByteArray.sha256: String get() = sha("SHA-256", this) - fun ByteArray.verifySha256(sha256: String): Boolean { return this.sha256 == sha256 } @@ -38,4 +37,4 @@ private fun sha(algorithm: String, bytes: ByteArray): String { fun String.verifySha1(sha1: String): Boolean { return this.sha1 == sha1 -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/IntentExtension.kt b/app/src/main/java/com/duckduckgo/app/global/IntentExtension.kt index 00a7ea26ac54..6f054eb9c560 100644 --- a/app/src/main/java/com/duckduckgo/app/global/IntentExtension.kt +++ b/app/src/main/java/com/duckduckgo/app/global/IntentExtension.kt @@ -21,4 +21,4 @@ import android.content.Intent val Intent.intentText: String? get() { return data?.toString() ?: getStringExtra(Intent.EXTRA_TEXT) - } \ No newline at end of file + } diff --git a/app/src/main/java/com/duckduckgo/app/global/ThreadExtension.kt b/app/src/main/java/com/duckduckgo/app/global/ThreadExtension.kt index d0f425b66169..cc309ece9f49 100644 --- a/app/src/main/java/com/duckduckgo/app/global/ThreadExtension.kt +++ b/app/src/main/java/com/duckduckgo/app/global/ThreadExtension.kt @@ -18,6 +18,5 @@ package com.duckduckgo.app.global import android.os.Looper - fun Thread.isAndroidMainThread(): Boolean = - Thread.currentThread().id == Looper.getMainLooper().thread.id \ No newline at end of file + Thread.currentThread().id == Looper.getMainLooper().thread.id diff --git a/app/src/main/java/com/duckduckgo/app/global/UrlScheme.kt b/app/src/main/java/com/duckduckgo/app/global/UrlScheme.kt index 86527443fd39..9a932ecb7047 100644 --- a/app/src/main/java/com/duckduckgo/app/global/UrlScheme.kt +++ b/app/src/main/java/com/duckduckgo/app/global/UrlScheme.kt @@ -16,10 +16,9 @@ package com.duckduckgo.app.global - class UrlScheme { companion object { const val https = "https" const val http = "http" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt index d93f513c62f3..80e63db57fe1 100644 --- a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt +++ b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt @@ -72,7 +72,6 @@ import com.duckduckgo.app.usage.search.SearchCountDao import com.duckduckgo.app.widget.ui.AddWidgetInstructionsViewModel import javax.inject.Inject - @Suppress("UNCHECKED_CAST") class ViewModelFactory @Inject constructor( private val statisticsUpdater: StatisticsUpdater, diff --git a/app/src/main/java/com/duckduckgo/app/global/api/ApiRequestInterceptor.kt b/app/src/main/java/com/duckduckgo/app/global/api/ApiRequestInterceptor.kt index 788587c216a9..acc9313363ca 100644 --- a/app/src/main/java/com/duckduckgo/app/global/api/ApiRequestInterceptor.kt +++ b/app/src/main/java/com/duckduckgo/app/global/api/ApiRequestInterceptor.kt @@ -35,4 +35,4 @@ class ApiRequestInterceptor(context: Context) : Interceptor { return chain.proceed(request) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/api/Header.kt b/app/src/main/java/com/duckduckgo/app/global/api/Header.kt index 28600c190207..a1d584715e17 100644 --- a/app/src/main/java/com/duckduckgo/app/global/api/Header.kt +++ b/app/src/main/java/com/duckduckgo/app/global/api/Header.kt @@ -18,4 +18,4 @@ package com.duckduckgo.app.global.api object Header { const val USER_AGENT = "User-Agent" -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/api/NetworkApiCache.kt b/app/src/main/java/com/duckduckgo/app/global/api/NetworkApiCache.kt index f146d014f471..3dc86f5a3fcd 100644 --- a/app/src/main/java/com/duckduckgo/app/global/api/NetworkApiCache.kt +++ b/app/src/main/java/com/duckduckgo/app/global/api/NetworkApiCache.kt @@ -16,10 +16,9 @@ package com.duckduckgo.app.global.api - class NetworkApiCache { companion object { const val FILE_NAME = "okHttpCache" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/api/ResponseExtension.kt b/app/src/main/java/com/duckduckgo/app/global/api/ResponseExtension.kt index 5b1798674415..5e674c4ef285 100644 --- a/app/src/main/java/com/duckduckgo/app/global/api/ResponseExtension.kt +++ b/app/src/main/java/com/duckduckgo/app/global/api/ResponseExtension.kt @@ -20,4 +20,4 @@ import retrofit2.Response import java.net.HttpURLConnection.HTTP_NOT_MODIFIED val Response.isCached: Boolean - get() = raw().cacheResponse() != null && (raw().networkResponse()?.code() == null || raw().networkResponse()?.code() == HTTP_NOT_MODIFIED) \ No newline at end of file + get() = raw().cacheResponse() != null && (raw().networkResponse()?.code() == null || raw().networkResponse()?.code() == HTTP_NOT_MODIFIED) diff --git a/app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt b/app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt index a5d3cf98a238..cf634d945d9a 100644 --- a/app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt +++ b/app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt @@ -330,4 +330,4 @@ class MigrationsProvider(val context: Context) { return preferences.getInt(keyVersion, 0) < currentVersion } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/device/Device.kt b/app/src/main/java/com/duckduckgo/app/global/device/Device.kt index ed6fb7ec3471..5e6684982d28 100644 --- a/app/src/main/java/com/duckduckgo/app/global/device/Device.kt +++ b/app/src/main/java/com/duckduckgo/app/global/device/Device.kt @@ -67,4 +67,4 @@ class ContextDeviceInfo @Inject constructor(private val context: Context) : Devi val tabletSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 600f, context.resources.displayMetrics).toInt() return if (smallestSize >= tabletSize) DeviceInfo.FormFactor.TABLET else DeviceInfo.FormFactor.PHONE } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/dialog/BackKeyListener.kt b/app/src/main/java/com/duckduckgo/app/global/dialog/BackKeyListener.kt index fe8f4aa53012..e29e6f26f793 100644 --- a/app/src/main/java/com/duckduckgo/app/global/dialog/BackKeyListener.kt +++ b/app/src/main/java/com/duckduckgo/app/global/dialog/BackKeyListener.kt @@ -19,7 +19,6 @@ package com.duckduckgo.app.global.dialog import android.content.DialogInterface import android.view.KeyEvent - class BackKeyListener(private val onBackPressed: () -> Unit) : DialogInterface.OnKeyListener { override fun onKey(dialog: DialogInterface?, keyCode: Int, event: KeyEvent?): Boolean { @@ -34,4 +33,4 @@ class BackKeyListener(private val onBackPressed: () -> Unit) : DialogInterface.O private fun isBackKey(keyCode: Int, event: KeyEvent?): Boolean { return (keyCode == KeyEvent.KEYCODE_BACK && event?.action == KeyEvent.ACTION_UP) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/exception/ExceptionExtension.kt b/app/src/main/java/com/duckduckgo/app/global/exception/ExceptionExtension.kt index 4daca3476e06..e2052e6a3fa3 100644 --- a/app/src/main/java/com/duckduckgo/app/global/exception/ExceptionExtension.kt +++ b/app/src/main/java/com/duckduckgo/app/global/exception/ExceptionExtension.kt @@ -21,4 +21,4 @@ fun Throwable?.extractExceptionCause(): String { return "Exception missing" } return "${this.javaClass.name} - ${this.stackTrace?.firstOrNull()}" -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/exception/RootExceptionFinder.kt b/app/src/main/java/com/duckduckgo/app/global/exception/RootExceptionFinder.kt index 8a94a7d471a1..db4838ac9a55 100644 --- a/app/src/main/java/com/duckduckgo/app/global/exception/RootExceptionFinder.kt +++ b/app/src/main/java/com/duckduckgo/app/global/exception/RootExceptionFinder.kt @@ -16,7 +16,6 @@ package com.duckduckgo.app.global.exception - class RootExceptionFinder { fun findRootException(throwable: Throwable?): Throwable? { @@ -36,4 +35,4 @@ class RootExceptionFinder { // arbitrary limit to protect against recursive nested Exceptions private const val NESTED_EXCEPTION_THRESHOLD = 20 } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/exception/UncaughtExceptionDao.kt b/app/src/main/java/com/duckduckgo/app/global/exception/UncaughtExceptionDao.kt index 823aa5c3836f..79d6df90f007 100644 --- a/app/src/main/java/com/duckduckgo/app/global/exception/UncaughtExceptionDao.kt +++ b/app/src/main/java/com/duckduckgo/app/global/exception/UncaughtExceptionDao.kt @@ -58,4 +58,4 @@ class UncaughtExceptionSourceConverter { @TypeConverter fun convertFromDb(value: String): UncaughtExceptionSource? = UncaughtExceptionSource.valueOf(value) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/exception/UncaughtExceptionEntity.kt b/app/src/main/java/com/duckduckgo/app/global/exception/UncaughtExceptionEntity.kt index b5df40a0e9f2..74cfad88881d 100644 --- a/app/src/main/java/com/duckduckgo/app/global/exception/UncaughtExceptionEntity.kt +++ b/app/src/main/java/com/duckduckgo/app/global/exception/UncaughtExceptionEntity.kt @@ -38,4 +38,4 @@ data class UncaughtExceptionEntity( timeZone = TimeZone.getTimeZone("UTC") } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/exception/UncaughtExceptionModule.kt b/app/src/main/java/com/duckduckgo/app/global/exception/UncaughtExceptionModule.kt index c07c05ac07bd..459adeedf991 100644 --- a/app/src/main/java/com/duckduckgo/app/global/exception/UncaughtExceptionModule.kt +++ b/app/src/main/java/com/duckduckgo/app/global/exception/UncaughtExceptionModule.kt @@ -23,7 +23,6 @@ import dagger.Module import dagger.Provides import javax.inject.Singleton - @Module class UncaughtExceptionModule { @@ -49,4 +48,4 @@ class UncaughtExceptionModule { @Provides fun rootExceptionFinder() = RootExceptionFinder() -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/exception/UncaughtExceptionRepository.kt b/app/src/main/java/com/duckduckgo/app/global/exception/UncaughtExceptionRepository.kt index 19f5035ff258..28d3af2c4a6e 100644 --- a/app/src/main/java/com/duckduckgo/app/global/exception/UncaughtExceptionRepository.kt +++ b/app/src/main/java/com/duckduckgo/app/global/exception/UncaughtExceptionRepository.kt @@ -60,4 +60,4 @@ class UncaughtExceptionRepositoryDb( uncaughtExceptionDao.delete(id) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/file/FileDeleter.kt b/app/src/main/java/com/duckduckgo/app/global/file/FileDeleter.kt index 3b13d9f79c69..af7cad0fad8b 100644 --- a/app/src/main/java/com/duckduckgo/app/global/file/FileDeleter.kt +++ b/app/src/main/java/com/duckduckgo/app/global/file/FileDeleter.kt @@ -20,7 +20,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.io.File - interface FileDeleter { /** @@ -51,4 +50,4 @@ class AndroidFileDeleter : FileDeleter { directoryToDelete.deleteRecursively() } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/image/AppGlideModule.kt b/app/src/main/java/com/duckduckgo/app/global/image/GlobalGlideModule.kt similarity index 94% rename from app/src/main/java/com/duckduckgo/app/global/image/AppGlideModule.kt rename to app/src/main/java/com/duckduckgo/app/global/image/GlobalGlideModule.kt index a8ee87438439..479fc924205a 100644 --- a/app/src/main/java/com/duckduckgo/app/global/image/AppGlideModule.kt +++ b/app/src/main/java/com/duckduckgo/app/global/image/GlobalGlideModule.kt @@ -19,6 +19,5 @@ package com.duckduckgo.app.global.image import com.bumptech.glide.annotation.GlideModule import com.bumptech.glide.module.AppGlideModule - @GlideModule -class GlobalGlideModule : AppGlideModule() \ No newline at end of file +class GlobalGlideModule : AppGlideModule() diff --git a/app/src/main/java/com/duckduckgo/app/global/initialization/AppDataLoader.kt b/app/src/main/java/com/duckduckgo/app/global/initialization/AppDataLoader.kt index c937066ac4be..bb00ea1bae32 100644 --- a/app/src/main/java/com/duckduckgo/app/global/initialization/AppDataLoader.kt +++ b/app/src/main/java/com/duckduckgo/app/global/initialization/AppDataLoader.kt @@ -21,7 +21,6 @@ import com.duckduckgo.app.privacy.store.TermsOfServiceStore import timber.log.Timber import javax.inject.Inject - class AppDataLoader @Inject constructor( private val termsOfServiceStore: TermsOfServiceStore, private val privacyPractices: PrivacyPractices @@ -33,4 +32,4 @@ class AppDataLoader @Inject constructor( privacyPractices.loadData() Timber.i("Finished loading app data") } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/initialization/DataLoadable.kt b/app/src/main/java/com/duckduckgo/app/global/initialization/DataLoadable.kt index 3dd7b3c82ced..12e23edc9068 100644 --- a/app/src/main/java/com/duckduckgo/app/global/initialization/DataLoadable.kt +++ b/app/src/main/java/com/duckduckgo/app/global/initialization/DataLoadable.kt @@ -16,9 +16,8 @@ package com.duckduckgo.app.global.initialization - interface DataLoadable { suspend fun loadData() -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/install/AppInstallStore.kt b/app/src/main/java/com/duckduckgo/app/global/install/AppInstallStore.kt index f80c2a1a9813..5addc07db47f 100644 --- a/app/src/main/java/com/duckduckgo/app/global/install/AppInstallStore.kt +++ b/app/src/main/java/com/duckduckgo/app/global/install/AppInstallStore.kt @@ -23,7 +23,6 @@ import androidx.core.content.edit import java.util.concurrent.TimeUnit import javax.inject.Inject - interface AppInstallStore { var installTimestamp: Long @@ -64,4 +63,3 @@ class AppInstallSharedPreferences @Inject constructor(private val context: Conte const val KEY_DEFAULT_BROWSER = "KEY_DEFAULT_BROWSER" } } - diff --git a/app/src/main/java/com/duckduckgo/app/global/model/Site.kt b/app/src/main/java/com/duckduckgo/app/global/model/Site.kt index 96a17e76bf0a..92ad55dac0dd 100644 --- a/app/src/main/java/com/duckduckgo/app/global/model/Site.kt +++ b/app/src/main/java/com/duckduckgo/app/global/model/Site.kt @@ -71,4 +71,4 @@ fun Site.domainMatchesUrl(matchingUrl: String): Boolean { return uri?.baseHost == matchingUrl.toUri().baseHost } -val Site.domain get() = uri?.host \ No newline at end of file +val Site.domain get() = uri?.host diff --git a/app/src/main/java/com/duckduckgo/app/global/model/SiteFactory.kt b/app/src/main/java/com/duckduckgo/app/global/model/SiteFactory.kt index 1c82b1ccb167..81133d130563 100644 --- a/app/src/main/java/com/duckduckgo/app/global/model/SiteFactory.kt +++ b/app/src/main/java/com/duckduckgo/app/global/model/SiteFactory.kt @@ -24,7 +24,6 @@ import com.duckduckgo.app.trackerdetection.model.Entity import javax.inject.Inject import javax.inject.Singleton - @Singleton class SiteFactory @Inject constructor( private val privacyPractices: PrivacyPractices, @@ -55,8 +54,9 @@ class SiteFactory @Inject constructor( } data class SitePrivacyData( - val url: String, val practices: PrivacyPractices.Practices, + val url: String, + val practices: PrivacyPractices.Practices, val entity: Entity?, val prevalence: Double? ) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt b/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt index 1ae68c4721f3..70cfd2e9afea 100644 --- a/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt +++ b/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt @@ -14,7 +14,6 @@ * limitations under the License. */ - package com.duckduckgo.app.global.model import android.net.Uri @@ -149,4 +148,4 @@ class SiteMonitor( Grade.Grading.UNKNOWN -> PrivacyGrade.UNKNOWN } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/performance/Performance.kt b/app/src/main/java/com/duckduckgo/app/global/performance/Performance.kt index e09db7477454..13fbd8201701 100644 --- a/app/src/main/java/com/duckduckgo/app/global/performance/Performance.kt +++ b/app/src/main/java/com/duckduckgo/app/global/performance/Performance.kt @@ -31,4 +31,4 @@ inline fun measureExecution(logMessage: String, logLevel: Int = Log.DEBUG, f val difference = (System.nanoTime() - startTime) / PerformanceConstants.NANO_TO_MILLIS_DIVISOR Timber.log(logLevel, "$logMessage; took ${difference}ms") } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/rating/AppEnjoymentLifecycleObserver.kt b/app/src/main/java/com/duckduckgo/app/global/rating/AppEnjoymentLifecycleObserver.kt index e0d524868485..e00c5c8cd51e 100644 --- a/app/src/main/java/com/duckduckgo/app/global/rating/AppEnjoymentLifecycleObserver.kt +++ b/app/src/main/java/com/duckduckgo/app/global/rating/AppEnjoymentLifecycleObserver.kt @@ -35,8 +35,8 @@ class AppEnjoymentAppCreationObserver( @UiThread @OnLifecycleEvent(Lifecycle.Event.ON_START) fun onAppStart() { - GlobalScope.launch(Dispatchers.Main) { - appEnjoymentPromptEmitter.promptType.value = promptTypeDecider.determineInitialPromptType() - } + GlobalScope.launch(Dispatchers.Main) { + appEnjoymentPromptEmitter.promptType.value = promptTypeDecider.determineInitialPromptType() + } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/rating/AppEnjoymentPromptEmitter.kt b/app/src/main/java/com/duckduckgo/app/global/rating/AppEnjoymentPromptEmitter.kt index 668a059a3732..c1b97e9afdc7 100644 --- a/app/src/main/java/com/duckduckgo/app/global/rating/AppEnjoymentPromptEmitter.kt +++ b/app/src/main/java/com/duckduckgo/app/global/rating/AppEnjoymentPromptEmitter.kt @@ -18,7 +18,6 @@ package com.duckduckgo.app.global.rating import androidx.lifecycle.MutableLiveData - interface AppEnjoymentPromptEmitter { val promptType: MutableLiveData } @@ -27,4 +26,4 @@ class AppEnjoymentLiveDataEmitter : AppEnjoymentPromptEmitter { override val promptType: MutableLiveData = MutableLiveData() -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/rating/AppEnjoymentUserEventRecorder.kt b/app/src/main/java/com/duckduckgo/app/global/rating/AppEnjoymentUserEventRecorder.kt index ad05147d2c89..ac0213dfe4a5 100644 --- a/app/src/main/java/com/duckduckgo/app/global/rating/AppEnjoymentUserEventRecorder.kt +++ b/app/src/main/java/com/duckduckgo/app/global/rating/AppEnjoymentUserEventRecorder.kt @@ -19,7 +19,6 @@ package com.duckduckgo.app.global.rating import com.duckduckgo.app.browser.rating.db.AppEnjoymentRepository import timber.log.Timber - interface AppEnjoymentUserEventRecorder { fun onUserEnjoyingApp(promptCount: PromptCount) @@ -89,4 +88,4 @@ class AppEnjoymentUserEventDatabaseRecorder( private fun hideAllPrompts() { appEnjoymentPromptEmitter.promptType.value = AppEnjoymentPromptOptions.ShowNothing } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/rating/PromptTypeDecider.kt b/app/src/main/java/com/duckduckgo/app/global/rating/PromptTypeDecider.kt index 1d4dbf78038a..811d9eeb592a 100644 --- a/app/src/main/java/com/duckduckgo/app/global/rating/PromptTypeDecider.kt +++ b/app/src/main/java/com/duckduckgo/app/global/rating/PromptTypeDecider.kt @@ -26,7 +26,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import timber.log.Timber - interface PromptTypeDecider { suspend fun determineInitialPromptType(): AppEnjoymentPromptOptions } @@ -108,4 +107,4 @@ data class PromptCount(val value: Int) { fun first(): PromptCount = PromptCount(1) fun second(): PromptCount = PromptCount(2) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/rating/ShowInitialPromptDecider.kt b/app/src/main/java/com/duckduckgo/app/global/rating/ShowInitialPromptDecider.kt index 933a12126f7a..35280b79edd9 100644 --- a/app/src/main/java/com/duckduckgo/app/global/rating/ShowInitialPromptDecider.kt +++ b/app/src/main/java/com/duckduckgo/app/global/rating/ShowInitialPromptDecider.kt @@ -20,7 +20,6 @@ import com.duckduckgo.app.browser.rating.db.AppEnjoymentRepository import com.duckduckgo.app.usage.app.AppDaysUsedRepository import timber.log.Timber - interface ShowPromptDecider { suspend fun shouldShowPrompt(): Boolean } @@ -86,4 +85,4 @@ class SecondaryPromptDecider( return enoughDaysUsed } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/shortcut/AppShortcutCreator.kt b/app/src/main/java/com/duckduckgo/app/global/shortcut/AppShortcutCreator.kt index 2d5057e2b0f1..c5b7af279c58 100644 --- a/app/src/main/java/com/duckduckgo/app/global/shortcut/AppShortcutCreator.kt +++ b/app/src/main/java/com/duckduckgo/app/global/shortcut/AppShortcutCreator.kt @@ -30,7 +30,6 @@ import com.duckduckgo.app.browser.BrowserActivity import com.duckduckgo.app.browser.R import javax.inject.Inject - class AppShortcutCreator @Inject constructor() { @RequiresApi(Build.VERSION_CODES.N_MR1) @@ -88,4 +87,4 @@ class AppShortcutCreator @Inject constructor() { private const val SHORTCUT_ID_SHOW_BOOKMARKS = "showBookmarks" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/uri/UriSubdomainRemover.kt b/app/src/main/java/com/duckduckgo/app/global/uri/UriSubdomainRemover.kt index 716a9689a9f5..6318efd2da53 100644 --- a/app/src/main/java/com/duckduckgo/app/global/uri/UriSubdomainRemover.kt +++ b/app/src/main/java/com/duckduckgo/app/global/uri/UriSubdomainRemover.kt @@ -18,7 +18,6 @@ package com.duckduckgo.app.global.uri import android.net.Uri - fun Uri.removeSubdomain(): String? { val host = host ?: return null @@ -50,4 +49,4 @@ private fun Uri.appendScheme(newHost: String): String? { } else { "$scheme://$newHost" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/view/ActivityExtension.kt b/app/src/main/java/com/duckduckgo/app/global/view/ActivityExtension.kt index 540783f84c92..9833cf3e649a 100644 --- a/app/src/main/java/com/duckduckgo/app/global/view/ActivityExtension.kt +++ b/app/src/main/java/com/duckduckgo/app/global/view/ActivityExtension.kt @@ -69,4 +69,4 @@ fun FragmentActivity.toggleFullScreen() { fun FragmentActivity.isImmersiveModeEnabled(): Boolean { val uiOptions = window.decorView.systemUiVisibility return uiOptions or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY == uiOptions -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/view/ClearPersonalDataAction.kt b/app/src/main/java/com/duckduckgo/app/global/view/ClearPersonalDataAction.kt index 6f547f1824e6..90220d067363 100644 --- a/app/src/main/java/com/duckduckgo/app/global/view/ClearPersonalDataAction.kt +++ b/app/src/main/java/com/duckduckgo/app/global/view/ClearPersonalDataAction.kt @@ -112,4 +112,4 @@ class ClearPersonalDataAction @Inject constructor( settingsDataStore.appUsedSinceLastClear = appUsedSinceLastClear Timber.d("Set appUsedSinceClear flag to $appUsedSinceLastClear") } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/view/DaxDialog.kt b/app/src/main/java/com/duckduckgo/app/global/view/DaxDialog.kt index 03f3dae9d4d8..d35d9e276bb7 100644 --- a/app/src/main/java/com/duckduckgo/app/global/view/DaxDialog.kt +++ b/app/src/main/java/com/duckduckgo/app/global/view/DaxDialog.kt @@ -205,4 +205,4 @@ class TypewriterDaxDialog : DialogFragment(), DaxDialog { private const val ARG_DISMISSIBLE = "isDismissible" private const val ARG_TYPING_DELAY = "typingDelay" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/view/EditTextExtension.kt b/app/src/main/java/com/duckduckgo/app/global/view/EditTextExtension.kt index 550e98a2a345..2eb4d649a60b 100644 --- a/app/src/main/java/com/duckduckgo/app/global/view/EditTextExtension.kt +++ b/app/src/main/java/com/duckduckgo/app/global/view/EditTextExtension.kt @@ -18,11 +18,10 @@ package com.duckduckgo.app.global.view import android.widget.EditText - fun EditText.isDifferent(newInput: String?): Boolean = text.toString() != newInput fun EditText.updateIfDifferent(newInput: String) { if (isDifferent(newInput)) { setText(newInput) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/view/FireDialog.kt b/app/src/main/java/com/duckduckgo/app/global/view/FireDialog.kt index b88123951618..76588a6dc06f 100644 --- a/app/src/main/java/com/duckduckgo/app/global/view/FireDialog.kt +++ b/app/src/main/java/com/duckduckgo/app/global/view/FireDialog.kt @@ -53,4 +53,4 @@ class FireDialog(context: Context, private val clearPersonalDataAction: ClearPer dismiss() } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/view/NonDismissibleBehavior.kt b/app/src/main/java/com/duckduckgo/app/global/view/NonDismissibleBehavior.kt index 069909f9e3a0..7e2e471af976 100644 --- a/app/src/main/java/com/duckduckgo/app/global/view/NonDismissibleBehavior.kt +++ b/app/src/main/java/com/duckduckgo/app/global/view/NonDismissibleBehavior.kt @@ -21,4 +21,4 @@ import com.google.android.material.snackbar.BaseTransientBottomBar class NonDismissibleBehavior : BaseTransientBottomBar.Behavior() { override fun canSwipeDismissView(child: View) = false -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/view/TextChangedWatcher.kt b/app/src/main/java/com/duckduckgo/app/global/view/TextChangedWatcher.kt index bcc3491e082d..a139766a9446 100644 --- a/app/src/main/java/com/duckduckgo/app/global/view/TextChangedWatcher.kt +++ b/app/src/main/java/com/duckduckgo/app/global/view/TextChangedWatcher.kt @@ -19,7 +19,6 @@ package com.duckduckgo.app.global.view import android.text.Editable import android.text.TextWatcher - abstract class TextChangedWatcher : TextWatcher { abstract override fun afterTextChanged(editable: Editable) @@ -27,4 +26,4 @@ abstract class TextChangedWatcher : TextWatcher { override fun beforeTextChanged(p0: CharSequence, p1: Int, p2: Int, p3: Int) {} override fun onTextChanged(charSequence: CharSequence, start: Int, before: Int, count: Int) {} -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/view/TextViewExtension.kt b/app/src/main/java/com/duckduckgo/app/global/view/TextViewExtension.kt index 8857b91c039e..e3a709edbcb0 100644 --- a/app/src/main/java/com/duckduckgo/app/global/view/TextViewExtension.kt +++ b/app/src/main/java/com/duckduckgo/app/global/view/TextViewExtension.kt @@ -19,7 +19,6 @@ package com.duckduckgo.app.global.view import android.widget.TextView import androidx.annotation.DrawableRes - fun TextView.leftDrawable(@DrawableRes id: Int = 0) { this.setCompoundDrawablesWithIntrinsicBounds(id, 0, 0, 0) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/view/TypeAnimationTextView.kt b/app/src/main/java/com/duckduckgo/app/global/view/TypeAnimationTextView.kt index acf9ca2e05bd..8d459d4bad53 100644 --- a/app/src/main/java/com/duckduckgo/app/global/view/TypeAnimationTextView.kt +++ b/app/src/main/java/com/duckduckgo/app/global/view/TypeAnimationTextView.kt @@ -19,15 +19,13 @@ package com.duckduckgo.app.global.view import android.content.Context import android.util.AttributeSet import androidx.appcompat.widget.AppCompatTextView -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch +import kotlinx.coroutines.* import kotlin.coroutines.CoroutineContext class TypeAnimationTextView @JvmOverloads constructor( - context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 ) : AppCompatTextView(context, attrs, defStyleAttr), CoroutineScope { override val coroutineContext: CoroutineContext @@ -65,4 +63,4 @@ class TypeAnimationTextView @JvmOverloads constructor( cancelAnimation() super.onDetachedFromWindow() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/global/view/ViewExtension.kt b/app/src/main/java/com/duckduckgo/app/global/view/ViewExtension.kt index 278f617a4dc7..61d792dabbf6 100644 --- a/app/src/main/java/com/duckduckgo/app/global/view/ViewExtension.kt +++ b/app/src/main/java/com/duckduckgo/app/global/view/ViewExtension.kt @@ -21,7 +21,6 @@ import android.content.res.Resources import android.view.View import android.view.inputmethod.InputMethodManager - /* * Common view operations, simplified as Kotlin extensions * Based on https://github.com/ravidsrk/kotlinextensions.com diff --git a/app/src/main/java/com/duckduckgo/app/global/view/ViewStateConditionalRender.kt b/app/src/main/java/com/duckduckgo/app/global/view/ViewStateConditionalRender.kt index acb648d87a9c..0d582d39e61e 100644 --- a/app/src/main/java/com/duckduckgo/app/global/view/ViewStateConditionalRender.kt +++ b/app/src/main/java/com/duckduckgo/app/global/view/ViewStateConditionalRender.kt @@ -18,7 +18,6 @@ package com.duckduckgo.app.global.view import timber.log.Timber - /** * This method will execute the given lambda only if the given view states differ */ @@ -28,4 +27,4 @@ inline fun renderIfChanged(newViewState: Any, lastSeenViewState: Any?, block: () } else { block() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/httpsupgrade/BloomFilter.kt b/app/src/main/java/com/duckduckgo/app/httpsupgrade/BloomFilter.kt index b9a66bcab54b..6e595d375239 100644 --- a/app/src/main/java/com/duckduckgo/app/httpsupgrade/BloomFilter.kt +++ b/app/src/main/java/com/duckduckgo/app/httpsupgrade/BloomFilter.kt @@ -36,7 +36,6 @@ class BloomFilter { private external fun createBloomFilterFromFile(path: String, maxItems: Int): Long - fun add(element: String) { add(nativePointer, element) } @@ -55,4 +54,4 @@ class BloomFilter { } private external fun releaseBloomFilter(nativePointer: Long) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsBloomFilterFactory.kt b/app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsBloomFilterFactory.kt index a5941f03bc7a..a03484c16307 100644 --- a/app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsBloomFilterFactory.kt +++ b/app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsBloomFilterFactory.kt @@ -28,7 +28,6 @@ interface HttpsBloomFilterFactory { fun create(): BloomFilter? } - class HttpsBloomFilterFactoryImpl @Inject constructor(private val dao: HttpsBloomFilterSpecDao, private val binaryDataStore: BinaryDataStore) : HttpsBloomFilterFactory { @@ -56,4 +55,4 @@ class HttpsBloomFilterFactoryImpl @Inject constructor(private val dao: HttpsBloo return bloomFilter } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsUpgradeDataDownloader.kt b/app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsUpgradeDataDownloader.kt index 752d7eb082c0..f901885391f1 100644 --- a/app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsUpgradeDataDownloader.kt +++ b/app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsUpgradeDataDownloader.kt @@ -106,4 +106,4 @@ class HttpsUpgradeDataDownloader @Inject constructor( } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsWhitelistJsonAdapter.kt b/app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsWhitelistJsonAdapter.kt index 4a8d3f364e79..8fccf3ad10ac 100644 --- a/app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsWhitelistJsonAdapter.kt +++ b/app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsWhitelistJsonAdapter.kt @@ -26,4 +26,4 @@ class HttpsWhitelistJsonAdapter { return data.getValue("data").map { HttpsWhitelistedDomain(it) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/httpsupgrade/db/HttpsBloomFilterSpecDao.kt b/app/src/main/java/com/duckduckgo/app/httpsupgrade/db/HttpsBloomFilterSpecDao.kt index 613d580eeda9..6b62695cd34d 100644 --- a/app/src/main/java/com/duckduckgo/app/httpsupgrade/db/HttpsBloomFilterSpecDao.kt +++ b/app/src/main/java/com/duckduckgo/app/httpsupgrade/db/HttpsBloomFilterSpecDao.kt @@ -32,4 +32,4 @@ interface HttpsBloomFilterSpecDao { @Query("select * from https_bloom_filter_spec limit 1") fun get(): HttpsBloomFilterSpec? -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/httpsupgrade/db/HttpsWhitelistDao.kt b/app/src/main/java/com/duckduckgo/app/httpsupgrade/db/HttpsWhitelistDao.kt index 13b7059de3a1..46b4217342ca 100644 --- a/app/src/main/java/com/duckduckgo/app/httpsupgrade/db/HttpsWhitelistDao.kt +++ b/app/src/main/java/com/duckduckgo/app/httpsupgrade/db/HttpsWhitelistDao.kt @@ -41,4 +41,4 @@ abstract class HttpsWhitelistDao { @Query("select count(1) from https_whitelisted_domain") abstract fun count(): Int -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/httpsupgrade/di/HttpsUpgraderModule.kt b/app/src/main/java/com/duckduckgo/app/httpsupgrade/di/HttpsUpgraderModule.kt index b360b0dee927..5559d7bc3f58 100644 --- a/app/src/main/java/com/duckduckgo/app/httpsupgrade/di/HttpsUpgraderModule.kt +++ b/app/src/main/java/com/duckduckgo/app/httpsupgrade/di/HttpsUpgraderModule.kt @@ -49,4 +49,4 @@ class HttpsUpgraderModule { fun bloomFilterFactory(specificationDao: HttpsBloomFilterSpecDao, binaryDataStore: BinaryDataStore): HttpsBloomFilterFactory { return HttpsBloomFilterFactoryImpl(specificationDao, binaryDataStore) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/httpsupgrade/model/HttpsBloomFilterSpec.kt b/app/src/main/java/com/duckduckgo/app/httpsupgrade/model/HttpsBloomFilterSpec.kt index c6bf3b57c1f8..2c63c15f348a 100644 --- a/app/src/main/java/com/duckduckgo/app/httpsupgrade/model/HttpsBloomFilterSpec.kt +++ b/app/src/main/java/com/duckduckgo/app/httpsupgrade/model/HttpsBloomFilterSpec.kt @@ -19,7 +19,6 @@ package com.duckduckgo.app.httpsupgrade.model import androidx.room.Entity import androidx.room.PrimaryKey - @Entity(tableName = "https_bloom_filter_spec") data class HttpsBloomFilterSpec( @PrimaryKey val id: Int = 1, @@ -30,4 +29,4 @@ data class HttpsBloomFilterSpec( companion object { const val HTTPS_BINARY_FILE = "HTTPS_BINARY_FILE" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/httpsupgrade/model/HttpsWhitelistedDomain.kt b/app/src/main/java/com/duckduckgo/app/httpsupgrade/model/HttpsWhitelistedDomain.kt index 6949599cfeba..d83e9a6c99d4 100644 --- a/app/src/main/java/com/duckduckgo/app/httpsupgrade/model/HttpsWhitelistedDomain.kt +++ b/app/src/main/java/com/duckduckgo/app/httpsupgrade/model/HttpsWhitelistedDomain.kt @@ -22,4 +22,4 @@ import androidx.room.PrimaryKey @Entity(tableName = "https_whitelisted_domain") data class HttpsWhitelistedDomain( @PrimaryKey var domain: String -) \ No newline at end of file +) diff --git a/app/src/main/java/com/duckduckgo/app/icon/api/AppIconModifier.kt b/app/src/main/java/com/duckduckgo/app/icon/api/AppIconModifier.kt index e385a45f19ed..e324c2a4a28e 100644 --- a/app/src/main/java/com/duckduckgo/app/icon/api/AppIconModifier.kt +++ b/app/src/main/java/com/duckduckgo/app/icon/api/AppIconModifier.kt @@ -25,7 +25,6 @@ import com.duckduckgo.app.browser.BuildConfig import com.duckduckgo.app.browser.R import com.duckduckgo.app.global.shortcut.AppShortcutCreator import com.duckduckgo.app.icon.api.IconModifier.Companion.QUALIFIER -import com.duckduckgo.app.icon.ui.ChangeIconActivity import javax.inject.Inject interface IconModifier { diff --git a/app/src/main/java/com/duckduckgo/app/icon/ui/AppIconsAdapter.kt b/app/src/main/java/com/duckduckgo/app/icon/ui/AppIconsAdapter.kt index cda2246411c0..7c811726d8e7 100644 --- a/app/src/main/java/com/duckduckgo/app/icon/ui/AppIconsAdapter.kt +++ b/app/src/main/java/com/duckduckgo/app/icon/ui/AppIconsAdapter.kt @@ -20,11 +20,9 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ImageView -import androidx.annotation.Nullable -import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import com.duckduckgo.app.browser.R -import kotlinx.android.synthetic.main.item_tracker_network_header.view.icon +import kotlinx.android.synthetic.main.item_tracker_network_header.view.* class AppIconsAdapter(private val onClick: (ChangeIconViewModel.IconViewData) -> Unit) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt b/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt index 85da644eb39c..7df4c71f5934 100644 --- a/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt @@ -24,8 +24,8 @@ import androidx.lifecycle.Observer import androidx.recyclerview.widget.GridLayoutManager import com.duckduckgo.app.browser.R import com.duckduckgo.app.global.DuckDuckGoActivity -import kotlinx.android.synthetic.main.content_app_icons.appIconsList -import kotlinx.android.synthetic.main.include_toolbar.toolbar +import kotlinx.android.synthetic.main.content_app_icons.* +import kotlinx.android.synthetic.main.include_toolbar.* class ChangeIconActivity : DuckDuckGoActivity() { @@ -94,5 +94,3 @@ class ChangeIconActivity : DuckDuckGoActivity() { } } } - - diff --git a/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconViewModel.kt b/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconViewModel.kt index c8cf88955e3f..577b16f663da 100644 --- a/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconViewModel.kt @@ -73,4 +73,4 @@ class ChangeIconViewModel @Inject constructor( command.value = Command.IconChanged } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/icon/ui/ItemOffsetDecoration.kt b/app/src/main/java/com/duckduckgo/app/icon/ui/ItemOffsetDecoration.kt index ed5959ae95a5..44368a1be310 100644 --- a/app/src/main/java/com/duckduckgo/app/icon/ui/ItemOffsetDecoration.kt +++ b/app/src/main/java/com/duckduckgo/app/icon/ui/ItemOffsetDecoration.kt @@ -27,10 +27,12 @@ class ItemOffsetDecoration(private val mItemOffset: Int) : ItemDecoration() { constructor(context: Context, @DimenRes itemOffsetId: Int) : this(context.resources.getDimensionPixelSize(itemOffsetId)) override fun getItemOffsets( - outRect: Rect, view: View, parent: RecyclerView, + outRect: Rect, + view: View, + parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.set(0, mItemOffset, 0, mItemOffset) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/job/AppConfigurationDownloader.kt b/app/src/main/java/com/duckduckgo/app/job/AppConfigurationDownloader.kt index 331d128eac62..5cf06eaa3561 100644 --- a/app/src/main/java/com/duckduckgo/app/job/AppConfigurationDownloader.kt +++ b/app/src/main/java/com/duckduckgo/app/job/AppConfigurationDownloader.kt @@ -55,4 +55,4 @@ class AppConfigurationDownloader( Timber.i("Download task completed successfully") } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/job/AppConfigurationJobService.kt b/app/src/main/java/com/duckduckgo/app/job/AppConfigurationJobService.kt index ef6ef771d393..9d364b88aca9 100644 --- a/app/src/main/java/com/duckduckgo/app/job/AppConfigurationJobService.kt +++ b/app/src/main/java/com/duckduckgo/app/job/AppConfigurationJobService.kt @@ -45,4 +45,4 @@ class AppConfigurationJobService : JobService() { companion object { const val LEGACY_APP_CONFIGURATION_JOB_ID = 1 } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/job/AppConfigurationSyncer.kt b/app/src/main/java/com/duckduckgo/app/job/AppConfigurationSyncer.kt index 38aae7047301..552397e35c25 100644 --- a/app/src/main/java/com/duckduckgo/app/job/AppConfigurationSyncer.kt +++ b/app/src/main/java/com/duckduckgo/app/job/AppConfigurationSyncer.kt @@ -41,4 +41,4 @@ class AppConfigurationSyncer( val workRequest = appConfigurationSyncWorkRequestBuilder.appConfigurationWork() workManager.enqueueUniquePeriodicWork(APP_CONFIG_SYNC_WORK_TAG, ExistingPeriodicWorkPolicy.KEEP, workRequest) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/job/JobCleaner.kt b/app/src/main/java/com/duckduckgo/app/job/JobCleaner.kt index 8d6b9cfd7f58..7597fc9547c8 100644 --- a/app/src/main/java/com/duckduckgo/app/job/JobCleaner.kt +++ b/app/src/main/java/com/duckduckgo/app/job/JobCleaner.kt @@ -36,4 +36,4 @@ class AndroidJobCleaner(private val workManager: WorkManager) : JobCleaner { workManager.cancelAllWorkByTag(tag) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/job/WorkScheduler.kt b/app/src/main/java/com/duckduckgo/app/job/WorkScheduler.kt index 354cc7f9168c..5c7769f7368d 100644 --- a/app/src/main/java/com/duckduckgo/app/job/WorkScheduler.kt +++ b/app/src/main/java/com/duckduckgo/app/job/WorkScheduler.kt @@ -30,4 +30,4 @@ class AndroidWorkScheduler( jobCleaner.cleanDeprecatedJobs() notificationScheduler.scheduleNextNotification() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/launch/LaunchBridgeActivity.kt b/app/src/main/java/com/duckduckgo/app/launch/LaunchBridgeActivity.kt index ee09859bae80..6893074b2e6b 100644 --- a/app/src/main/java/com/duckduckgo/app/launch/LaunchBridgeActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/launch/LaunchBridgeActivity.kt @@ -21,10 +21,10 @@ import androidx.lifecycle.Observer import com.duckduckgo.app.browser.BrowserActivity import com.duckduckgo.app.browser.R import com.duckduckgo.app.global.DuckDuckGoActivity -import kotlinx.coroutines.MainScope -import kotlinx.coroutines.launch import com.duckduckgo.app.onboarding.ui.OnboardingActivity import com.duckduckgo.app.statistics.VariantManager +import kotlinx.coroutines.MainScope +import kotlinx.coroutines.launch import javax.inject.Inject class LaunchBridgeActivity : DuckDuckGoActivity() { @@ -69,4 +69,4 @@ class LaunchBridgeActivity : DuckDuckGoActivity() { startActivity(BrowserActivity.intent(this)) finish() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/launch/LaunchViewModel.kt b/app/src/main/java/com/duckduckgo/app/launch/LaunchViewModel.kt index 5127d442a0ff..ed5265de0403 100644 --- a/app/src/main/java/com/duckduckgo/app/launch/LaunchViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/launch/LaunchViewModel.kt @@ -58,4 +58,4 @@ class LaunchViewModel( Timber.d("Waited ${System.currentTimeMillis() - startTime}ms for referrer") } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/notification/AndroidNotificationScheduler.kt b/app/src/main/java/com/duckduckgo/app/notification/AndroidNotificationScheduler.kt index d4e4053d526c..2cbc0651f6b1 100644 --- a/app/src/main/java/com/duckduckgo/app/notification/AndroidNotificationScheduler.kt +++ b/app/src/main/java/com/duckduckgo/app/notification/AndroidNotificationScheduler.kt @@ -19,11 +19,7 @@ package com.duckduckgo.app.notification import android.content.Context import androidx.annotation.WorkerThread import androidx.core.app.NotificationManagerCompat -import androidx.work.CoroutineWorker -import androidx.work.OneTimeWorkRequest -import androidx.work.OneTimeWorkRequestBuilder -import androidx.work.WorkManager -import androidx.work.WorkerParameters +import androidx.work.* import com.duckduckgo.app.notification.db.NotificationDao import com.duckduckgo.app.notification.model.Notification import com.duckduckgo.app.notification.model.SchedulableNotification @@ -110,4 +106,4 @@ class NotificationScheduler( companion object { const val UNUSED_APP_WORK_REQUEST_TAG = "com.duckduckgo.notification.schedule" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/notification/NotificationFactory.kt b/app/src/main/java/com/duckduckgo/app/notification/NotificationFactory.kt index d36fd68956b1..e6ed2c46b845 100644 --- a/app/src/main/java/com/duckduckgo/app/notification/NotificationFactory.kt +++ b/app/src/main/java/com/duckduckgo/app/notification/NotificationFactory.kt @@ -112,4 +112,4 @@ class NotificationFactory @Inject constructor(val context: Context, val manager: return builder.build() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/notification/NotificationHandlerService.kt b/app/src/main/java/com/duckduckgo/app/notification/NotificationHandlerService.kt index abc19d34acc8..ece8967ffea2 100644 --- a/app/src/main/java/com/duckduckgo/app/notification/NotificationHandlerService.kt +++ b/app/src/main/java/com/duckduckgo/app/notification/NotificationHandlerService.kt @@ -125,4 +125,4 @@ class NotificationHandlerService : IntentService("NotificationHandlerService") { return PendingIntent.getService(context, 0, intent, 0)!! } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/notification/db/NotificationDao.kt b/app/src/main/java/com/duckduckgo/app/notification/db/NotificationDao.kt index 10fd2b44794a..9993b92200bd 100644 --- a/app/src/main/java/com/duckduckgo/app/notification/db/NotificationDao.kt +++ b/app/src/main/java/com/duckduckgo/app/notification/db/NotificationDao.kt @@ -31,6 +31,3 @@ abstract class NotificationDao { @Query("select count(1) > 0 from notification where notificationId = :notificationId") abstract fun exists(notificationId: String): Boolean } - - - diff --git a/app/src/main/java/com/duckduckgo/app/notification/model/ClearDataNotification.kt b/app/src/main/java/com/duckduckgo/app/notification/model/ClearDataNotification.kt index 23284c85523e..d649905cd33c 100644 --- a/app/src/main/java/com/duckduckgo/app/notification/model/ClearDataNotification.kt +++ b/app/src/main/java/com/duckduckgo/app/notification/model/ClearDataNotification.kt @@ -67,4 +67,4 @@ class ClearDataSpecification(context: Context) : NotificationSpec { override val closeButton: String? = null override val pixelSuffix = "cd" override val autoCancel = true -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/notification/model/Notification.kt b/app/src/main/java/com/duckduckgo/app/notification/model/Notification.kt index 6a8f7432610b..121c6a73270a 100644 --- a/app/src/main/java/com/duckduckgo/app/notification/model/Notification.kt +++ b/app/src/main/java/com/duckduckgo/app/notification/model/Notification.kt @@ -25,4 +25,4 @@ import androidx.room.PrimaryKey data class Notification( @PrimaryKey val notificationId: String -) \ No newline at end of file +) diff --git a/app/src/main/java/com/duckduckgo/app/notification/model/PrivacyProtectionNotification.kt b/app/src/main/java/com/duckduckgo/app/notification/model/PrivacyProtectionNotification.kt index 30ea9e5c9c26..9ae3f958f62a 100644 --- a/app/src/main/java/com/duckduckgo/app/notification/model/PrivacyProtectionNotification.kt +++ b/app/src/main/java/com/duckduckgo/app/notification/model/PrivacyProtectionNotification.kt @@ -75,4 +75,4 @@ class PrivacyProtectionNotificationSpecification(context: Context, trackers: Int private const val TRACKER_THRESHOLD = 2 private const val UPGRADE_THRESHOLD = 2 } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/notification/model/SchedulableNotification.kt b/app/src/main/java/com/duckduckgo/app/notification/model/SchedulableNotification.kt index fd3c78a5563c..15c4d08ce93f 100644 --- a/app/src/main/java/com/duckduckgo/app/notification/model/SchedulableNotification.kt +++ b/app/src/main/java/com/duckduckgo/app/notification/model/SchedulableNotification.kt @@ -38,4 +38,3 @@ interface NotificationSpec { val pixelSuffix: String val autoCancel: Boolean } - diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/di/OnboardingModule.kt b/app/src/main/java/com/duckduckgo/app/onboarding/di/OnboardingModule.kt index 2853a456a1b1..b89a91495a14 100644 --- a/app/src/main/java/com/duckduckgo/app/onboarding/di/OnboardingModule.kt +++ b/app/src/main/java/com/duckduckgo/app/onboarding/di/OnboardingModule.kt @@ -41,4 +41,4 @@ class OnboardingModule { fun onboardingPageBuilder(): OnboardingPageBuilder { return OnboardingFragmentPageBuilder() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/store/OnboardingSharedPreferences.kt b/app/src/main/java/com/duckduckgo/app/onboarding/store/OnboardingSharedPreferences.kt index 0f45d9f74401..ec1a3cd63426 100644 --- a/app/src/main/java/com/duckduckgo/app/onboarding/store/OnboardingSharedPreferences.kt +++ b/app/src/main/java/com/duckduckgo/app/onboarding/store/OnboardingSharedPreferences.kt @@ -21,7 +21,6 @@ import android.content.SharedPreferences import androidx.core.content.edit import javax.inject.Inject - class OnboardingSharedPreferences @Inject constructor(private val context: Context) : OnboardingStore { override var onboardingDialogJourney: String? diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/store/OnboardingStore.kt b/app/src/main/java/com/duckduckgo/app/onboarding/store/OnboardingStore.kt index 3fb8871ccec1..a47413af77cb 100644 --- a/app/src/main/java/com/duckduckgo/app/onboarding/store/OnboardingStore.kt +++ b/app/src/main/java/com/duckduckgo/app/onboarding/store/OnboardingStore.kt @@ -16,7 +16,6 @@ package com.duckduckgo.app.onboarding.store - interface OnboardingStore { var onboardingDialogJourney: String? -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/store/UserStage.kt b/app/src/main/java/com/duckduckgo/app/onboarding/store/UserStage.kt index d209fb187084..c46f825cf44d 100644 --- a/app/src/main/java/com/duckduckgo/app/onboarding/store/UserStage.kt +++ b/app/src/main/java/com/duckduckgo/app/onboarding/store/UserStage.kt @@ -45,4 +45,4 @@ class StageTypeConverter { fun fromStage(stage: AppStage): String { return stage.name } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/store/UserStageDao.kt b/app/src/main/java/com/duckduckgo/app/onboarding/store/UserStageDao.kt index 40a58537e8ea..d2effdbb646e 100644 --- a/app/src/main/java/com/duckduckgo/app/onboarding/store/UserStageDao.kt +++ b/app/src/main/java/com/duckduckgo/app/onboarding/store/UserStageDao.kt @@ -31,4 +31,4 @@ interface UserStageDao { fun updateUserStage(appStage: AppStage) { insert(UserStage(appStage = appStage)) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/store/UserStageStore.kt b/app/src/main/java/com/duckduckgo/app/onboarding/store/UserStageStore.kt index dd701a4ab288..047442293f81 100644 --- a/app/src/main/java/com/duckduckgo/app/onboarding/store/UserStageStore.kt +++ b/app/src/main/java/com/duckduckgo/app/onboarding/store/UserStageStore.kt @@ -59,4 +59,4 @@ suspend fun UserStageStore.isNewUser(): Boolean { suspend fun UserStageStore.daxOnboardingActive(): Boolean { return this.getUserAppStage() == AppStage.DAX_ONBOARDING -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingActivity.kt b/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingActivity.kt index e43df944f380..9be6681f087e 100644 --- a/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingActivity.kt @@ -71,4 +71,4 @@ class OnboardingActivity : DuckDuckGoActivity() { return Intent(context, OnboardingActivity::class.java) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingPageBuilder.kt b/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingPageBuilder.kt index 24c243d45263..d61fb6478a34 100644 --- a/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingPageBuilder.kt +++ b/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingPageBuilder.kt @@ -34,4 +34,4 @@ class OnboardingFragmentPageBuilder : OnboardingPageBuilder { override fun buildWelcomePage() = WelcomePage() override fun buildDefaultBrowserPage() = DefaultBrowserPage() -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingPageManager.kt b/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingPageManager.kt index 383856e94cbc..d21d93fc078f 100644 --- a/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingPageManager.kt +++ b/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingPageManager.kt @@ -58,8 +58,8 @@ class OnboardingPageManagerWithTrackerBlocking( } private fun shouldShowDefaultBrowserPage(): Boolean { - return defaultWebBrowserCapability.deviceSupportsDefaultBrowserConfiguration() - && !defaultWebBrowserCapability.isDefaultBrowser() + return defaultWebBrowserCapability.deviceSupportsDefaultBrowserConfiguration() && + !defaultWebBrowserCapability.isDefaultBrowser() } private fun buildDefaultBrowserPage(): DefaultBrowserPage { diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingViewModel.kt b/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingViewModel.kt index 7e22cc11da8e..6468a9a72cea 100644 --- a/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingViewModel.kt @@ -43,9 +43,9 @@ class OnboardingViewModel( } fun onOnboardingDone() { - //Executing this on IO to avoid any delay changing threads between Main-IO. + // Executing this on IO to avoid any delay changing threads between Main-IO. viewModelScope.launch(dispatchers.io()) { userStageStore.stageCompleted(AppStage.NEW) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/ui/PagerAdapter.kt b/app/src/main/java/com/duckduckgo/app/onboarding/ui/PagerAdapter.kt index 7f8aea72a977..fc825c58fb53 100644 --- a/app/src/main/java/com/duckduckgo/app/onboarding/ui/PagerAdapter.kt +++ b/app/src/main/java/com/duckduckgo/app/onboarding/ui/PagerAdapter.kt @@ -30,4 +30,4 @@ class PagerAdapter(fragmentManager: FragmentManager, private val viewModel: Onbo override fun getItem(position: Int): OnboardingPageFragment { return viewModel.getItem(position) ?: throw IllegalArgumentException("No items exists at position $position") } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/DefaultBrowserPage.kt b/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/DefaultBrowserPage.kt index d39557bd6ee9..da79f3b49635 100644 --- a/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/DefaultBrowserPage.kt +++ b/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/DefaultBrowserPage.kt @@ -242,4 +242,4 @@ class DefaultBrowserPage : OnboardingPageFragment() { const val DEFAULT_BROWSER_REQUEST_CODE_DIALOG = 101 const val DEFAULT_BROWSER_RESULT_CODE_DIALOG_INTERNAL = 102 } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/DefaultBrowserPageViewModel.kt b/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/DefaultBrowserPageViewModel.kt index 4e36d071a1ec..2e5113345e15 100644 --- a/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/DefaultBrowserPageViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/DefaultBrowserPageViewModel.kt @@ -192,4 +192,4 @@ class DefaultBrowserPageViewModel( const val MAX_DIALOG_ATTEMPTS = 2 const val DEFAULT_URL = "https://duckduckgo.com" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/OnboardingPageFragment.kt b/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/OnboardingPageFragment.kt index 9c59498b9fe4..e694352feb82 100644 --- a/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/OnboardingPageFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/OnboardingPageFragment.kt @@ -37,4 +37,4 @@ abstract class OnboardingPageFragment : Fragment() { is OnboardingActivity -> (activity as OnboardingActivity).onContinueClicked() } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/WelcomePage.kt b/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/WelcomePage.kt index 2649631bedef..8d38ac68c7e0 100644 --- a/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/WelcomePage.kt +++ b/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/WelcomePage.kt @@ -26,9 +26,8 @@ import androidx.core.view.ViewCompat import androidx.core.view.ViewPropertyAnimatorCompat import com.duckduckgo.app.browser.R import com.duckduckgo.app.global.view.html -import kotlinx.android.synthetic.main.include_dax_dialog_cta.* import kotlinx.android.synthetic.main.content_onboarding_welcome.* -import kotlinx.android.synthetic.main.content_onboarding_welcome.longDescriptionContainer +import kotlinx.android.synthetic.main.include_dax_dialog_cta.* class WelcomePage : OnboardingPageFragment() { @@ -102,4 +101,4 @@ class WelcomePage : OnboardingPageFragment() { private const val ANIMATION_DURATION = 400L private const val ANIMATION_DELAY = 1400L } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/viewpager/SwipeRestrictingViewPager.kt b/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/viewpager/SwipeRestrictingViewPager.kt index fa689cf69469..b1e7f9ded4da 100644 --- a/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/viewpager/SwipeRestrictingViewPager.kt +++ b/app/src/main/java/com/duckduckgo/app/onboarding/ui/page/viewpager/SwipeRestrictingViewPager.kt @@ -22,7 +22,6 @@ import android.util.AttributeSet import android.view.MotionEvent import androidx.viewpager.widget.ViewPager - class SwipeRestrictingViewPager(context: Context, attrs: AttributeSet) : ViewPager(context, attrs) { private var swipingEnabled: Boolean = true @@ -39,4 +38,4 @@ class SwipeRestrictingViewPager(context: Context, attrs: AttributeSet) : ViewPag fun setSwipingEnabled(enabled: Boolean) { this.swipingEnabled = enabled } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/playstore/PlayStoreUtils.kt b/app/src/main/java/com/duckduckgo/app/playstore/PlayStoreUtils.kt index 31c489e6ae2e..401f0081d6ff 100644 --- a/app/src/main/java/com/duckduckgo/app/playstore/PlayStoreUtils.kt +++ b/app/src/main/java/com/duckduckgo/app/playstore/PlayStoreUtils.kt @@ -98,4 +98,4 @@ class PlayStoreAndroidUtils(val context: Context) : PlayStoreUtils { private const val PLAY_STORE_URI = "https://play.google.com/store/apps/details?id=" private const val DDG_APP_PACKAGE = "com.duckduckgo.mobile.android" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/api/TermsOfServiceJson.kt b/app/src/main/java/com/duckduckgo/app/privacy/api/TermsOfServiceJson.kt index a03630ff4678..08225f3ee193 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/api/TermsOfServiceJson.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/api/TermsOfServiceJson.kt @@ -26,4 +26,4 @@ data class TermsOfServiceJson( ) { data class Match(val good: List, val bad: List) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/db/NetworkLeaderboardDao.kt b/app/src/main/java/com/duckduckgo/app/privacy/db/NetworkLeaderboardDao.kt index 176eaf162287..847ea199d12e 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/db/NetworkLeaderboardDao.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/db/NetworkLeaderboardDao.kt @@ -53,7 +53,6 @@ abstract class NetworkLeaderboardDao { @Query("UPDATE network_leaderboard SET count = count + 1 WHERE networkName = :networkName") protected abstract fun incrementNetworkCountIfExists(networkName: String): Int - @Query("select * from network_leaderboard order by count desc") abstract fun trackerNetworkLeaderboard(): LiveData> -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/db/PrivacyProtectionCountDao.kt b/app/src/main/java/com/duckduckgo/app/privacy/db/PrivacyProtectionCountDao.kt index b3d4b09ebaa4..00035478b53b 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/db/PrivacyProtectionCountDao.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/db/PrivacyProtectionCountDao.kt @@ -55,4 +55,4 @@ abstract class PrivacyProtectionCountDao { @Insert abstract fun initialiseCounts(entity: PrivacyProtectionCountsEntity) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/db/SitesVisitedEntity.kt b/app/src/main/java/com/duckduckgo/app/privacy/db/SitesVisitedEntity.kt index 359c0b30a972..0496bb7ce563 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/db/SitesVisitedEntity.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/db/SitesVisitedEntity.kt @@ -27,4 +27,4 @@ data class SitesVisitedEntity( companion object { const val SINGLETON_KEY = "SINGLETON_KEY" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/model/Grade.kt b/app/src/main/java/com/duckduckgo/app/privacy/model/Grade.kt index cdf6a6aac34b..43a1b6f41523 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/model/Grade.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/model/Grade.kt @@ -31,13 +31,16 @@ class Grade( enum class Grading { A, + @Json(name = "B+") B_PLUS, B, + @Json(name = "C+") C_PLUS, C, D, + @Json(name = "D-") D_MINUS, UNKNOWN diff --git a/app/src/main/java/com/duckduckgo/app/privacy/model/HttpsStatus.kt b/app/src/main/java/com/duckduckgo/app/privacy/model/HttpsStatus.kt index c54b5b424547..f9df47f5c1e8 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/model/HttpsStatus.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/model/HttpsStatus.kt @@ -16,9 +16,8 @@ package com.duckduckgo.app.privacy.model - enum class HttpsStatus { NONE, MIXED, SECURE -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/model/PrivacyGrade.kt b/app/src/main/java/com/duckduckgo/app/privacy/model/PrivacyGrade.kt index d696976dc385..ec623629acf7 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/model/PrivacyGrade.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/model/PrivacyGrade.kt @@ -25,4 +25,4 @@ enum class PrivacyGrade { C, D, UNKNOWN -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/model/PrivacyPractices.kt b/app/src/main/java/com/duckduckgo/app/privacy/model/PrivacyPractices.kt index ed31b5b5b4d3..ebe2dc2704b4 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/model/PrivacyPractices.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/model/PrivacyPractices.kt @@ -48,7 +48,6 @@ class PrivacyPracticesImpl @Inject constructor( private val entityLookup: EntityLookup ) : PrivacyPractices { - private var entityScores: Map = mapOf() override suspend fun loadData() { @@ -76,4 +75,4 @@ class PrivacyPracticesImpl @Inject constructor( return PrivacyPractices.Practices(score, terms.practices, terms.goodPrivacyTerms, terms.badPrivacyTerms) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/model/PrivacyProtectionCountsEntity.kt b/app/src/main/java/com/duckduckgo/app/privacy/model/PrivacyProtectionCountsEntity.kt index 4680510c608b..00121940d921 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/model/PrivacyProtectionCountsEntity.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/model/PrivacyProtectionCountsEntity.kt @@ -34,4 +34,4 @@ data class PrivacyProtectionCountsEntity( companion object { const val SINGLETON_KEY = "SINGLETON_KEY" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/model/TermsOfService.kt b/app/src/main/java/com/duckduckgo/app/privacy/model/TermsOfService.kt index 0a6c35d46933..5614dae2b2dc 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/model/TermsOfService.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/model/TermsOfService.kt @@ -71,4 +71,4 @@ data class TermsOfService( return derived } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/model/TrustedSites.kt b/app/src/main/java/com/duckduckgo/app/privacy/model/TrustedSites.kt index 17878d707bf5..8673f367e237 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/model/TrustedSites.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/model/TrustedSites.kt @@ -37,4 +37,4 @@ class TrustedSites { return trusted.any { UriString.sameOrSubdomain(url, it) } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/renderer/HttpsStatusRendererExtension.kt b/app/src/main/java/com/duckduckgo/app/privacy/renderer/HttpsStatusRendererExtension.kt index f4720599bc7e..34f09e4d6054 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/renderer/HttpsStatusRendererExtension.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/renderer/HttpsStatusRendererExtension.kt @@ -21,7 +21,6 @@ import androidx.annotation.DrawableRes import com.duckduckgo.app.browser.R import com.duckduckgo.app.privacy.model.HttpsStatus - @DrawableRes fun HttpsStatus.icon(): Int { return when (this) { diff --git a/app/src/main/java/com/duckduckgo/app/privacy/renderer/PrivacyPracticesSummaryRendererExtension.kt b/app/src/main/java/com/duckduckgo/app/privacy/renderer/PrivacyPracticesSummaryRendererExtension.kt index 7ed38023b317..54f37c8a824c 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/renderer/PrivacyPracticesSummaryRendererExtension.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/renderer/PrivacyPracticesSummaryRendererExtension.kt @@ -47,4 +47,4 @@ fun PrivacyPractices.Summary.text(context: Context): String = when (this) { POOR -> context.getString(R.string.practicesBad) MIXED -> context.getString(R.string.practicesMixed) UNKNOWN -> context.getString(R.string.practicesUnknown) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/renderer/PrivacyUpgradeRenderer.kt b/app/src/main/java/com/duckduckgo/app/privacy/renderer/PrivacyUpgradeRenderer.kt index 08ed75d5d6d8..2664776635ed 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/renderer/PrivacyUpgradeRenderer.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/renderer/PrivacyUpgradeRenderer.kt @@ -29,4 +29,4 @@ class PrivacyUpgradeRenderer { val resource = if (privacyOn) R.string.privacyProtectionEnabled else R.string.privacyProtectionDisabled return context.getString(resource) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/renderer/TrackersRenderer.kt b/app/src/main/java/com/duckduckgo/app/privacy/renderer/TrackersRenderer.kt index 70a85d885243..9ec915303374 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/renderer/TrackersRenderer.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/renderer/TrackersRenderer.kt @@ -22,7 +22,6 @@ import com.duckduckgo.app.browser.R import com.duckduckgo.app.privacy.db.NetworkLeaderboardEntry import java.util.* - class TrackersRenderer { fun trackersText(context: Context, trackerCount: Int, allTrackersBlocked: Boolean): String { diff --git a/app/src/main/java/com/duckduckgo/app/privacy/store/TermsOfServiceRawStore.kt b/app/src/main/java/com/duckduckgo/app/privacy/store/TermsOfServiceRawStore.kt index 6ed645e9305f..6e1a59ff40a6 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/store/TermsOfServiceRawStore.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/store/TermsOfServiceRawStore.kt @@ -28,7 +28,6 @@ import timber.log.Timber import javax.inject.Inject import javax.inject.Singleton - /** * This raw file store is temporary. Once we move to an api call to retrieve the json * we'll store the content in a db rather than a raw file. @@ -52,4 +51,4 @@ class TermsOfServiceRawStore @Inject constructor(private val moshi: Moshi, priva override val terms: List get() = data -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/store/TermsOfServiceStore.kt b/app/src/main/java/com/duckduckgo/app/privacy/store/TermsOfServiceStore.kt index c582f3d4462b..2e1929f8f615 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/store/TermsOfServiceStore.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/store/TermsOfServiceStore.kt @@ -23,4 +23,4 @@ interface TermsOfServiceStore : DataLoadable { val terms: List -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/ui/PrivacyDashboardViewModel.kt b/app/src/main/java/com/duckduckgo/app/privacy/ui/PrivacyDashboardViewModel.kt index 038807ebe117..62e7a9c256cd 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/ui/PrivacyDashboardViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/ui/PrivacyDashboardViewModel.kt @@ -197,6 +197,3 @@ class PrivacyDashboardViewModel( private const val LEADERBOARD_MIN_DOMAINS_EXCLUSIVE = 30 } } - - - diff --git a/app/src/main/java/com/duckduckgo/app/privacy/ui/PrivacyPracticesAdapter.kt b/app/src/main/java/com/duckduckgo/app/privacy/ui/PrivacyPracticesAdapter.kt index a25db171a01e..f143bc385ac4 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/ui/PrivacyPracticesAdapter.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/ui/PrivacyPracticesAdapter.kt @@ -63,4 +63,3 @@ class PrivacyPracticesAdapter : RecyclerView.Adapter() { companion object { @@ -159,4 +158,3 @@ class TrackerNetworksAdapter : RecyclerView.Adapter() { } } } - diff --git a/app/src/main/java/com/duckduckgo/app/privacy/ui/TrackerNetworksViewModel.kt b/app/src/main/java/com/duckduckgo/app/privacy/ui/TrackerNetworksViewModel.kt index adab1f5966c4..6644b30abdb1 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/ui/TrackerNetworksViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/ui/TrackerNetworksViewModel.kt @@ -84,4 +84,4 @@ class TrackerNetworksViewModel : ViewModel() { val comparator = compareBy { !it.isMajor }.thenBy { it.displayName } return emptyMap>().toSortedMap(comparator) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/ui/WhitelistActivity.kt b/app/src/main/java/com/duckduckgo/app/privacy/ui/WhitelistActivity.kt index bc9ea572a07d..b6ccc5830d93 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/ui/WhitelistActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/ui/WhitelistActivity.kt @@ -21,7 +21,10 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.view.* -import android.widget.* +import android.widget.ImageView +import android.widget.PopupMenu +import android.widget.TextView +import android.widget.Toast import androidx.lifecycle.Observer import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.RecyclerView @@ -233,4 +236,4 @@ class WhitelistActivity : DuckDuckGoActivity() { val domain: TextView, val overflowMenu: ImageView ) : RecyclerView.ViewHolder(root) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/privacy/ui/WhitelistViewModel.kt b/app/src/main/java/com/duckduckgo/app/privacy/ui/WhitelistViewModel.kt index 5d9dce0027cb..d37c4f714ae6 100644 --- a/app/src/main/java/com/duckduckgo/app/privacy/ui/WhitelistViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/privacy/ui/WhitelistViewModel.kt @@ -117,4 +117,4 @@ class WhitelistViewModel( private suspend fun deleteEntryFromDatabase(entry: UserWhitelistedDomain) { withContext(dispatchers.io()) { dao.delete(entry) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/referral/AppInstallationReferrerParser.kt b/app/src/main/java/com/duckduckgo/app/referral/AppInstallationReferrerParser.kt index ecf715422d88..141330c9b99b 100644 --- a/app/src/main/java/com/duckduckgo/app/referral/AppInstallationReferrerParser.kt +++ b/app/src/main/java/com/duckduckgo/app/referral/AppInstallationReferrerParser.kt @@ -19,7 +19,6 @@ package com.duckduckgo.app.referral import com.duckduckgo.app.referral.ParsedReferrerResult.* import timber.log.Timber - interface AppInstallationReferrerParser { fun parse(referrer: String): ParsedReferrerResult @@ -79,7 +78,7 @@ class QueryParamReferrerParser : AppInstallationReferrerParser { } val condensedSuffix = suffix.take(2) - Timber.i("Found suffix $condensedSuffix (looking for ${prefix}, found in $part)") + Timber.i("Found suffix $condensedSuffix (looking for $prefix, found in $part)") return CampaignReferrerFound(condensedSuffix) } diff --git a/app/src/main/java/com/duckduckgo/app/referral/AppInstallationReferrerStateListener.kt b/app/src/main/java/com/duckduckgo/app/referral/AppInstallationReferrerStateListener.kt index d3106dfe4778..7f16c0cfb6d6 100644 --- a/app/src/main/java/com/duckduckgo/app/referral/AppInstallationReferrerStateListener.kt +++ b/app/src/main/java/com/duckduckgo/app/referral/AppInstallationReferrerStateListener.kt @@ -182,4 +182,4 @@ class PlayStoreAppReferrerStateListener @Inject constructor( override fun onInstallReferrerServiceDisconnected() { Timber.i("Referrer: ServiceDisconnected") } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/referral/AppReferrerDataStore.kt b/app/src/main/java/com/duckduckgo/app/referral/AppReferrerDataStore.kt index 6c53a3584a4a..716871775b35 100644 --- a/app/src/main/java/com/duckduckgo/app/referral/AppReferrerDataStore.kt +++ b/app/src/main/java/com/duckduckgo/app/referral/AppReferrerDataStore.kt @@ -48,4 +48,4 @@ class AppReferenceSharePreferences(private val context: Context) : AppReferrerDa private const val KEY_CHECKED_PREVIOUSLY = "KEY_CHECKED_PREVIOUSLY" private const val KEY_INSTALLED_FROM_EU_AUCTION = "KEY_INSTALLED_FROM_EU_AUCTION" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt index 19ae24f620b7..8ca03e51e053 100644 --- a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt @@ -27,7 +27,6 @@ import com.duckduckgo.app.browser.R import com.duckduckgo.app.settings.clear.ClearWhatOption import com.duckduckgo.app.settings.clear.ClearWhatOption.* - class SettingsAutomaticallyClearWhatFragment : DialogFragment() { interface Listener { @@ -90,4 +89,4 @@ class SettingsAutomaticallyClearWhatFragment : DialogFragment() { } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt index 643af0cd156d..726a9c9c28ee 100644 --- a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt +++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt @@ -29,7 +29,6 @@ import com.duckduckgo.app.global.view.show import com.duckduckgo.app.settings.clear.ClearWhenOption import com.duckduckgo.app.settings.clear.ClearWhenOption.* - class SettingsAutomaticallyClearWhenFragment : DialogFragment() { interface Listener { @@ -82,7 +81,7 @@ class SettingsAutomaticallyClearWhenFragment : DialogFragment() { } @IdRes - private fun ClearWhenOption.radioButtonId() : Int { + private fun ClearWhenOption.radioButtonId(): Int { return when (this) { ClearWhenOption.APP_EXIT_ONLY -> R.id.settingAppExitOnly ClearWhenOption.APP_EXIT_OR_5_MINS -> R.id.settingInactive5Mins @@ -108,4 +107,4 @@ class SettingsAutomaticallyClearWhenFragment : DialogFragment() { } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsOptionWithSubtitle.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsOptionWithSubtitle.kt index 0ef280d54ff4..33b069556c1d 100644 --- a/app/src/main/java/com/duckduckgo/app/settings/SettingsOptionWithSubtitle.kt +++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsOptionWithSubtitle.kt @@ -27,7 +27,6 @@ import androidx.constraintlayout.widget.ConstraintLayout import com.duckduckgo.app.browser.R import org.jetbrains.anko.childrenRecursiveSequence - class SettingsOptionWithSubtitle : ConstraintLayout { private var root: View @@ -61,5 +60,4 @@ class SettingsOptionWithSubtitle : ConstraintLayout { super.setEnabled(enabled) } - -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsViewModel.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsViewModel.kt index c7fe6230ce54..1198cecc9093 100644 --- a/app/src/main/java/com/duckduckgo/app/settings/SettingsViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsViewModel.kt @@ -197,4 +197,4 @@ class SettingsViewModel @Inject constructor( else -> null } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/settings/clear/ClearWhatOption.kt b/app/src/main/java/com/duckduckgo/app/settings/clear/ClearWhatOption.kt index ca8e1bf82fcf..9ea31fa72c43 100644 --- a/app/src/main/java/com/duckduckgo/app/settings/clear/ClearWhatOption.kt +++ b/app/src/main/java/com/duckduckgo/app/settings/clear/ClearWhatOption.kt @@ -20,4 +20,4 @@ enum class ClearWhatOption { CLEAR_NONE, CLEAR_TABS_ONLY, CLEAR_TABS_AND_DATA -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/settings/clear/ClearWhenOption.kt b/app/src/main/java/com/duckduckgo/app/settings/clear/ClearWhenOption.kt index 108675f83acd..21b34fc2b0c5 100644 --- a/app/src/main/java/com/duckduckgo/app/settings/clear/ClearWhenOption.kt +++ b/app/src/main/java/com/duckduckgo/app/settings/clear/ClearWhenOption.kt @@ -25,4 +25,4 @@ enum class ClearWhenOption { // only available to debug builds APP_EXIT_OR_5_SECONDS -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/settings/db/SettingsDataStore.kt b/app/src/main/java/com/duckduckgo/app/settings/db/SettingsDataStore.kt index fbac9bfc2d11..db16a62507e7 100644 --- a/app/src/main/java/com/duckduckgo/app/settings/db/SettingsDataStore.kt +++ b/app/src/main/java/com/duckduckgo/app/settings/db/SettingsDataStore.kt @@ -160,4 +160,4 @@ class SettingsSharedPreferences @Inject constructor(private val context: Context } const val KEY_SEARCH_NOTIFICATION = "SEARCH_NOTIFICATION" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/statistics/AtbInitializer.kt b/app/src/main/java/com/duckduckgo/app/statistics/AtbInitializer.kt index 96138e10e852..1124cba974b8 100644 --- a/app/src/main/java/com/duckduckgo/app/statistics/AtbInitializer.kt +++ b/app/src/main/java/com/duckduckgo/app/statistics/AtbInitializer.kt @@ -22,7 +22,6 @@ import com.duckduckgo.app.statistics.api.StatisticsUpdater import com.duckduckgo.app.statistics.store.StatisticsDataStore import kotlinx.coroutines.withTimeoutOrNull - class AtbInitializer( private val statisticsDataStore: StatisticsDataStore, private val statisticsUpdater: StatisticsUpdater, @@ -45,4 +44,4 @@ class AtbInitializer( } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt b/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt index c545755b74f5..427123d7cf3a 100644 --- a/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt +++ b/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt @@ -22,7 +22,7 @@ import com.duckduckgo.app.statistics.VariantManager.Companion.referrerVariant import com.duckduckgo.app.statistics.VariantManager.VariantFeature.BottomBarNavigation import com.duckduckgo.app.statistics.store.StatisticsDataStore import timber.log.Timber -import java.util.Locale +import java.util.* @WorkerThread interface VariantManager { diff --git a/app/src/main/java/com/duckduckgo/app/statistics/api/OfflinePixelScheduler.kt b/app/src/main/java/com/duckduckgo/app/statistics/api/OfflinePixelScheduler.kt index 7417e1014f8a..44e475672c2b 100644 --- a/app/src/main/java/com/duckduckgo/app/statistics/api/OfflinePixelScheduler.kt +++ b/app/src/main/java/com/duckduckgo/app/statistics/api/OfflinePixelScheduler.kt @@ -65,4 +65,4 @@ class OfflinePixelScheduler @Inject constructor(private val workManager: WorkMan private const val BACKOFF_INTERVAL = 10L private val BACKOFF_TIME_UNIT = TimeUnit.MINUTES } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/statistics/api/OfflinePixelSender.kt b/app/src/main/java/com/duckduckgo/app/statistics/api/OfflinePixelSender.kt index 1a0c8e9abb11..07128b7ea090 100644 --- a/app/src/main/java/com/duckduckgo/app/statistics/api/OfflinePixelSender.kt +++ b/app/src/main/java/com/duckduckgo/app/statistics/api/OfflinePixelSender.kt @@ -27,9 +27,7 @@ import com.duckduckgo.app.statistics.pixels.Pixel.PixelParameter.EXCEPTION_MESSA import com.duckduckgo.app.statistics.pixels.Pixel.PixelParameter.EXCEPTION_TIMESTAMP import com.duckduckgo.app.statistics.store.OfflinePixelCountDataStore import io.reactivex.Completable -import io.reactivex.Completable.complete -import io.reactivex.Completable.defer -import io.reactivex.Completable.mergeDelayError +import io.reactivex.Completable.* import kotlinx.coroutines.runBlocking import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/com/duckduckgo/app/statistics/api/PixelService.kt b/app/src/main/java/com/duckduckgo/app/statistics/api/PixelService.kt index 801c7e00a434..fa439e37f269 100644 --- a/app/src/main/java/com/duckduckgo/app/statistics/api/PixelService.kt +++ b/app/src/main/java/com/duckduckgo/app/statistics/api/PixelService.kt @@ -35,4 +35,4 @@ interface PixelService { @QueryMap(encoded = true) encodedQueryParams: Map = emptyMap(), @Query(AppUrl.ParamKey.DEV_MODE) devMode: Int? = if (BuildConfig.DEBUG) 1 else null ): Completable -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/statistics/api/StatisticsService.kt b/app/src/main/java/com/duckduckgo/app/statistics/api/StatisticsService.kt index ede1ce98a932..8103c4d1b9ff 100644 --- a/app/src/main/java/com/duckduckgo/app/statistics/api/StatisticsService.kt +++ b/app/src/main/java/com/duckduckgo/app/statistics/api/StatisticsService.kt @@ -24,7 +24,6 @@ import okhttp3.ResponseBody import retrofit2.http.GET import retrofit2.http.Query - interface StatisticsService { @GET("/exti/") @@ -49,4 +48,4 @@ interface StatisticsService { @Query(ParamKey.RETENTION_ATB) retentionAtb: String, @Query(ParamKey.DEV_MODE) devMode: Int? = if (BuildConfig.DEBUG) 1 else null ): Observable -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/statistics/pixels/ExceptionPixel.kt b/app/src/main/java/com/duckduckgo/app/statistics/pixels/ExceptionPixel.kt index 9341e5be76f0..35559d762ddd 100644 --- a/app/src/main/java/com/duckduckgo/app/statistics/pixels/ExceptionPixel.kt +++ b/app/src/main/java/com/duckduckgo/app/statistics/pixels/ExceptionPixel.kt @@ -44,4 +44,4 @@ class ExceptionPixel @Inject constructor(private val pixel: Pixel, private val r Pixel.PixelParameter.EXCEPTION_MESSAGE to exceptionCause ) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/statistics/store/OfflinePixelCountDataStore.kt b/app/src/main/java/com/duckduckgo/app/statistics/store/OfflinePixelCountDataStore.kt index b6933e3948ff..8f66deb940c2 100644 --- a/app/src/main/java/com/duckduckgo/app/statistics/store/OfflinePixelCountDataStore.kt +++ b/app/src/main/java/com/duckduckgo/app/statistics/store/OfflinePixelCountDataStore.kt @@ -74,4 +74,4 @@ class OfflinePixelCountSharedPreferences @Inject constructor(private val context private const val KEY_COOKIE_DATABASE_DELETE_ERROR_COUNT = "COOKIE_DATABASE_DELETE_ERROR_COUNT" private const val KEY_COOKIE_DATABASE_CORRUPTED_COUNT = "COOKIE_DATABASE_CORRUPTED_COUNT" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/statistics/store/StatisticsDataStore.kt b/app/src/main/java/com/duckduckgo/app/statistics/store/StatisticsDataStore.kt index 42d1a7d1b1ca..d9bea8ac3be6 100644 --- a/app/src/main/java/com/duckduckgo/app/statistics/store/StatisticsDataStore.kt +++ b/app/src/main/java/com/duckduckgo/app/statistics/store/StatisticsDataStore.kt @@ -30,4 +30,4 @@ interface StatisticsDataStore { fun saveAtb(atb: Atb) fun clearAtb() -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/surrogates/ResourceSurrogateLoader.kt b/app/src/main/java/com/duckduckgo/app/surrogates/ResourceSurrogateLoader.kt index ed84932d6c75..6f48eb58b497 100644 --- a/app/src/main/java/com/duckduckgo/app/surrogates/ResourceSurrogateLoader.kt +++ b/app/src/main/java/com/duckduckgo/app/surrogates/ResourceSurrogateLoader.kt @@ -104,4 +104,4 @@ class ResourceSurrogateLoader @Inject constructor( } return existingLines } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/surrogates/api/ResourceSurrogateListDownloader.kt b/app/src/main/java/com/duckduckgo/app/surrogates/api/ResourceSurrogateListDownloader.kt index 4f9b2e00bdc5..2c0c56f37e32 100644 --- a/app/src/main/java/com/duckduckgo/app/surrogates/api/ResourceSurrogateListDownloader.kt +++ b/app/src/main/java/com/duckduckgo/app/surrogates/api/ResourceSurrogateListDownloader.kt @@ -24,7 +24,6 @@ import timber.log.Timber import java.io.IOException import javax.inject.Inject - class ResourceSurrogateListDownloader @Inject constructor( private val service: ResourceSurrogateListService, private val surrogatesDataStore: ResourceSurrogateDataStore, @@ -61,4 +60,4 @@ class ResourceSurrogateListDownloader @Inject constructor( private fun persistData(bodyBytes: ByteArray) { surrogatesDataStore.saveData(bodyBytes) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/surrogates/api/ResourceSurrogateListService.kt b/app/src/main/java/com/duckduckgo/app/surrogates/api/ResourceSurrogateListService.kt index 2ac0928f674d..b146f0548435 100644 --- a/app/src/main/java/com/duckduckgo/app/surrogates/api/ResourceSurrogateListService.kt +++ b/app/src/main/java/com/duckduckgo/app/surrogates/api/ResourceSurrogateListService.kt @@ -20,9 +20,8 @@ import okhttp3.ResponseBody import retrofit2.Call import retrofit2.http.GET - interface ResourceSurrogateListService { @GET("/contentblocking.js?l=surrogates") fun surrogates(): Call -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/surrogates/di/ResourceSurrogateModule.kt b/app/src/main/java/com/duckduckgo/app/surrogates/di/ResourceSurrogateModule.kt index fe761bd54350..132e5b09de18 100644 --- a/app/src/main/java/com/duckduckgo/app/surrogates/di/ResourceSurrogateModule.kt +++ b/app/src/main/java/com/duckduckgo/app/surrogates/di/ResourceSurrogateModule.kt @@ -22,11 +22,10 @@ import dagger.Module import dagger.Provides import javax.inject.Singleton - @Module class ResourceSurrogateModule { @Provides @Singleton fun analyticsSurrogates(): ResourceSurrogates = ResourceSurrogatesImpl() -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/survey/api/SurveyGroup.kt b/app/src/main/java/com/duckduckgo/app/survey/api/SurveyGroup.kt index 5f71490567ac..c05024fc6715 100644 --- a/app/src/main/java/com/duckduckgo/app/survey/api/SurveyGroup.kt +++ b/app/src/main/java/com/duckduckgo/app/survey/api/SurveyGroup.kt @@ -16,7 +16,6 @@ package com.duckduckgo.app.survey.api - data class SurveyGroup(val id: String, val surveyOptions: List) { data class SurveyOption( @@ -25,4 +24,3 @@ data class SurveyGroup(val id: String, val surveyOptions: List) { val ratioOfUsersToShow: Double ) } - diff --git a/app/src/main/java/com/duckduckgo/app/survey/api/SurveyService.kt b/app/src/main/java/com/duckduckgo/app/survey/api/SurveyService.kt index c3cd8ea893d1..9bbefeed76c9 100644 --- a/app/src/main/java/com/duckduckgo/app/survey/api/SurveyService.kt +++ b/app/src/main/java/com/duckduckgo/app/survey/api/SurveyService.kt @@ -23,4 +23,4 @@ interface SurveyService { @GET("https://staticcdn.duckduckgo.com/survey/survey-mobile.json") fun survey(): Call -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/survey/model/Survey.kt b/app/src/main/java/com/duckduckgo/app/survey/model/Survey.kt index 5df437141c1e..64048a028006 100644 --- a/app/src/main/java/com/duckduckgo/app/survey/model/Survey.kt +++ b/app/src/main/java/com/duckduckgo/app/survey/model/Survey.kt @@ -51,7 +51,3 @@ data class Survey( } } } - - - - diff --git a/app/src/main/java/com/duckduckgo/app/survey/ui/SurveyActivity.kt b/app/src/main/java/com/duckduckgo/app/survey/ui/SurveyActivity.kt index c608d9086566..2828a56d45c3 100644 --- a/app/src/main/java/com/duckduckgo/app/survey/ui/SurveyActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/survey/ui/SurveyActivity.kt @@ -35,7 +35,6 @@ import com.duckduckgo.app.survey.ui.SurveyViewModel.Command.* import kotlinx.android.synthetic.main.activity_user_survey.* import javax.inject.Inject - class SurveyActivity : DuckDuckGoActivity() { private val viewModel: SurveyViewModel by bindViewModel() @@ -178,4 +177,4 @@ class SurveyActivity : DuckDuckGoActivity() { return true } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/survey/ui/SurveyViewModel.kt b/app/src/main/java/com/duckduckgo/app/survey/ui/SurveyViewModel.kt index 25711a8e8994..bc1d59078730 100644 --- a/app/src/main/java/com/duckduckgo/app/survey/ui/SurveyViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/survey/ui/SurveyViewModel.kt @@ -28,7 +28,6 @@ import com.duckduckgo.app.survey.db.SurveyDao import com.duckduckgo.app.survey.model.Survey import io.reactivex.schedulers.Schedulers - class SurveyViewModel( private val surveyDao: SurveyDao, private val statisticsStore: StatisticsDataStore, @@ -98,4 +97,4 @@ class SurveyViewModel( const val MANUFACTURER = "man" const val MODEL = "mo" } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/DeviceAppLookup.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/DeviceAppLookup.kt index 08ffa9d97ae2..5bc047f8bc4c 100644 --- a/app/src/main/java/com/duckduckgo/app/systemsearch/DeviceAppLookup.kt +++ b/app/src/main/java/com/duckduckgo/app/systemsearch/DeviceAppLookup.kt @@ -57,7 +57,7 @@ class InstalledDeviceAppLookup(private val appListProvider: DeviceAppListProvide } val escapedQuery = Regex.escape(query) - val wordPrefixMatchingRegex = ".*\\b${escapedQuery}.*".toRegex(IGNORE_CASE) + val wordPrefixMatchingRegex = ".*\\b$escapedQuery.*".toRegex(IGNORE_CASE) return apps!!.filter { it.shortName.matches(wordPrefixMatchingRegex) }.sortedWith(comparator(query)) @@ -96,4 +96,4 @@ class InstalledDeviceAppListProvider(private val packageManager: PackageManager) return@map DeviceApp(shortName, packageName, launchIntent) }.filterNotNull() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/DeviceAppSuggestionsAdapter.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/DeviceAppSuggestionsAdapter.kt index 55d431089a86..111eef1cd9a7 100644 --- a/app/src/main/java/com/duckduckgo/app/systemsearch/DeviceAppSuggestionsAdapter.kt +++ b/app/src/main/java/com/duckduckgo/app/systemsearch/DeviceAppSuggestionsAdapter.kt @@ -69,4 +69,4 @@ class DeviceAppSuggestionsAdapter( val title: TextView ) : RecyclerView.ViewHolder(root) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt index 1e96712f0f75..1909795d94e8 100644 --- a/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/systemsearch/SystemSearchActivity.kt @@ -279,4 +279,4 @@ class SystemSearchActivity : DuckDuckGoActivity() { return intent } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/tabs/model/TabDataRepository.kt b/app/src/main/java/com/duckduckgo/app/tabs/model/TabDataRepository.kt index 08425ccf01fa..e70c014fae72 100644 --- a/app/src/main/java/com/duckduckgo/app/tabs/model/TabDataRepository.kt +++ b/app/src/main/java/com/duckduckgo/app/tabs/model/TabDataRepository.kt @@ -28,8 +28,7 @@ import io.reactivex.schedulers.Schedulers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import timber.log.Timber -import java.util.LinkedHashMap -import java.util.UUID +import java.util.* import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/duckduckgo/app/tabs/model/TabEntitiy.kt b/app/src/main/java/com/duckduckgo/app/tabs/model/TabEntitiy.kt index 201a68d5974b..bff04a980a71 100644 --- a/app/src/main/java/com/duckduckgo/app/tabs/model/TabEntitiy.kt +++ b/app/src/main/java/com/duckduckgo/app/tabs/model/TabEntitiy.kt @@ -20,7 +20,6 @@ import androidx.room.Entity import androidx.room.Index import androidx.room.PrimaryKey - @Entity( tableName = "tabs", indices = [ @@ -38,4 +37,4 @@ data class TabEntity( ) val TabEntity.isBlank: Boolean - get() = title == null && url == null \ No newline at end of file + get() = title == null && url == null diff --git a/app/src/main/java/com/duckduckgo/app/tabs/model/TabRepository.kt b/app/src/main/java/com/duckduckgo/app/tabs/model/TabRepository.kt index c5885d45d685..ad7e2067d4ec 100644 --- a/app/src/main/java/com/duckduckgo/app/tabs/model/TabRepository.kt +++ b/app/src/main/java/com/duckduckgo/app/tabs/model/TabRepository.kt @@ -49,4 +49,4 @@ interface TabRepository { suspend fun select(tabId: String) fun updateTabPreviewImage(tabId: String, fileName: String?) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/tabs/model/TabSelectionEntitiy.kt b/app/src/main/java/com/duckduckgo/app/tabs/model/TabSelectionEntity.kt similarity index 98% rename from app/src/main/java/com/duckduckgo/app/tabs/model/TabSelectionEntitiy.kt rename to app/src/main/java/com/duckduckgo/app/tabs/model/TabSelectionEntity.kt index 0083eb988ff8..e6acdc40eb88 100644 --- a/app/src/main/java/com/duckduckgo/app/tabs/model/TabSelectionEntitiy.kt +++ b/app/src/main/java/com/duckduckgo/app/tabs/model/TabSelectionEntity.kt @@ -21,7 +21,6 @@ import androidx.room.ForeignKey import androidx.room.Index import androidx.room.PrimaryKey - @Entity( tableName = "tab_selection", foreignKeys = [ @@ -35,4 +34,4 @@ import androidx.room.PrimaryKey Index("tabId") ] ) -data class TabSelectionEntity(@PrimaryKey var id: Int = 1, var tabId: String?) \ No newline at end of file +data class TabSelectionEntity(@PrimaryKey var id: Int = 1, var tabId: String?) diff --git a/app/src/main/java/com/duckduckgo/app/tabs/ui/GridViewColumnCalculator.kt b/app/src/main/java/com/duckduckgo/app/tabs/ui/GridViewColumnCalculator.kt index 3d5a615ab9b2..1d37a74825e5 100644 --- a/app/src/main/java/com/duckduckgo/app/tabs/ui/GridViewColumnCalculator.kt +++ b/app/src/main/java/com/duckduckgo/app/tabs/ui/GridViewColumnCalculator.kt @@ -20,7 +20,6 @@ import android.content.Context import com.duckduckgo.app.global.view.toDp import kotlin.math.min - class GridViewColumnCalculator(val context: Context) { fun calculateNumberOfColumns(columnWidthDp: Int, maxColumns: Int): Int { @@ -30,4 +29,4 @@ class GridViewColumnCalculator(val context: Context) { return min(maxColumns, numberOfColumns) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/tabs/ui/SwipeToCloseTabListener.kt b/app/src/main/java/com/duckduckgo/app/tabs/ui/SwipeToCloseTabListener.kt index 03ac55964c55..16a1705a1634 100644 --- a/app/src/main/java/com/duckduckgo/app/tabs/ui/SwipeToCloseTabListener.kt +++ b/app/src/main/java/com/duckduckgo/app/tabs/ui/SwipeToCloseTabListener.kt @@ -23,7 +23,6 @@ import androidx.recyclerview.widget.RecyclerView import com.duckduckgo.app.tabs.model.TabEntity import kotlin.math.abs - class SwipeToCloseTabListener( private val tabSwitcherAdapter: TabSwitcherAdapter, private val numberGridColumns: Int, @@ -60,4 +59,4 @@ class SwipeToCloseTabListener( return false } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabGridItemDecorator.kt b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabGridItemDecorator.kt index 92396e8584f0..b119562a040a 100644 --- a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabGridItemDecorator.kt +++ b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabGridItemDecorator.kt @@ -27,7 +27,6 @@ import androidx.recyclerview.widget.RecyclerView import com.duckduckgo.app.browser.R import com.duckduckgo.app.global.view.toPx - class TabGridItemDecorator(context: Context, var selectedTabId: String?) : RecyclerView.ItemDecoration() { private val borderStroke: Paint = Paint().apply { @@ -81,4 +80,4 @@ class TabGridItemDecorator(context: Context, var selectedTabId: String?) : Recyc private val BORDER_WIDTH = 2.toPx().toFloat() private val BORDER_PADDING = 3.toPx().toFloat() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabRendererExtension.kt b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabRendererExtension.kt index b20bd313be75..37473da58ee8 100644 --- a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabRendererExtension.kt +++ b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabRendererExtension.kt @@ -24,7 +24,6 @@ import com.duckduckgo.app.global.faviconLocation import com.duckduckgo.app.tabs.model.TabEntity import com.duckduckgo.app.tabs.model.isBlank - fun TabEntity.displayTitle(context: Context): String { if (isBlank) { return context.getString(R.string.homeTab) @@ -43,4 +42,4 @@ fun TabEntity.displayUrl(): String { fun TabEntity.favicon(): Uri? { return Uri.parse(resolvedUrl())?.faviconLocation() -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt index 025dc8ec97fc..1c67722d0278 100644 --- a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt @@ -46,7 +46,6 @@ import org.jetbrains.anko.longToast import javax.inject.Inject import kotlin.coroutines.CoroutineContext - class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, CoroutineScope { override val coroutineContext: CoroutineContext @@ -112,7 +111,6 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine })) swipeListener.attachToRecyclerView(tabsRecycler) - tabGridItemDecorator = TabGridItemDecorator(this, selectedTabId) tabsRecycler.addItemDecoration(tabGridItemDecorator) } @@ -224,4 +222,4 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine private const val TAB_GRID_COLUMN_WIDTH_DP = 180 private const val TAB_GRID_MAX_COLUMN_COUNT = 4 } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt index 9633e6770cc0..d6121b4babd5 100644 --- a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt +++ b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt @@ -73,7 +73,6 @@ class TabSwitcherAdapter(private val itemClickListener: TabSwitcherListener, pri .error(R.drawable.ic_globe_gray_16dp) .into(holder.favicon) - loadTabPreviewImage(tab, glide, holder) attachClickListeners(holder, tab) @@ -171,5 +170,4 @@ class TabSwitcherAdapter(private val itemClickListener: TabSwitcherListener, pri val tabUnread: ImageView, val cardContentsContainer: ViewGroup ) : ViewHolder(root) - } diff --git a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherBottomBarFeatureActivity.kt b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherBottomBarFeatureActivity.kt index c1dc8af485df..1ff2a5e3141c 100644 --- a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherBottomBarFeatureActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherBottomBarFeatureActivity.kt @@ -39,9 +39,7 @@ import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command.Close import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command.DisplayMessage import kotlinx.android.synthetic.main.activity_tab_switcher_bottom_bar_feature.tabsRecycler import kotlinx.android.synthetic.main.fragment_browser_tab.bottomNavigationBar -import kotlinx.android.synthetic.main.layout_tabs_bottom_navigation_bar.bottomBarFireItem -import kotlinx.android.synthetic.main.layout_tabs_bottom_navigation_bar.bottomBarNewTabItem -import kotlinx.android.synthetic.main.layout_tabs_bottom_navigation_bar.bottomBarOverflowItem +import kotlinx.android.synthetic.main.layout_tabs_bottom_navigation_bar.* import kotlinx.android.synthetic.main.popup_window_browser_menu.view.settingsPopupMenuItem import kotlinx.android.synthetic.main.popup_window_tabs_menu.view.closeAllTabs import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherListener.kt b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherListener.kt index 046909450506..cf9e0b4efef8 100644 --- a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherListener.kt +++ b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherListener.kt @@ -18,7 +18,6 @@ package com.duckduckgo.app.tabs.ui import com.duckduckgo.app.tabs.model.TabEntity - interface TabSwitcherListener { fun onNewTabRequested() fun onTabSelected(tab: TabEntity) diff --git a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabsPopupMenu.kt b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabsPopupMenu.kt index 500c6696a4fe..605a3b46ffa6 100644 --- a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabsPopupMenu.kt +++ b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabsPopupMenu.kt @@ -54,7 +54,7 @@ class TabsPopupMenu(layoutInflater: LayoutInflater, view: View = inflate(layoutI val anchorLocation = IntArray(2) anchorView.getLocationOnScreen(anchorLocation) val x = MARGIN - val y = anchorLocation[1] - 2*anchorView.height + val y = anchorLocation[1] - 2 * anchorView.height showAtLocation(rootView, Gravity.TOP or Gravity.END, x, y) } @@ -67,4 +67,3 @@ class TabsPopupMenu(layoutInflater: LayoutInflater, view: View = inflate(layoutI } } } - diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/Client.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/Client.kt index 43a6014137a8..91471a92f49d 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/Client.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/Client.kt @@ -43,4 +43,4 @@ interface Client { val name: ClientName fun matches(url: String, documentUrl: String): Result -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/DocumentDomainClient.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/DocumentDomainClient.kt index 35b83d6b038b..76a53f2bad9b 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/DocumentDomainClient.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/DocumentDomainClient.kt @@ -29,4 +29,4 @@ class DocumentDomainClient(override val name: Client.ClientName, private val dom override fun matches(url: String, documentUrl: String): Result { return Result(domains.any { sameOrSubdomain(documentUrl, it.domain) }) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/EntityLookup.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/EntityLookup.kt index 6592ad5000e0..848b1c77364c 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/EntityLookup.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/EntityLookup.kt @@ -67,4 +67,4 @@ class TdsEntityLookup @Inject constructor( val domainEntity = domainEntityDao.get(domain) ?: return null return entityDao.get(domainEntity.entityName) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/TdsClient.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/TdsClient.kt index 4f020adaa6e2..fb2853209bc0 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/TdsClient.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/TdsClient.kt @@ -64,7 +64,6 @@ class TdsClient(override val name: Client.ClientName, private val trackers: List if (sameOrSubdomain(documentUrl, it)) { return true } - } return false } diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/TrackerDetector.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/TrackerDetector.kt index 70b39961c8f9..2ecfea5cf965 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/TrackerDetector.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/TrackerDetector.kt @@ -91,4 +91,4 @@ private fun UserWhitelistDao.isDocumentWhitelisted(document: String?): Boolean { return contains(it) } return false -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/api/TdsJson.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/api/TdsJson.kt index 0683410b9cd8..4a2e12de6aba 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/api/TdsJson.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/api/TdsJson.kt @@ -72,4 +72,4 @@ class ActionJsonAdapter { fun fromJson(actionName: String): Action? { return Action.values().firstOrNull { it.name == actionName.toUpperCase(Locale.ROOT) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/api/TrackerDataDownloader.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/api/TrackerDataDownloader.kt index c0e15aa237bf..ddf183d5b483 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/api/TrackerDataDownloader.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/api/TrackerDataDownloader.kt @@ -102,4 +102,4 @@ class TrackerDataDownloader @Inject constructor( return@fromAction } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TdsDomainEntityDao.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TdsDomainEntityDao.kt index f0459ac6cc68..e0cb9a9243bc 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TdsDomainEntityDao.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TdsDomainEntityDao.kt @@ -43,4 +43,4 @@ abstract class TdsDomainEntityDao { insertAll(entities) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TdsEntityDao.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TdsEntityDao.kt index 45708e627489..9aca51344121 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TdsEntityDao.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TdsEntityDao.kt @@ -43,4 +43,4 @@ abstract class TdsEntityDao { insertAll(entities) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TdsMetadataDao.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TdsMetadataDao.kt index 28f31031ce22..aaf5db470c34 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TdsMetadataDao.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TdsMetadataDao.kt @@ -16,11 +16,7 @@ package com.duckduckgo.app.trackerdetection.db -import androidx.room.Dao -import androidx.room.Insert -import androidx.room.OnConflictStrategy -import androidx.room.Query -import androidx.room.Transaction +import androidx.room.* import com.duckduckgo.app.trackerdetection.model.TdsMetadata @Dao @@ -36,4 +32,4 @@ abstract class TdsMetadataDao { open fun tdsDownloadSuccessful(tdsMetadata: TdsMetadata) { insert(tdsMetadata) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TdsTrackerDao.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TdsTrackerDao.kt index 5b7c045e50e9..96142967c20a 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TdsTrackerDao.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TdsTrackerDao.kt @@ -37,10 +37,9 @@ abstract class TdsTrackerDao { @Query("select * from tds_tracker where domain = :domain") abstract fun get(domain: String): TdsTracker? - @Query("select count(*) from tds_tracker") abstract fun count(): Int @Query("delete from tds_tracker") abstract fun deleteAll() -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TemporaryTrackingWhitelistDao.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TemporaryTrackingWhitelistDao.kt index 7a231f9f64ee..9d901c075388 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TemporaryTrackingWhitelistDao.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/db/TemporaryTrackingWhitelistDao.kt @@ -47,4 +47,4 @@ abstract class TemporaryTrackingWhitelistDao { @Query("delete from temporary_tracking_whitelist") abstract fun deleteAll() -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/di/TrackerDetectionModule.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/di/TrackerDetectionModule.kt index b34d2b72a520..f793951240ee 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/di/TrackerDetectionModule.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/di/TrackerDetectionModule.kt @@ -24,7 +24,6 @@ import dagger.Module import dagger.Provides import javax.inject.Singleton - @Module class TrackerDetectionModule { @@ -33,4 +32,4 @@ class TrackerDetectionModule { fun trackerDetector(entityLookup: EntityLookup, userWhitelistDao: UserWhitelistDao): TrackerDetector { return TrackerDetectorImpl(entityLookup, userWhitelistDao) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/model/Entity.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/model/Entity.kt index ab9c3b769749..e14af0f71ee1 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/model/Entity.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/model/Entity.kt @@ -26,4 +26,4 @@ interface Entity { companion object { const val MAJOR_NETWORK_PREVALENCE = 7.0 } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TdsEntity.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TdsEntity.kt index c5daa39d56ad..023ae9ac9743 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TdsEntity.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TdsEntity.kt @@ -25,4 +25,3 @@ data class TdsEntity( override val displayName: String, override val prevalence: Double ) : com.duckduckgo.app.trackerdetection.model.Entity - diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TdsMetadata.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TdsMetadata.kt index 55cd2667de61..ede8722cea20 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TdsMetadata.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TdsMetadata.kt @@ -23,4 +23,4 @@ import androidx.room.PrimaryKey data class TdsMetadata( @PrimaryKey val id: Int = 1, val eTag: String -) \ No newline at end of file +) diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TdsTracker.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TdsTracker.kt index 831dbf394667..7983b758bb46 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TdsTracker.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TdsTracker.kt @@ -96,4 +96,3 @@ class Adapters { val stringListAdapter: JsonAdapter> = moshi.adapter(stringListType) } } - diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TemporaryTrackingWhitelistedDomain.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TemporaryTrackingWhitelistedDomain.kt index b9318de86a85..eca1c1b6cf93 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TemporaryTrackingWhitelistedDomain.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TemporaryTrackingWhitelistedDomain.kt @@ -22,4 +22,4 @@ import androidx.room.PrimaryKey @Entity(tableName = "temporary_tracking_whitelist") data class TemporaryTrackingWhitelistedDomain( @PrimaryKey override val domain: String -) : DomainContainer \ No newline at end of file +) : DomainContainer diff --git a/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TrackingEvent.kt b/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TrackingEvent.kt index bb180b3468d8..a580d52a0fa3 100644 --- a/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TrackingEvent.kt +++ b/app/src/main/java/com/duckduckgo/app/trackerdetection/model/TrackingEvent.kt @@ -22,4 +22,4 @@ data class TrackingEvent( val categories: List?, val entity: Entity?, val blocked: Boolean -) \ No newline at end of file +) diff --git a/app/src/main/java/com/duckduckgo/app/usage/app/AppDaysUsed.kt b/app/src/main/java/com/duckduckgo/app/usage/app/AppDaysUsedDao.kt similarity index 99% rename from app/src/main/java/com/duckduckgo/app/usage/app/AppDaysUsed.kt rename to app/src/main/java/com/duckduckgo/app/usage/app/AppDaysUsedDao.kt index 0221b188c7b4..6bb242ba5d5a 100644 --- a/app/src/main/java/com/duckduckgo/app/usage/app/AppDaysUsed.kt +++ b/app/src/main/java/com/duckduckgo/app/usage/app/AppDaysUsedDao.kt @@ -33,6 +33,3 @@ abstract class AppDaysUsedDao { @Insert(onConflict = OnConflictStrategy.IGNORE) abstract fun insert(appUsedEntity: AppDaysUsedEntity) } - - - diff --git a/app/src/main/java/com/duckduckgo/app/usage/app/AppDaysUsedRecorder.kt b/app/src/main/java/com/duckduckgo/app/usage/app/AppDaysUsedRecorder.kt index f8e4f41ee030..8a9b9b7f2ae1 100644 --- a/app/src/main/java/com/duckduckgo/app/usage/app/AppDaysUsedRecorder.kt +++ b/app/src/main/java/com/duckduckgo/app/usage/app/AppDaysUsedRecorder.kt @@ -23,7 +23,6 @@ import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import timber.log.Timber - class AppDaysUsedRecorder(private val appDaysUsedRepository: AppDaysUsedRepository) : LifecycleObserver { @OnLifecycleEvent(Lifecycle.Event.ON_START) @@ -33,4 +32,4 @@ class AppDaysUsedRecorder(private val appDaysUsedRepository: AppDaysUsedReposito appDaysUsedRepository.recordAppUsedToday() } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/usage/app/AppDaysUsedRepository.kt b/app/src/main/java/com/duckduckgo/app/usage/app/AppDaysUsedRepository.kt index 003b1b68d589..de1fadae0c4d 100644 --- a/app/src/main/java/com/duckduckgo/app/usage/app/AppDaysUsedRepository.kt +++ b/app/src/main/java/com/duckduckgo/app/usage/app/AppDaysUsedRepository.kt @@ -58,4 +58,4 @@ class AppDaysUsedDatabaseRepository(private val appDaysUsedDao: AppDaysUsedDao) @Entity(tableName = "app_days_used") data class AppDaysUsedEntity( @PrimaryKey val date: String = formatter.format((Date())) -) \ No newline at end of file +) diff --git a/app/src/main/java/com/duckduckgo/app/usage/di/AppUsageModule.kt b/app/src/main/java/com/duckduckgo/app/usage/di/AppUsageModule.kt index 2670f4985d8c..40940c9a6c20 100644 --- a/app/src/main/java/com/duckduckgo/app/usage/di/AppUsageModule.kt +++ b/app/src/main/java/com/duckduckgo/app/usage/di/AppUsageModule.kt @@ -24,7 +24,6 @@ import dagger.Module import dagger.Provides import javax.inject.Singleton - @Module class AppUsageModule { @@ -38,4 +37,4 @@ class AppUsageModule { fun appDaysUsedRespository(appDaysUsedDao: AppDaysUsedDao): AppDaysUsedRepository { return AppDaysUsedDatabaseRepository(appDaysUsedDao) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/duckduckgo/app/usage/search/SearchCount.kt b/app/src/main/java/com/duckduckgo/app/usage/search/SearchCount.kt index 0a7acbbf6b67..a807eb070fff 100644 --- a/app/src/main/java/com/duckduckgo/app/usage/search/SearchCount.kt +++ b/app/src/main/java/com/duckduckgo/app/usage/search/SearchCount.kt @@ -19,7 +19,6 @@ package com.duckduckgo.app.usage.search import androidx.room.* import javax.inject.Singleton - @Dao @Singleton abstract class SearchCountDao { @@ -56,4 +55,3 @@ data class SearchCountEntity( const val SINGLETON_KEY = "SINGLETON_KEY" } } - diff --git a/app/src/main/java/com/duckduckgo/app/widget/ui/AddWidgetInstructionsViewModel.kt b/app/src/main/java/com/duckduckgo/app/widget/ui/AddWidgetInstructionsViewModel.kt index a889f64db5e4..0d5db08e79c2 100644 --- a/app/src/main/java/com/duckduckgo/app/widget/ui/AddWidgetInstructionsViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/widget/ui/AddWidgetInstructionsViewModel.kt @@ -37,5 +37,4 @@ class AddWidgetInstructionsViewModel : ViewModel() { fun onClosePressed() { command.value = Close } - } diff --git a/app/src/main/java/com/duckduckgo/app/widget/ui/WidgetCapabilities.kt b/app/src/main/java/com/duckduckgo/app/widget/ui/WidgetCapabilities.kt index 3ea144da749d..c64736fb6971 100644 --- a/app/src/main/java/com/duckduckgo/app/widget/ui/WidgetCapabilities.kt +++ b/app/src/main/java/com/duckduckgo/app/widget/ui/WidgetCapabilities.kt @@ -24,7 +24,6 @@ import com.duckduckgo.widget.SearchWidget import com.duckduckgo.widget.SearchWidgetLight import javax.inject.Inject - interface WidgetCapabilities { val supportsStandardWidgetAdd: Boolean val supportsAutomaticWidgetAdd: Boolean @@ -51,4 +50,4 @@ val Context.hasInstalledWidgets: Boolean val hasDarkWidget = manager.getAppWidgetIds(ComponentName(this, SearchWidget::class.java)).any() val hasLightWidget = manager.getAppWidgetIds(ComponentName(this, SearchWidgetLight::class.java)).any() return hasDarkWidget || hasLightWidget - } \ No newline at end of file + } diff --git a/app/src/main/java/com/duckduckgo/widget/SearchWidget.kt b/app/src/main/java/com/duckduckgo/widget/SearchWidget.kt index 7c8139db27e9..c18a1d1df60f 100644 --- a/app/src/main/java/com/duckduckgo/widget/SearchWidget.kt +++ b/app/src/main/java/com/duckduckgo/widget/SearchWidget.kt @@ -32,7 +32,6 @@ import com.duckduckgo.app.systemsearch.SystemSearchActivity import com.duckduckgo.app.widget.ui.AppWidgetCapabilities import javax.inject.Inject - class SearchWidgetLight : SearchWidget(R.layout.search_widget_light) open class SearchWidget(val layoutId: Int = R.layout.search_widget) : AppWidgetProvider() { @@ -87,4 +86,4 @@ open class SearchWidget(val layoutId: Int = R.layout.search_widget) : AppWidgetP pixel.fire(WIDGETS_DELETED) } } -} \ No newline at end of file +} diff --git a/ktlint.gradle b/ktlint.gradle new file mode 100644 index 000000000000..411c2f2e7a57 --- /dev/null +++ b/ktlint.gradle @@ -0,0 +1,31 @@ +/* + * Copyright © 2020 NHSX. All rights reserved. + */ + +configurations.create("ktlint") + +dependencies { + ktlint "com.pinterest:ktlint:0.36.0" +} + +ext.exclusions = "import-ordering, no-wildcard-imports, no-blank-line-before-rbrace" + +task("ktlint", type: JavaExec) { + group = "verification" + description = "Check Kotlin code style." + main = "com.pinterest.ktlint.Main" + classpath = configurations["ktlint"] + args = ["--disabled_rules=$exclusions", "src/**/*.kt"] +} + +task("ktlintFormat", type: JavaExec) { + group = "formatting" + description = "Fix Kotlin code style deviations." + main = "com.pinterest.ktlint.Main" + classpath = configurations["ktlint"] + args = ["--disabled_rules=$exclusions", "-F", "src/**/*.kt"] +} + +afterEvaluate { + tasks["check"].dependsOn("ktlint") +}