From 359145eaeffb739e657cbaabbad7bb13a45d295a Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 8 Feb 2024 16:12:29 -0300
Subject: [PATCH] [app] fix debug logging for libraries

---
 app/build.gradle                 |  3 ++-
 app/proguard-rules.pro           |  8 ++++++--
 app/src/main/assets/logback.xml  | 14 ++++++++++++++
 gradle/verification-metadata.xml | 10 ++++++++++
 libs/database/build.gradle       |  1 -
 libs/index/build.gradle          |  1 -
 6 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/assets/logback.xml

diff --git a/app/build.gradle b/app/build.gradle
index 9998dc4b2..7133161b2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -182,7 +182,8 @@ dependencies {
     implementation 'ch.acra:acra-mail:5.11.2'
     implementation 'ch.acra:acra-dialog:5.11.2'
     implementation 'com.hannesdorfmann:adapterdelegates4:4.3.2'
-    implementation "org.slf4j:slf4j-android:1.7.36"
+    implementation 'org.slf4j:slf4j-api:2.0.7'
+    implementation 'com.github.tony19:logback-android:3.0.0'
 
     implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
     implementation 'io.reactivex.rxjava3:rxjava:3.1.7'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index e8febd20c..089de40b0 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -6,7 +6,6 @@
 -dontwarn android.test.**
 
 -dontwarn javax.naming.**
--dontwarn org.slf4j.**
 -dontnote org.apache.http.**
 -dontnote android.net.http.**
 -dontnote **ILicensingService
@@ -48,4 +47,9 @@ public static final org.codehaus.jackson.annotate.JsonAutoDetect$Visibility *; }
 
 -keep class org.acra.config.MailSenderConfiguration {
     public <init>(...);
-}
\ No newline at end of file
+}
+
+# Logging
+-keep class ch.qos.logback.classic.android.LogcatAppender
+-keepclassmembers class ch.qos.logback.** { *; }
+-keepclassmembers class  org.slf4j.impl.** { *; }
diff --git a/app/src/main/assets/logback.xml b/app/src/main/assets/logback.xml
new file mode 100644
index 000000000..61727b439
--- /dev/null
+++ b/app/src/main/assets/logback.xml
@@ -0,0 +1,14 @@
+<configuration>
+    <appender name="logcat" class="ch.qos.logback.classic.android.LogcatAppender">
+        <tagEncoder>
+            <pattern>%logger{12}</pattern>
+        </tagEncoder>
+        <encoder>
+            <pattern>[%-20thread] %msg</pattern>
+        </encoder>
+    </appender>
+
+    <root level="DEBUG">
+        <appender-ref ref="logcat" />
+    </root>
+</configuration>
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index dbecf95f4..869d28066 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -3710,6 +3710,11 @@
             <sha256 value="68c2a5aa6e8f345743093e52b5b9e0190ba4d5a5215c0a59b4d7d33647208cbb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.tony19" name="logback-android" version="3.0.0">
+         <artifact name="logback-android-3.0.0.aar">
+            <sha256 value="7755ead239b4f6f354134c9e27fb632fffab45aed7212c001f9d1d5b6f14a134" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.goncalossilva" name="resources" version="0.2.1">
          <artifact name="resources-library-metadata-0.2.1-all.jar">
             <sha256 value="d668dfc7fa22605eda00bf23c0de7ed199c08f086f7be3267079bee4bdb772ac" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -10880,6 +10885,11 @@
             <sha256 value="f4a2974509291acc49fda4a79b0d59e15e2b524095d6421c66391b92387af4c9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.slf4j" name="slf4j-api" version="2.0.7">
+         <artifact name="slf4j-api-2.0.7.jar">
+            <sha256 value="5d6298b93a1905c32cda6478808ac14c2d4a47e91535e53c41f7feeb85d946f4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.slf4j" name="slf4j-parent" version="1.7.25">
          <artifact name="slf4j-parent-1.7.25.pom">
             <sha256 value="18f5c52120db036e88d6136f8839c832d074bdda95c756c6f429249d2db54ac6" origin="Generated by Gradle"/>
diff --git a/libs/database/build.gradle b/libs/database/build.gradle
index 5e43d9a11..75a8afe2a 100644
--- a/libs/database/build.gradle
+++ b/libs/database/build.gradle
@@ -73,7 +73,6 @@ dependencies {
     kapt "androidx.room:room-compiler:2.5.2"
 
     implementation 'io.github.microutils:kotlin-logging:2.1.21'
-    implementation "org.slf4j:slf4j-android:1.7.36"
 
     // 1.4.1 because https://github.com/Kotlin/kotlinx.serialization/issues/2231
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
diff --git a/libs/index/build.gradle b/libs/index/build.gradle
index 9e402cc2e..ab6378c8a 100644
--- a/libs/index/build.gradle
+++ b/libs/index/build.gradle
@@ -62,7 +62,6 @@ kotlin {
             dependencies {
                 implementation "org.jetbrains.kotlin:kotlin-reflect:1.8.20"
                 implementation 'androidx.core:core-ktx:1.10.1'
-                implementation "org.slf4j:slf4j-android:1.7.36"
             }
         }
         androidUnitTest {