Merge pull request #4204 from owncloud/feature/loggin_changes

[FEATURE REQUEST] Logging changes

Author: Aitorbp

CHANGELOG.md

@@ -35,6 +35,7 @@ ownCloud admins and users.
 * Enhancement - "Share to" in oCIS accounts allows upload to any space: [#4088](https://github.com/owncloud/android/issues/4088)
 * Enhancement - Auto-refresh when a file is uploaded: [#4103](https://github.com/owncloud/android/issues/4103)
 * Enhancement - Auto upload in oCIS accounts allows upload to any space: [#4117](https://github.com/owncloud/android/issues/4117)
+* Enhancement - Logging changes: [#4151](https://github.com/owncloud/android/issues/4151)
 * Enhancement - Download log files: [#4155](https://github.com/owncloud/android/issues/4155)
 * Enhancement - Log file sharing allowed within ownCloud Android app: [#4156](https://github.com/owncloud/android/issues/4156)
 * Enhancement - New field "last usage" in database: [#4173](https://github.com/owncloud/android/issues/4173)
@@ -112,6 +113,16 @@ ownCloud admins and users.
    https://github.com/owncloud/android/issues/4117
    https://github.com/owncloud/android/pull/4214
 
+* Enhancement - Logging changes: [#4151](https://github.com/owncloud/android/issues/4151)
+
+   - Updating version of com.github.AppDevNext.Logcat:LogcatCoreLib lib. - Adding
+   the hour, minutes and seconds to the log file. - Printing http logs in one line.
+   - Printing http logs with 1000000 bytes as max size. - Printing http logs in a
+   Json format.
+
+   https://github.com/owncloud/android/issues/4151
+   https://github.com/owncloud/android/pull/4204
+
 * Enhancement - Download log files: [#4155](https://github.com/owncloud/android/issues/4155)
 
    A new icon to download a log file to the Downloads folder of the device has been

changelog/unreleased/4204

@@ -0,0 +1,10 @@
+Enhancement: Logging changes
+
+- Updating version of com.github.AppDevNext.Logcat:LogcatCoreLib lib.
+- Adding the hour, minutes and seconds to the log file.
+- Printing http logs in one line.
+- Printing http logs with 1000000 bytes as max size.
+- Printing http logs in a Json format.
+
+https://github.com/owncloud/android/issues/4151
+https://github.com/owncloud/android/pull/4204

gradle/libs.versions.toml

@@ -43,6 +43,7 @@ photoView = "2.3.0"
 preference = "1.2.0"
 sonarqube = "4.0.0.2929"
 stetho = "1.6.0"
+timber = "5.0.1"
 
 [libraries]
 androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "androidxAnnotation" }
@@ -107,6 +108,7 @@ moshi-kotlin-codegen = { group = "com.squareup.moshi", name = "moshi-kotlin-code
 patternlockview = { group = "com.github.aritraroy.PatternLockView", name = "patternlockview", version.ref = "patternlockview" }
 photoview = { group = "com.github.chrisbanes", name = "PhotoView", version.ref = "photoView" }
 stetho = { group = "com.facebook.stetho", name = "stetho", version.ref = "stetho" }
+timber = { group = "com.jakewharton.timber", name = "timber", version.ref = "timber" }
 
 # Dependencies of the included build-logic
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }

owncloudApp/build.gradle

@@ -58,6 +58,9 @@ dependencies {
     // Markdown Preview
     implementation libs.bundles.markwon
 
+    // Timber
+    implementation libs.timber
+
     // Tests
     testImplementation project(":owncloudTestUtil")
     testImplementation libs.androidx.arch.core.testing

owncloudApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsViewModel.kt

@@ -25,9 +25,9 @@ import android.accounts.Account
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.map
+import androidx.lifecycle.switchMap
 import androidx.lifecycle.viewModelScope
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
@@ -109,7 +109,7 @@ class FileDetailsViewModel(
             )
 
     private val _ongoingTransferUUID = MutableLiveData<UUID>()
-    private val _ongoingTransfer = Transformations.switchMap(_ongoingTransferUUID) { transferUUID ->
+    private val _ongoingTransfer = _ongoingTransferUUID.switchMap { transferUUID ->
         workManager.getWorkInfoByIdLiveData(transferUUID)
     }.map { Event(it) }
     val ongoingTransfer: LiveData<Event<WorkInfo?>> = _ongoingTransfer

owncloudApp/src/main/java/com/owncloud/android/presentation/logging/LogsListActivity.kt

@@ -39,6 +39,8 @@ import com.owncloud.android.databinding.LogsListActivityBinding
 import com.owncloud.android.extensions.openFile
 import com.owncloud.android.extensions.sendFile
 import com.owncloud.android.extensions.showMessageInSnackbar
+import com.owncloud.android.presentation.settings.logging.SettingsLogsViewModel
+import com.owncloud.android.providers.LogsProvider
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import timber.log.Timber
 import java.io.File
@@ -50,17 +52,22 @@ class LogsListActivity : AppCompatActivity() {
 
     private val viewModel by viewModel<LogListViewModel>()
 
+    private val logsViewModel by viewModel<SettingsLogsViewModel>()
+
     private var _binding: LogsListActivityBinding? = null
+
+    private var createNewLogFile: Boolean = false
     val binding get() = _binding!!
 
     private val recyclerViewLogsAdapter = RecyclerViewLogsAdapter(object : RecyclerViewLogsAdapter.Listener {
         override fun share(file: File) {
             sendFile(file)
         }
 
-        override fun delete(file: File) {
+        override fun delete(file: File, isLastLogFileDeleted: Boolean) {
             file.delete()
             setData()
+            createNewLogFile = isLastLogFileDeleted
         }
 
         override fun open(file: File) {
@@ -93,6 +100,9 @@ class LogsListActivity : AppCompatActivity() {
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (createNewLogFile && logsViewModel.isLoggingEnabled()) {
+            LogsProvider(applicationContext).startLogging()
+        }
         when (item.itemId) {
             android.R.id.home -> finish()
         }

owncloudApp/src/main/java/com/owncloud/android/presentation/logging/RecyclerViewLogsAdapter.kt

@@ -53,7 +53,7 @@ class RecyclerViewLogsAdapter(
                 listener.share(log)
             }
             imageViewDeleteActivityLogsList.setOnClickListener {
-                listener.delete(log)
+                listener.delete(log, logsList.last() == log)
             }
             imageViewDownloadActivityLogsList.setOnClickListener {
                 listener.download(log)
@@ -80,7 +80,7 @@ class RecyclerViewLogsAdapter(
 
     interface Listener {
         fun share(file: File)
-        fun delete(file: File)
+        fun delete(file: File, isLastLogFileDeleted: Boolean)
         fun open(file: File)
         fun download(file: File)
     }

owncloudApp/src/main/java/com/owncloud/android/providers/LogsProvider.kt

@@ -24,7 +24,7 @@ import com.owncloud.android.BuildConfig
 import com.owncloud.android.MainApp
 import com.owncloud.android.data.providers.implementation.OCSharedPreferencesProvider
 import com.owncloud.android.data.providers.ScopedStorageProvider
-import com.owncloud.android.lib.common.http.LogInterceptor
+import com.owncloud.android.lib.common.http.logging.LogInterceptor
 import com.owncloud.android.lib.common.utils.LoggingHelper
 import timber.log.Timber
 import java.io.File

owncloudApp/src/main/java/com/owncloud/android/usecases/transfers/downloads/GetLiveDataForDownloadingFileUseCase.kt

@@ -19,7 +19,7 @@
 package com.owncloud.android.usecases.transfers.downloads
 
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import com.owncloud.android.domain.BaseUseCase
@@ -42,7 +42,7 @@ class GetLiveDataForDownloadingFileUseCase(
             states = PENDING_WORK_STATUS
         )
 
-        return Transformations.map(workManager.getWorkInfosLiveData(workQuery)) { listOfDownloads ->
+        return workManager.getWorkInfosLiveData(workQuery).map { listOfDownloads ->
             listOfDownloads.firstOrNull { it.tags.containsAll(tagsToFilter) }
         }
     }

owncloudApp/src/main/java/com/owncloud/android/usecases/transfers/downloads/GetLiveDataForFinishedDownloadsFromAccountUseCase.kt

@@ -20,7 +20,7 @@ package com.owncloud.android.usecases.transfers.downloads
 
 import android.accounts.Account
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
+import androidx.lifecycle.map
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import com.owncloud.android.domain.BaseUseCase
@@ -42,9 +42,7 @@ class GetLiveDataForFinishedDownloadsFromAccountUseCase(
             states = FINISHED_WORK_STATUS
         )
 
-        return Transformations.map(
-            workManager.getWorkInfosLiveData(workQuery)
-        ) { listOfDownloads ->
+        return workManager.getWorkInfosLiveData(workQuery).map { listOfDownloads ->
             listOfDownloads
                 .asReversed()
                 .distinctBy { it.tags }