1.2.3

Author: Anatoly Rosencrantz

.gitlab-ci.yml

@@ -9,6 +9,7 @@ variables:
   GCLOUD_BUCKET_URL: "gs://test-lab-u7cps962nd0a4-kx5m7jhd4pki6"
   FIREBASE_RESULT_ROOT: "${CI_BUILD_REF_NAME}/${CI_COMMIT_SHORT_SHA}"
   ATLAS_DEPLOY_ENV: "true"
+  ATLAS_DEPLOY_PREP: "true"
 
 workflow:
   rules:
@@ -31,6 +32,7 @@ cache:
     - config/detekt/config.yml
 
 stages:
+  - i18n
   - prepare
   - analyze
   - deploy
@@ -41,7 +43,7 @@ stages:
   - publish
   - cleanup
 
-.prepare:
+prepare-build:
   stage: prepare
   artifacts:
     paths:
@@ -51,30 +53,6 @@ stages:
       dotenv: deploy.env
     expire_in: 1 week
   cache: []
-
-prepare-environment:
-  extends: .prepare
-  image: $CI_REGISTRY/proton/devops/atlas-cli
-  script:
-    # DEBUG NS 500 error
-    - echo 
-      -d "$ATLAS_BASE_DOMAIN"
-      --release "$ATLAS_RELEASE_SUFFIX" 
-      "${ENV_TAG:?}" 
-      "${CI_PROJECT_PATH}" 
-      "$CI_COMMIT_REF_NAME"
-
-    # resulting variables will be stored in deploy.env
-    - get_name.py -v
-      -o deploy.env
-      -d "$ATLAS_BASE_DOMAIN"
-      --release "$ATLAS_RELEASE_SUFFIX" "${ENV_TAG:?}" "${CI_PROJECT_PATH}" "$CI_COMMIT_REF_NAME"
-  environment:
-    name: $CI_COMMIT_REF_SLUG/$ATLAS_DEPLOY_SCOPE
-    action: prepare
-
-prepare-build:
-  extends: .prepare
   tags:
     - large
   script:
@@ -120,7 +98,7 @@ detekt analysis:
 build dev debug:
   extends: [.build]
   needs:
-    - job: "prepare-environment"
+    - job: "claim:review"
     - job: "prepare-build"
     - job: "prepare-gradle-build-scan"
       optional: true
@@ -133,7 +111,7 @@ build dev debug:
 build dynamic debug:
   extends: [.build]
   needs:
-    - job: "prepare-environment"
+    - job: "claim:review"
     - job: "prepare-build"
     - job: "prepare-gradle-build-scan"
       optional: true
@@ -357,9 +335,6 @@ testmo-upload:
 
 publish to firebase app distribution:
   stage: publish
-  needs:
-    - job: "build dev debug"
-    - job: "prepare-build"
   tags:
     - xlarge-k8s
   variables:
@@ -412,3 +387,27 @@ include:
   - project: 'tpe/testmo-reporter'
     ref: master
     file: '/scenarios/testmo-simple.yml'
+
+  - project: 'translations/generator'
+    ref: master
+    file: '/jobs/sync-crowdin.gitlab-ci.yml'
+
+  - project: 'translations/generator'
+    ref: master
+    file: '/jobs/commit-locales.gitlab-ci.yml'
+
+i18n-sync-crowdin:
+  stage: i18n
+  variables:
+      I18N_SYNC_BRANCH: develop
+      I18N_SYNC_CROWDIN_PROJECT: 'android-drive'
+  extends: .i18n-sync-crowdin-shared
+
+i18n-commit-locales:
+  stage: i18n
+  variables:
+      I18N_COMMIT_BRANCH_PUSH: develop
+      I18N_COMMIT_BRANCH_ALLOWED: develop
+      I18N_COMMIT_CROWDIN_PROJECT: 'android-drive'
+  extends: .i18n-commit-locales-shared
+

app/.gitignore

@@ -1,3 +1,5 @@
 build/
 release/
-play/
+!release/kotlin/me/proton/android/drive/usecase/GetFileLoggerTree.kt
+play/
+

app/build.gradle.kts

@@ -66,7 +66,10 @@ driveModule(
     implementation(libs.sentry)
     implementation(libs.timber)
 
+    debugImplementation(libs.treessence)
+
     androidTestImplementation(libs.androidx.navigation.compose)
+    androidTestImplementation(libs.androidx.test.espresso.contrib)
     androidTestImplementation(libs.bundles.core.test)
     androidTestImplementation(libs.fusion)
 

app/src/debug/kotlin/me/proton/android/drive/usecase/GetFileLoggerTree.kt

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2023 Proton AG.
+ * This file is part of Proton Drive.
+ *
+ * Proton Drive is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Proton Drive is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Proton Drive.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.proton.android.drive.usecase
+
+import android.util.Log
+import fr.bipi.tressence.common.filters.Filter
+import fr.bipi.tressence.file.FileLoggerTree
+import me.proton.core.drive.base.domain.entity.Percentage
+import me.proton.core.drive.base.domain.extension.MiB
+import me.proton.core.drive.base.domain.extension.percentageOfAsciiChars
+import me.proton.core.drive.base.domain.util.coRunCatching
+import me.proton.core.util.kotlin.startsWith
+import timber.log.Timber
+import javax.inject.Inject
+
+class GetFileLoggerTree @Inject constructor(
+    private val getDebugLogFile: GetDebugLogFile,
+) {
+    operator fun invoke(): Result<Timber.Tree> = coRunCatching {
+        val debugLog = getDebugLogFile()
+        FileLoggerTree.Builder()
+            .withFileName(debugLog.name)
+            .withDir(requireNotNull(debugLog.parentFile))
+            .withSizeLimit(25.MiB.value.toInt())
+            .withFileLimit(1)
+            .withMinPriority(Log.DEBUG)
+            .appendToFile(true)
+            .withFilter(
+                object : Filter {
+                    override fun isLoggable(priority: Int, tag: String?): Boolean = true
+
+                    override fun skipLog(
+                        priority: Int,
+                        tag: String?,
+                        message: String,
+                        t: Throwable?
+                    ): Boolean =
+                        tag != null &&
+                        tag.startsWith("core.network") &&
+                        message.percentageOfAsciiChars < Percentage(50)
+                }
+            )
+            .build()
+    }
+}

app/src/main/kotlin/me/proton/android/drive/extension/NavHostController.kt

@@ -18,14 +18,8 @@
 
 package me.proton.android.drive.extension
 
-import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
 
-@Suppress("ControlFlowWithEmptyBody")
-fun NavHostController.popAllBackStack() {
-    do while (popBackStack())
-}
-
 fun NavHostController.runFromRoute(route: String, block: () -> Unit) = takeIf {
     currentDestination?.route == route
 }?.let {

app/src/main/kotlin/me/proton/android/drive/initializer/LoggerInitializer.kt

@@ -31,11 +31,13 @@ import me.proton.android.drive.log.DriveLogTag
 import me.proton.android.drive.log.DriveLogger
 import me.proton.android.drive.log.NoOpLogger
 import me.proton.android.drive.log.deviceInfo
+import me.proton.core.drive.base.domain.provider.ConfigurationProvider
 import me.proton.core.usersettings.domain.DeviceSettingsHandler
 import me.proton.core.usersettings.domain.onDeviceSettingsChanged
 import me.proton.core.util.kotlin.CoreLogger
 import timber.log.Timber
 import java.util.concurrent.Executors
+import me.proton.android.drive.usecase.GetFileLoggerTree
 
 class LoggerInitializer : Initializer<Unit> {
 
@@ -55,7 +57,14 @@ class LoggerInitializer : Initializer<Unit> {
 
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
-            strictMode(logger)
+            if (entryPoint.configurationProvider().logToFileInDebugEnabled) {
+                entryPoint.getFileLoggerTree().invoke()
+                    .onSuccess { fileLoggerTree ->
+                        Timber.plant(fileLoggerTree)
+                    }
+            } else {
+                strictMode(logger)
+            }
         }
         CoreLogger.set(logger)
         logger.deviceInfo()
@@ -88,5 +97,7 @@ class LoggerInitializer : Initializer<Unit> {
     interface LoggerInitializerEntryPoint {
         fun driveLogger(): DriveLogger
         fun deviceSettingsHandler(): DeviceSettingsHandler
+        fun configurationProvider(): ConfigurationProvider
+        fun getFileLoggerTree(): GetFileLoggerTree
     }
 }

app/src/main/kotlin/me/proton/android/drive/log/DriveLogger.kt

@@ -29,6 +29,9 @@ import io.sentry.Sentry
 import io.sentry.SentryEvent
 import io.sentry.SentryLevel
 import io.sentry.protocol.Message
+import me.proton.android.drive.BuildConfig
+import me.proton.core.drive.base.domain.entity.Percentage
+import me.proton.core.drive.base.domain.extension.percentageOfAsciiChars
 import me.proton.core.drive.base.presentation.extension.getDefaultMessage
 import me.proton.core.util.kotlin.Logger
 import me.proton.core.util.kotlin.LoggerLogTag
@@ -79,11 +82,7 @@ class DriveLogger @Inject constructor(
 
     private fun withoutUploadFileContent(tag: String, message: String, block: (tag: String, message: String) -> Unit) {
         val isCoreNetwork = tag.startsWith("core.network")
-        var numAsciiChars = 0
-        message.forEach { c ->
-            if (c.code > 33 && c.code < 127) numAsciiChars += 1
-        }
-        if (isCoreNetwork && numAsciiChars < (message.length / 2)) {
+        if (isCoreNetwork && message.percentageOfAsciiChars < Percentage(50)) {
             // upload file content detected, do nothing
         } else {
             block(tag, message)
@@ -181,5 +180,6 @@ fun Logger.deviceInfo() {
     } else {
         i("LOCALE:      ${LocaleList.getDefault().toLanguageTags()}")
     }
+    i("APP VERSION: ${BuildConfig.VERSION_NAME}")
     i("-----------------------------------------")
 }

app/src/main/kotlin/me/proton/android/drive/receiver/NotificationBroadcastReceiver.kt

@@ -27,6 +27,7 @@ import me.proton.android.drive.extension.log
 import me.proton.core.drive.base.domain.log.LogTag
 import me.proton.core.drive.base.domain.util.coRunCatching
 import me.proton.core.drive.notification.domain.entity.NotificationId
+import me.proton.core.drive.notification.domain.usecase.CancelAndRemoveNotification
 import me.proton.core.drive.notification.domain.usecase.RemoveNotification
 import me.proton.core.drive.upload.domain.usecase.CancelAllUpload
 import me.proton.core.util.kotlin.CoreLogger
@@ -37,6 +38,7 @@ import javax.inject.Inject
 class NotificationBroadcastReceiver : BroadcastReceiver() {
 
     @Inject lateinit var removeNotification: RemoveNotification
+    @Inject lateinit var cancelAndRemoveNotification: CancelAndRemoveNotification
     @Inject lateinit var cancelAllUpload: CancelAllUpload
 
     override fun onReceive(context: Context?, intent: Intent?) = intent?.action?.let { action ->

app/src/main/kotlin/me/proton/android/drive/settings/DebugSettings.kt

@@ -39,6 +39,7 @@ class DebugSettings(
     private val prefsKeyBaseUrl = stringPreferencesKey(BASE_URL)
     private val prefsKeyAppVersionHeader = stringPreferencesKey(APP_VERSION_HEADER)
     private val prefsUseExceptionMessage = booleanPreferencesKey(USE_EXCEPTION_MESSAGE)
+    private val prefsLogToFileEnabled = booleanPreferencesKey(LOG_TO_FILE_ENABLED)
     val baseUrlFlow: Flow<String> = prefsKeyBaseUrl.asFlow(
         dataStore = context.dataStore,
         default = buildConfig.baseUrl
@@ -55,6 +56,10 @@ class DebugSettings(
         dataStore = context.dataStore,
         default = buildConfig.useExceptionMessage,
     )
+    val logToFileEnabledFlow: Flow<Boolean> = prefsLogToFileEnabled.asFlow(
+        dataStore = context.dataStore,
+        default = buildConfig.logToFileInDebugEnabled,
+    )
 
     override var baseUrl by Delegate(
         dataStore = context.dataStore,
@@ -76,6 +81,11 @@ class DebugSettings(
         key = prefsUseExceptionMessage,
         default = buildConfig.useExceptionMessage,
     )
+    override var logToFileInDebugEnabled by Delegate(
+        dataStore = context.dataStore,
+        key = prefsLogToFileEnabled,
+        default = buildConfig.logToFileInDebugEnabled,
+    )
 
     fun reset(coroutineScope: CoroutineScope) {
         coroutineScope.launch {
@@ -91,5 +101,6 @@ class DebugSettings(
         const val HOST = "host"
         const val APP_VERSION_HEADER = "app_version_header"
         const val USE_EXCEPTION_MESSAGE = "use_exception_message"
+        const val LOG_TO_FILE_ENABLED = "log_to_file_enabled"
     }
 }

app/src/main/kotlin/me/proton/android/drive/ui/navigation/AppNavGraph.kt

@@ -47,7 +47,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.collectLatest
 import me.proton.android.drive.extension.get
-import me.proton.android.drive.extension.popAllBackStack
 import me.proton.android.drive.extension.require
 import me.proton.android.drive.extension.requireArguments
 import me.proton.android.drive.extension.runFromRoute
@@ -132,8 +131,9 @@ fun AppNavGraph(
     LaunchedEffect(clearBackstackTrigger) {
         clearBackstackTrigger
             .collectLatest {
-                navController.popAllBackStack()
-                navController.navigate(Screen.Launcher.route)
+                navController.navigate(Screen.Launcher.route) {
+                    popUpTo(0)
+                }
                 homeNavController = createNavController(localContext)
             }
     }