Proton/protoncore_android
1
0
Fork 0
mirror of https://github.com/ProtonMail/protoncore_android.git synced 2026-06-14 09:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Moved LogTag to domain layer.

Browse Source
This commit is contained in:
Neil Marietta
2023-07-25 13:13:21 +02:00
parent e5aaa2235e
commit 49b0bd8eb5
31 changed files with 76 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
account-manager/data/api/account-manager-data.api
-12
View File
@@ -43,18 +43,6 @@ public final class me/proton/core/accountmanager/data/BuildConfig {
public fun <init> ()V
}
public final class me/proton/core/accountmanager/data/LogTag {
public static final field DEFAULT Ljava/lang/String;
public static final field INSTANCE Lme/proton/core/accountmanager/data/LogTag;
public static final field INVALID_USER_ADDRESS_KEY Ljava/lang/String;
public static final field INVALID_USER_KEY Ljava/lang/String;
public final fun getSESSION_CREATE-WnFgrgw ()Ljava/lang/String;
public final fun getSESSION_FORCE_LOGOUT-WnFgrgw ()Ljava/lang/String;
public final fun getSESSION_REFRESH-WnFgrgw ()Ljava/lang/String;
public final fun getSESSION_REQUEST-WnFgrgw ()Ljava/lang/String;
public final fun getSESSION_SCOPES-WnFgrgw ()Ljava/lang/String;
}
public class me/proton/core/accountmanager/data/SessionListenerImpl : me/proton/core/network/domain/session/SessionListener {
public fun <init> (Ldagger/Lazy;)V
public fun onSessionForceLogout (Lme/proton/core/network/domain/session/Session;ILkotlin/coroutines/Continuation;)Ljava/lang/Object;
account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/AccountStateHandler.kt
+1
View File
@@ -25,6 +25,7 @@ import me.proton.core.accountmanager.data.job.onInvalidUserAddressKey
import me.proton.core.accountmanager.data.job.onInvalidUserKey
import me.proton.core.accountmanager.data.job.onMigrationNeeded
import me.proton.core.accountmanager.domain.AccountManager
import me.proton.core.accountmanager.domain.LogTag
import me.proton.core.accountmanager.domain.migrator.AccountMigrator
import me.proton.core.accountrecovery.presentation.compose.AccountRecoveryNotificationSetup
import me.proton.core.domain.entity.Product
account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/SessionListenerImpl.kt
+4 -4
View File
@@ -18,10 +18,10 @@
package me.proton.core.accountmanager.data
import me.proton.core.accountmanager.data.LogTag.SESSION_CREATE
import me.proton.core.accountmanager.data.LogTag.SESSION_FORCE_LOGOUT
import me.proton.core.accountmanager.data.LogTag.SESSION_REFRESH
import me.proton.core.accountmanager.data.LogTag.SESSION_SCOPES
import me.proton.core.accountmanager.domain.LogTag.SESSION_CREATE
import me.proton.core.accountmanager.domain.LogTag.SESSION_FORCE_LOGOUT
import me.proton.core.accountmanager.domain.LogTag.SESSION_REFRESH
import me.proton.core.accountmanager.domain.LogTag.SESSION_SCOPES
import me.proton.core.accountmanager.domain.SessionManager
import me.proton.core.domain.entity.UserId
import me.proton.core.network.domain.session.Session
account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/SessionManagerImpl.kt
+1
View File
@@ -23,6 +23,7 @@ import kotlinx.coroutines.sync.withLock
import me.proton.core.account.domain.entity.AccountState
import me.proton.core.account.domain.entity.SessionState
import me.proton.core.account.domain.repository.AccountRepository
import me.proton.core.accountmanager.domain.LogTag
import me.proton.core.accountmanager.domain.SessionManager
import me.proton.core.auth.domain.repository.AuthRepository
import me.proton.core.domain.entity.UserId
account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/job/OnInvalidKey.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import kotlinx.coroutines.flow.merge
import kotlinx.coroutines.flow.onEach
import me.proton.core.account.domain.entity.AccountState
import me.proton.core.accountmanager.data.AccountStateHandler
import me.proton.core.accountmanager.data.LogTag
import me.proton.core.accountmanager.domain.LogTag
import me.proton.core.accountmanager.domain.getAccounts
import me.proton.core.domain.entity.UserId
import me.proton.core.key.domain.extension.areAllInactive
account-manager/domain/api/account-manager-domain.api
+12
View File
@@ -25,6 +25,18 @@ public final class me/proton/core/accountmanager/domain/AccountManagerExtensions
public static synthetic fun onSessionState$default (Lme/proton/core/accountmanager/domain/AccountManager;[Lme/proton/core/account/domain/entity/SessionState;ZILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
}
public final class me/proton/core/accountmanager/domain/LogTag {
public static final field DEFAULT Ljava/lang/String;
public static final field INSTANCE Lme/proton/core/accountmanager/domain/LogTag;
public static final field INVALID_USER_ADDRESS_KEY Ljava/lang/String;
public static final field INVALID_USER_KEY Ljava/lang/String;
public final fun getSESSION_CREATE-WnFgrgw ()Ljava/lang/String;
public final fun getSESSION_FORCE_LOGOUT-WnFgrgw ()Ljava/lang/String;
public final fun getSESSION_REFRESH-WnFgrgw ()Ljava/lang/String;
public final fun getSESSION_REQUEST-WnFgrgw ()Ljava/lang/String;
public final fun getSESSION_SCOPES-WnFgrgw ()Ljava/lang/String;
}
public abstract interface class me/proton/core/accountmanager/domain/SessionManager : me/proton/core/network/domain/session/SessionProvider {
public abstract fun refreshScopes (Lme/proton/core/network/domain/session/SessionId;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public abstract fun refreshSession (Lme/proton/core/network/domain/session/Session;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
account-manager/data/src/main/kotlin/me/proton/core/accountmanager/data/LogTag.kt → account-manager/domain/src/main/kotlin/me/proton/core/accountmanager/domain/LogTag.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package me.proton.core.accountmanager.data
package me.proton.core.accountmanager.domain
import me.proton.core.util.kotlin.LoggerLogTag
coreexample/build.gradle.kts
+1
View File
@@ -259,6 +259,7 @@ dependencies {
`room-ktx`,
retrofit,
timber,
`sentry-android-core`,
`ez-vcard`
)
coreexample/src/main/kotlin/me/proton/android/core/coreexample/CoreExampleLogger.kt
+5 -4
View File
@@ -18,6 +18,7 @@
package me.proton.android.core.coreexample
import me.proton.core.network.domain.LogTag
import me.proton.core.util.kotlin.Logger
import me.proton.core.util.kotlin.LoggerLogTag
import org.jetbrains.annotations.NonNls
@@ -50,10 +51,10 @@ class CoreExampleLogger : Logger {
Timber.tag(tag).v(e, message)
override fun log(tag: LoggerLogTag, message: String) = when (tag) {
me.proton.core.network.data.LogTag.API_REQUEST -> Timber.tag(tag.name).i("--> $message")
me.proton.core.network.data.LogTag.API_RESPONSE -> Timber.tag(tag.name).i("<-- $message")
me.proton.core.network.data.LogTag.API_ERROR -> Timber.tag(tag.name).w("--x $message")
me.proton.core.network.data.LogTag.SERVER_TIME_PARSE_ERROR -> Timber.tag(tag.name).e(message)
LogTag.API_REQUEST -> Timber.tag(tag.name).i("--> $message")
LogTag.API_RESPONSE -> Timber.tag(tag.name).i("<-- $message")
LogTag.API_ERROR -> Timber.tag(tag.name).w("--x $message")
LogTag.SERVER_TIME_PARSE_ERROR -> Timber.tag(tag.name).e(message)
else -> Timber.tag(tag.name).d(message)
}
}
event-manager/data/api/event-manager-data.api
-9
View File
@@ -87,15 +87,6 @@ public final class me/proton/core/eventmanager/data/EventManagerProviderImpl : m
public fun getAll (Lme/proton/core/domain/entity/UserId;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
}
public final class me/proton/core/eventmanager/data/LogTag {
public static final field COLLECT_ERROR Ljava/lang/String;
public static final field FETCH_ERROR Ljava/lang/String;
public static final field INSTANCE Lme/proton/core/eventmanager/data/LogTag;
public static final field NOTIFY_ERROR Ljava/lang/String;
public static final field WORKER_ERROR Ljava/lang/String;
public final fun getREPORT_MAX_RETRY-WnFgrgw ()Ljava/lang/String;
}
public abstract interface class me/proton/core/eventmanager/data/api/EventApi : me/proton/core/network/data/protonApi/BaseRetrofitApi {
public abstract fun getEvents (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public abstract fun getLatestEventId (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
event-manager/data/src/main/kotlin/me/proton/core/eventmanager/data/EventManagerImpl.kt
+1
View File
@@ -40,6 +40,7 @@ import me.proton.core.eventmanager.data.extension.runInTransaction
import me.proton.core.eventmanager.domain.EventListener
import me.proton.core.eventmanager.domain.EventManager
import me.proton.core.eventmanager.domain.EventManagerConfig
import me.proton.core.eventmanager.domain.LogTag
import me.proton.core.eventmanager.domain.entity.EventId
import me.proton.core.eventmanager.domain.entity.EventMetadata
import me.proton.core.eventmanager.domain.entity.EventsResponse
event-manager/data/src/main/kotlin/me/proton/core/eventmanager/data/work/EventWorker.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import androidx.work.WorkerParameters
import androidx.work.workDataOf
import dagger.assisted.Assisted
import dagger.assisted.AssistedInject
import me.proton.core.eventmanager.data.LogTag
import me.proton.core.eventmanager.domain.LogTag
import me.proton.core.eventmanager.domain.EventManagerConfig
import me.proton.core.eventmanager.domain.EventManagerProvider
import me.proton.core.eventmanager.domain.work.EventWorkerManager
event-manager/domain/api/event-manager-domain.api
+9
View File
@@ -206,6 +206,15 @@ public abstract interface class me/proton/core/eventmanager/domain/EventManagerP
public abstract fun getAll (Lme/proton/core/domain/entity/UserId;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
}
public final class me/proton/core/eventmanager/domain/LogTag {
public static final field COLLECT_ERROR Ljava/lang/String;
public static final field FETCH_ERROR Ljava/lang/String;
public static final field INSTANCE Lme/proton/core/eventmanager/domain/LogTag;
public static final field NOTIFY_ERROR Ljava/lang/String;
public static final field WORKER_ERROR Ljava/lang/String;
public final fun getREPORT_MAX_RETRY-WnFgrgw ()Ljava/lang/String;
}
public abstract interface class me/proton/core/eventmanager/domain/TransactionHandler {
public abstract fun inTransaction (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
}
event-manager/data/src/main/kotlin/me/proton/core/eventmanager/data/LogTag.kt → event-manager/domain/src/main/kotlin/me/proton/core/eventmanager/domain/LogTag.kt
+1 -1
View File
@@ -16,7 +16,7 @@
* along with ProtonCore. If not, see <https://www.gnu.org/licenses/>.
*/
package me.proton.core.eventmanager.data
package me.proton.core.eventmanager.domain
import me.proton.core.util.kotlin.LoggerLogTag
feature-flag/data/api/feature-flag-data.api
-5
View File
@@ -30,11 +30,6 @@ public final class me/proton/core/featureflag/data/FeatureFlagManagerImpl_Factor
public static fun newInstance (Lme/proton/core/featureflag/domain/repository/FeatureFlagRepository;)Lme/proton/core/featureflag/data/FeatureFlagManagerImpl;
}
public final class me/proton/core/featureflag/data/LogTag {
public static final field FEATURE_FLAG_NOT_FOUND Ljava/lang/String;
public static final field INSTANCE Lme/proton/core/featureflag/data/LogTag;
}
public abstract class me/proton/core/featureflag/data/db/FeatureFlagDao : me/proton/core/data/room/db/BaseDao {
public fun <init> ()V
}
feature-flag/data/src/main/kotlin/me/proton/core/featureflag/data/remote/FeatureFlagRemoteDataSourceImpl.kt
+1 -1
View File
@@ -21,7 +21,7 @@ package me.proton.core.featureflag.data.remote
import androidx.work.ExistingWorkPolicy
import androidx.work.WorkManager
import me.proton.core.domain.entity.UserId
import me.proton.core.featureflag.data.LogTag
import me.proton.core.featureflag.domain.LogTag
import me.proton.core.featureflag.data.remote.worker.FetchFeatureIdsWorker
import me.proton.core.featureflag.data.remote.worker.UpdateFeatureFlagWorker
import me.proton.core.featureflag.domain.entity.FeatureFlag
feature-flag/domain/api/feature-flag-domain.api
+5
View File
@@ -14,6 +14,11 @@ public final class me/proton/core/featureflag/domain/FeatureFlagManager$DefaultI
public static synthetic fun observeOrDefault$default (Lme/proton/core/featureflag/domain/FeatureFlagManager;Lme/proton/core/domain/entity/UserId;Lme/proton/core/featureflag/domain/entity/FeatureId;Lme/proton/core/featureflag/domain/entity/FeatureFlag;ZILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
}
public final class me/proton/core/featureflag/domain/LogTag {
public static final field FEATURE_FLAG_NOT_FOUND Ljava/lang/String;
public static final field INSTANCE Lme/proton/core/featureflag/domain/LogTag;
}
public final class me/proton/core/featureflag/domain/entity/FeatureFlag {
public static final field Companion Lme/proton/core/featureflag/domain/entity/FeatureFlag$Companion;
public fun <init> (Lme/proton/core/domain/entity/UserId;Lme/proton/core/featureflag/domain/entity/FeatureId;Lme/proton/core/featureflag/domain/entity/Scope;ZZ)V
feature-flag/data/src/main/kotlin/me/proton/core/featureflag/data/LogTag.kt → feature-flag/domain/src/main/kotlin/me/proton/core/featureflag/domain/LogTag.kt
+1 -1
View File
@@ -16,7 +16,7 @@
* along with ProtonCore. If not, see <https://www.gnu.org/licenses/>.
*/
package me.proton.core.featureflag.data
package me.proton.core.featureflag.domain
public object LogTag {
/** Tag for feature flags not found. */
human-verification/data/api/human-verification-data.api
-6
View File
@@ -41,12 +41,6 @@ public final class me/proton/core/humanverification/data/HumanVerificationProvid
public fun getHumanVerificationDetails (Lme/proton/core/network/domain/client/ClientId;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
}
public final class me/proton/core/humanverification/data/LogTag {
public static final field DEFAULT Ljava/lang/String;
public static final field INSTANCE Lme/proton/core/humanverification/data/LogTag;
public static final field SRP_CHALLENGE_ERROR Ljava/lang/String;
}
public final class me/proton/core/humanverification/data/db/HumanVerificationConverters {
public fun <init> ()V
public final fun fromClientIdTypeToString (Lme/proton/core/network/domain/client/ClientIdType;)Ljava/lang/String;
human-verification/data/src/main/kotlin/me/proton/core/humanverification/data/DeviceVerificationListenerImpl.kt
+1
View File
@@ -19,6 +19,7 @@
package me.proton.core.humanverification.data
import me.proton.core.crypto.common.srp.SrpChallenge
import me.proton.core.humanverification.domain.LogTag
import me.proton.core.network.domain.deviceverification.ChallengeType.Argon2
import me.proton.core.network.domain.deviceverification.ChallengeType.Ecdlp
import me.proton.core.network.domain.deviceverification.ChallengeType.WASM
human-verification/data/src/main/kotlin/me/proton/core/humanverification/data/utils/NetworkRequestOverriderImpl.kt
+1 -1
View File
@@ -20,7 +20,7 @@ package me.proton.core.humanverification.data.utils
import androidx.annotation.VisibleForTesting
import me.proton.core.humanverification.domain.utils.NetworkRequestOverrider
import me.proton.core.network.data.LogTag
import me.proton.core.network.domain.LogTag
import me.proton.core.network.data.di.Constants
import me.proton.core.network.data.di.SharedOkHttpClient
import me.proton.core.network.data.initSPKIleafPinning
human-verification/domain/api/human-verification-domain.api
+6
View File
@@ -30,6 +30,12 @@ public abstract interface class me/proton/core/humanverification/domain/HumanVer
public abstract fun handleHumanVerificationSuccess (Lme/proton/core/network/domain/client/ClientId;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
}
public final class me/proton/core/humanverification/domain/LogTag {
public static final field DEFAULT Ljava/lang/String;
public static final field INSTANCE Lme/proton/core/humanverification/domain/LogTag;
public static final field SRP_CHALLENGE_ERROR Ljava/lang/String;
}
public final class me/proton/core/humanverification/domain/entity/TokenType : java/lang/Enum {
public static final field CAPTCHA Lme/proton/core/humanverification/domain/entity/TokenType;
public static final field Companion Lme/proton/core/humanverification/domain/entity/TokenType$Companion;
human-verification/data/src/main/kotlin/me/proton/core/humanverification/data/LogTag.kt → human-verification/domain/src/main/kotlin/me/proton/core/humanverification/domain/LogTag.kt
+1 -1
View File
@@ -16,7 +16,7 @@
* along with ProtonCore. If not, see <https://www.gnu.org/licenses/>.
*/
package me.proton.core.humanverification.data
package me.proton.core.humanverification.domain
object LogTag {
/** Default tag for this module. */
network/data/api/network-data.api
-9
View File
@@ -45,15 +45,6 @@ public final class me/proton/core/network/data/LeafSPKIPinningTrustManager : jav
public fun getAcceptedIssuers ()[Ljava/security/cert/X509Certificate;
}
public final class me/proton/core/network/data/LogTag {
public static final field DEFAULT Ljava/lang/String;
public static final field INSTANCE Lme/proton/core/network/data/LogTag;
public final fun getAPI_ERROR-WnFgrgw ()Ljava/lang/String;
public final fun getAPI_REQUEST-WnFgrgw ()Ljava/lang/String;
public final fun getAPI_RESPONSE-WnFgrgw ()Ljava/lang/String;
public final fun getSERVER_TIME_PARSE_ERROR-WnFgrgw ()Ljava/lang/String;
}
public final class me/proton/core/network/data/NetworkPrefsImpl : me/proton/core/network/domain/NetworkPrefs, me/proton/core/util/android/sharedpreferences/PreferencesProvider {
public static final field Companion Lme/proton/core/network/data/NetworkPrefsImpl$Companion;
public fun <init> (Landroid/content/Context;)V
network/data/src/main/kotlin/me/proton/core/network/data/ApiResultUtils.kt
+1
View File
@@ -20,6 +20,7 @@ package me.proton.core.network.data
import kotlinx.serialization.SerializationException
import me.proton.core.network.data.protonApi.BaseRetrofitApi
import me.proton.core.network.domain.ApiResult
import me.proton.core.network.domain.LogTag
import me.proton.core.network.domain.NetworkManager
import me.proton.core.util.kotlin.CoreLogger
import okhttp3.Response
network/data/src/main/kotlin/me/proton/core/network/data/LoggingUtils.kt
+1
View File
@@ -19,6 +19,7 @@ package me.proton.core.network.data
import android.os.SystemClock
import me.proton.core.network.domain.ApiClient
import me.proton.core.network.domain.LogTag
import me.proton.core.util.kotlin.CoreLogger
import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor
network/data/src/main/kotlin/me/proton/core/network/data/interceptor/ServerTimeInterceptor.kt
+1 -1
View File
@@ -18,7 +18,7 @@
package me.proton.core.network.data.interceptor
import me.proton.core.network.data.LogTag
import me.proton.core.network.domain.LogTag
import me.proton.core.network.domain.server.ServerTimeListener
import me.proton.core.util.kotlin.CoreLogger
import okhttp3.Interceptor
network/domain/api/network-domain.api
+9
View File
@@ -228,6 +228,15 @@ public final class me/proton/core/network/domain/HttpResponseCodes {
public static final field INSTANCE Lme/proton/core/network/domain/HttpResponseCodes;
}
public final class me/proton/core/network/domain/LogTag {
public static final field DEFAULT Ljava/lang/String;
public static final field INSTANCE Lme/proton/core/network/domain/LogTag;
public final fun getAPI_ERROR-WnFgrgw ()Ljava/lang/String;
public final fun getAPI_REQUEST-WnFgrgw ()Ljava/lang/String;
public final fun getAPI_RESPONSE-WnFgrgw ()Ljava/lang/String;
public final fun getSERVER_TIME_PARSE_ERROR-WnFgrgw ()Ljava/lang/String;
}
public abstract class me/proton/core/network/domain/NetworkManager {
public fun <init> ()V
public abstract fun getNetworkStatus ()Lme/proton/core/network/domain/NetworkStatus;
network/data/src/main/kotlin/me/proton/core/network/data/LogTag.kt → network/domain/src/main/kotlin/me/proton/core/network/domain/LogTag.kt
+1 -1
View File
@@ -16,7 +16,7 @@
* along with ProtonCore. If not, see <https://www.gnu.org/licenses/>.
*/
package me.proton.core.network.data
package me.proton.core.network.domain
import me.proton.core.util.kotlin.LoggerLogTag
util/android/sentry/build.gradle.kts
+3 -6
View File
@@ -32,16 +32,13 @@ android {
dependencies {
implementation(
project(Module.kotlinUtil),
project(Module.presentation),
project(Module.networkData),
project(Module.eventManagerData),
project(Module.accountManagerData),
project(Module.networkDomain),
project(Module.eventManagerDomain),
project(Module.accountManagerDomain),
`timber`,
)
api(
`sentry`,
`sentry-android-core`,
`sentry-timber`
)
}
util/android/sentry/src/main/kotlin/me/proton/core/util/android/sentry/TimberLogger.kt
+6 -6
View File
@@ -18,12 +18,12 @@
package me.proton.core.util.android.sentry
import me.proton.core.accountmanager.data.LogTag.SESSION_FORCE_LOGOUT
import me.proton.core.eventmanager.data.LogTag.REPORT_MAX_RETRY
import me.proton.core.network.data.LogTag.API_ERROR
import me.proton.core.network.data.LogTag.API_REQUEST
import me.proton.core.network.data.LogTag.API_RESPONSE
import me.proton.core.network.data.LogTag.SERVER_TIME_PARSE_ERROR
import me.proton.core.accountmanager.domain.LogTag.SESSION_FORCE_LOGOUT
import me.proton.core.eventmanager.domain.LogTag.REPORT_MAX_RETRY
import me.proton.core.network.domain.LogTag.API_ERROR
import me.proton.core.network.domain.LogTag.API_REQUEST
import me.proton.core.network.domain.LogTag.API_RESPONSE
import me.proton.core.network.domain.LogTag.SERVER_TIME_PARSE_ERROR
import me.proton.core.network.domain.ApiException
import me.proton.core.network.domain.ApiResult
import me.proton.core.util.kotlin.Logger