Standardize traces namespace (#3813)

duckduckgo · Nov 14, 2023 · c7f2c61 · c7f2c61
1 parent b103b15
commit c7f2c61
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/app/src/internal/java/com/duckduckgo/app/dev/settings/DevSettingsViewModel.kt b/app/src/internal/java/com/duckduckgo/app/dev/settings/DevSettingsViewModel.kt
@@ -23,9 +23,9 @@ import com.duckduckgo.app.dev.settings.db.DevSettingsDataStore
 import com.duckduckgo.app.dev.settings.db.UAOverride
 import com.duckduckgo.app.global.DispatcherProvider
 import com.duckduckgo.app.survey.api.SurveyEndpointDataStore
-import com.duckduckgo.app.traces.api.StartupTraces
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.savedsites.api.SavedSitesRepository
+import com.duckduckgo.traces.api.StartupTraces
 import com.duckduckgo.user.agent.api.UserAgentProvider
 import javax.inject.Inject
 import kotlinx.coroutines.channels.BufferOverflow

diff --git a/traces/traces-api/build.gradle b/traces/traces-api/build.gradle
@@ -27,5 +27,5 @@ dependencies {
     implementation KotlinX.coroutines.core
 }
 android {
-  namespace 'com.duckduckgo.app.traces.api'
+  namespace 'com.duckduckgo.traces.api'
 }
diff --git a/...uckduckgo/app/traces/api/StartupTraces.kt → ...om/duckduckgo/traces/api/StartupTraces.kt b/...uckduckgo/app/traces/api/StartupTraces.kt → ...om/duckduckgo/traces/api/StartupTraces.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.traces.api
+package com.duckduckgo.traces.api
 
 interface StartupTraces {
     var isTraceEnabled: Boolean

diff --git a/traces/traces-impl/build.gradle b/traces/traces-impl/build.gradle
@@ -26,7 +26,7 @@ android {
     anvil {
         generateDaggerFactories = true // default is false
     }
-    namespace 'com.duckduckgo.app.traces'
+    namespace 'com.duckduckgo.traces.impl'
 }
 
 dependencies {

diff --git a/traces/traces-impl/src/main/AndroidManifest.xml b/traces/traces-impl/src/main/AndroidManifest.xml
@@ -15,12 +15,11 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.duckduckgo.app.traces">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <provider
-            android:name="com.duckduckgo.app.traces.AppStartUpTracer"
+            android:name=".AppStartUpTracer"
             android:authorities="${applicationId}.appStartProvider"
             android:initOrder="2147483647"
             android:exported="false" />

diff --git a/...duckduckgo/app/traces/AppStartUpTracer.kt → ...uckduckgo/traces/impl/AppStartUpTracer.kt b/...duckduckgo/app/traces/AppStartUpTracer.kt → ...uckduckgo/traces/impl/AppStartUpTracer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 DuckDuckGo
+ * Copyright (c) 2023 DuckDuckGo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.traces
+package com.duckduckgo.traces.impl
 
 import android.content.ContentProvider
 import android.content.ContentValues
@@ -23,8 +23,8 @@ import android.net.Uri
 import android.os.Debug
 import androidx.lifecycle.LifecycleOwner
 import com.duckduckgo.app.lifecycle.MainProcessLifecycleObserver
-import com.duckduckgo.app.traces.api.StartupTraces
 import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.traces.api.StartupTraces
 import com.squareup.anvil.annotations.ContributesMultibinding
 import java.text.SimpleDateFormat
 import java.util.Date

diff --git a/...uckduckgo/app/traces/RealStartupTraces.kt → ...ckduckgo/traces/impl/RealStartupTraces.kt b/...uckduckgo/app/traces/RealStartupTraces.kt → ...ckduckgo/traces/impl/RealStartupTraces.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 DuckDuckGo
+ * Copyright (c) 2023 DuckDuckGo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.traces
+package com.duckduckgo.traces.impl
 
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.core.content.edit
-import com.duckduckgo.app.traces.api.StartupTraces
 import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.traces.api.StartupTraces
 import com.squareup.anvil.annotations.ContributesBinding
 import javax.inject.Inject
 
@@ -38,7 +38,7 @@ class RealStartupTraces @Inject constructor(
         }
 
     companion object {
-        private const val FILENAME = "com.duckduckgo.app.traces.preference"
-        private const val ENABLE_KEY = "com.duckduckgo.app.traces.preference.enable"
+        private const val FILENAME = "com.duckduckgo.traces.preference"
+        private const val ENABLE_KEY = "com.duckduckgo.traces.preference.enable"
     }
 }