From 485b38efad3b537c7a665ab1208a72d16c9f310c Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 28 Oct 2022 20:38:47 +0200 Subject: [PATCH] Add Timber --- app/build.gradle | 1 + .../element/android/x/ElementXApplication.kt | 2 ++ features/login/build.gradle.kts | 4 +-- features/roomlist/build.gradle.kts | 4 +-- gradle/libs.versions.toml | 6 ++++ libraries/matrix/build.gradle | 36 ------------------- libraries/matrix/build.gradle.kts | 16 +++++++++ .../element/android/x/matrix/MatrixClient.kt | 9 ++--- .../io/element/android/x/matrix/util/Error.kt | 7 ++-- 9 files changed, 37 insertions(+), 48 deletions(-) delete mode 100644 libraries/matrix/build.gradle create mode 100644 libraries/matrix/build.gradle.kts diff --git a/app/build.gradle b/app/build.gradle index 42f612ab00..f5f4211354 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -83,6 +83,7 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' implementation 'androidx.activity:activity-compose:1.6.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1' + implementation 'com.jakewharton.timber:timber:5.0.1' debugImplementation "androidx.compose.ui:ui-tooling" debugImplementation "androidx.compose.ui:ui-test-manifest" implementation 'com.airbnb.android:mavericks-compose:3.0.1' diff --git a/app/src/main/java/io/element/android/x/ElementXApplication.kt b/app/src/main/java/io/element/android/x/ElementXApplication.kt index 7cf10d0e7e..3331d0ce17 100644 --- a/app/src/main/java/io/element/android/x/ElementXApplication.kt +++ b/app/src/main/java/io/element/android/x/ElementXApplication.kt @@ -3,11 +3,13 @@ package io.element.android.x import android.app.Application import com.airbnb.mvrx.Mavericks import io.element.android.x.matrix.MatrixInstance +import timber.log.Timber class ElementXApplication : Application() { override fun onCreate() { super.onCreate() + Timber.plant(Timber.DebugTree()) MatrixInstance.init(this) Mavericks.initialize(this) } diff --git a/features/login/build.gradle.kts b/features/login/build.gradle.kts index 8524e67615..b6af8cb779 100644 --- a/features/login/build.gradle.kts +++ b/features/login/build.gradle.kts @@ -10,8 +10,8 @@ dependencies { implementation(project(":libraries:core")) implementation(project(":libraries:matrix")) implementation(project(":libraries:designsystem")) - implementation("com.airbnb.android:mavericks-compose:3.0.1") - + implementation(libs.mavericks.compose) + implementation(libs.timber) testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.3") androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0") diff --git a/features/roomlist/build.gradle.kts b/features/roomlist/build.gradle.kts index 9fc5858ba0..15e539f139 100644 --- a/features/roomlist/build.gradle.kts +++ b/features/roomlist/build.gradle.kts @@ -10,8 +10,8 @@ dependencies { implementation(project(":libraries:core")) implementation(project(":libraries:matrix")) implementation(project(":libraries:designsystem")) - implementation("com.airbnb.android:mavericks-compose:3.0.1") - + implementation(libs.mavericks.compose) + implementation(libs.timber) testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.3") androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ca640e4cdb..0256e0b19e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,6 +29,10 @@ test_barista = "4.2.0" test_hamcrest = "2.2" test_orchestrator = "1.4.1" +#other +mavericks = "3.0.1" +timber = "5.0.1" + [libraries] # Project android_gradle_plugin = { module = "com.android.tools.build:gradle", version.ref = "android_gradle_plugin" } @@ -63,5 +67,7 @@ test_barista = { module = "com.adevinta.android:barista", version.ref = "test_ba test_hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "test_hamcrest" } test_orchestrator = { module = "androidx.test:orchestrator", version.ref = "test_orchestrator" } +mavericks_compose = { module = "com.airbnb.android:mavericks-compose", version.ref = "mavericks" } +timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" } [bundles] diff --git a/libraries/matrix/build.gradle b/libraries/matrix/build.gradle deleted file mode 100644 index f86cc7a090..0000000000 --- a/libraries/matrix/build.gradle +++ /dev/null @@ -1,36 +0,0 @@ -plugins { - id 'com.android.library' - id 'org.jetbrains.kotlin.android' -} - -android { - namespace 'io.element.android.x.sdk.matrix' - compileSdk 33 - - defaultConfig { - minSdk 29 - targetSdk 33 - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' - } -} - -dependencies { - api(name: 'matrix-rust-sdk', ext: 'aar') - implementation project(":libraries:core") - implementation "net.java.dev.jna:jna:5.10.0@aar" - implementation 'androidx.datastore:datastore-core:1.0.0' - implementation 'androidx.datastore:datastore-preferences:1.0.0' -} \ No newline at end of file diff --git a/libraries/matrix/build.gradle.kts b/libraries/matrix/build.gradle.kts new file mode 100644 index 0000000000..b5ed341d9d --- /dev/null +++ b/libraries/matrix/build.gradle.kts @@ -0,0 +1,16 @@ +plugins { + id("io.element.android-library") +} + +android { + namespace = "io.element.android.x.sdk.matrix" +} + +dependencies { + api(files("./libs/matrix-rust-sdk.aar")) + implementation(project(":libraries:core")) + implementation(libs.timber) + implementation("net.java.dev.jna:jna:5.10.0@aar") + implementation("androidx.datastore:datastore-core:1.0.0") + implementation("androidx.datastore:datastore-preferences:1.0.0") +} \ No newline at end of file diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixClient.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixClient.kt index ae22b7f00e..652ce0ccbb 100644 --- a/libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixClient.kt +++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/MatrixClient.kt @@ -8,6 +8,7 @@ import io.element.android.x.matrix.room.RustRoomSummaryDataSource import io.element.android.x.matrix.session.SessionStore import kotlinx.coroutines.withContext import org.matrix.rustcomponents.sdk.* +import timber.log.Timber import java.io.Closeable class MatrixClient internal constructor( @@ -18,21 +19,21 @@ class MatrixClient internal constructor( private val clientDelegate = object : ClientDelegate { override fun didReceiveAuthError(isSoftLogout: Boolean) { - Log.v(LOG_TAG, "didReceiveAuthError()") + Timber.v("didReceiveAuthError()") } override fun didReceiveSyncUpdate() { - Log.v(LOG_TAG, "didReceiveSyncUpdate()") + Timber.v("didReceiveSyncUpdate()") } override fun didUpdateRestoreToken() { - Log.v(LOG_TAG, "didUpdateRestoreToken()") + Timber.v("didUpdateRestoreToken()") } } private val slidingSyncObserver = object : SlidingSyncObserver { override fun didReceiveSyncUpdate(summary: UpdateSummary) { - Log.v(LOG_TAG, "didReceiveSyncUpdate=$summary") + Timber.v("didReceiveSyncUpdate=$summary") roomSummaryDataSource.updateRoomsWithIdentifiers(summary.rooms) } } diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/util/Error.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/util/Error.kt index 7fda7869c9..c7f4e6ac12 100644 --- a/libraries/matrix/src/main/java/io/element/android/x/matrix/util/Error.kt +++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/util/Error.kt @@ -1,16 +1,15 @@ package io.element.android.x.matrix.util -import android.util.Log -import io.element.android.x.matrix.LOG_TAG import org.matrix.rustcomponents.sdk.ClientException +import timber.log.Timber fun logError(throwable: Throwable) { when (throwable) { is ClientException.Generic -> { - Log.e(LOG_TAG, "Error ${throwable.msg}", throwable) + Timber.e("Error ${throwable.msg}", throwable) } else -> { - Log.e(LOG_TAG, "Error", throwable) + Timber.e("Error", throwable) } } } \ No newline at end of file