From 0d9df62371152be9c93bbb4989ba690eb5d11009 Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Mon, 18 Oct 2021 15:23:12 -0500
Subject: [PATCH] style(lint, Timber): lint issues with Timber solved in
 current release

remove lint rule ignore, remove comments, fix up entropic lint violations that crept
in while lint rules were disabled
---
 AnkiDroid/build.gradle                                 |  1 -
 .../com/ichi2/compat/customtabs/CustomTabsHelper.java  |  4 +++-
 .../com/ichi2/libanki/stats/AdvancedStatistics.java    |  2 +-
 lint-release.xml                                       | 10 ----------
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/AnkiDroid/build.gradle b/AnkiDroid/build.gradle
index de587a157e..cc4853fad3 100644
--- a/AnkiDroid/build.gradle
+++ b/AnkiDroid/build.gradle
@@ -308,7 +308,6 @@ dependencies {
     implementation 'net.mikehardy:google-analytics-java7:2.0.13'
     implementation 'com.squareup.okhttp3:okhttp:4.9.2'
     implementation 'com.arcao:slf4j-timber:3.1'
-    // TODO: Re-enable Timber inspections in lint-release.xml after https://github.com/JakeWharton/timber/issues/408
     implementation 'com.jakewharton.timber:timber:5.0.1'
     implementation 'org.jsoup:jsoup:1.14.3'
     implementation "com.github.zafarkhaja:java-semver:0.9.0" // For AnkiDroid JS API Versioning
diff --git a/AnkiDroid/src/main/java/com/ichi2/compat/customtabs/CustomTabsHelper.java b/AnkiDroid/src/main/java/com/ichi2/compat/customtabs/CustomTabsHelper.java
index ef0af1a5f3..bbcc5d661d 100644
--- a/AnkiDroid/src/main/java/com/ichi2/compat/customtabs/CustomTabsHelper.java
+++ b/AnkiDroid/src/main/java/com/ichi2/compat/customtabs/CustomTabsHelper.java
@@ -22,6 +22,8 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import androidx.browser.customtabs.CustomTabsService;
+import timber.log.Timber;
+
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -128,7 +130,7 @@ public class CustomTabsHelper {
                 return true;
             }
         } catch (RuntimeException e) {
-            Log.e(TAG, "Runtime exception while getting specialized handlers");
+            Timber.e("Runtime exception while getting specialized handlers");
         }
         return false;
     }
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/stats/AdvancedStatistics.java b/AnkiDroid/src/main/java/com/ichi2/libanki/stats/AdvancedStatistics.java
index 4717e99da8..99c53de9a5 100644
--- a/AnkiDroid/src/main/java/com/ichi2/libanki/stats/AdvancedStatistics.java
+++ b/AnkiDroid/src/main/java/com/ichi2/libanki/stats/AdvancedStatistics.java
@@ -490,7 +490,7 @@ public class AdvancedStatistics {
 
         public Deck createDeck(long did, DeckManager decks) {
 
-            Timber.d("Trying to get deck settings for deck with id=" + did);
+            Timber.d("Trying to get deck settings for deck with id=%s", did);
 
             DeckConfig conf = decks.confForDid(did);
 
diff --git a/lint-release.xml b/lint-release.xml
index bd02b070ca..e68ce9df2e 100644
--- a/lint-release.xml
+++ b/lint-release.xml
@@ -55,16 +55,6 @@
 
     <!-- Allows Timber issues defined for AnkiDroid without an api dependency on Timber -->
     <issue id="UnknownIssueId" severity="ignore" />
-    <!-- This come from Timber and we need to also ignore them  -->
-    <!-- Ignored due to https://github.com/JakeWharton/timber/issues/408 -->
-    <issue id="BinaryOperationInTimber" severity="ignore" />
-    <issue id="LogNotTimber" severity="ignore" />
-    <issue id="StringFormatInTimber" severity="ignore" />
-    <issue id="ThrowableNotAtBeginning" severity="ignore" />
-    <issue id="TimberArgCount" severity="ignore" />
-    <issue id="TimberArgTypes" severity="ignore" />
-    <issue id="TimberTagLength" severity="ignore" />
-    <issue id="TimberExceptionLogging" severity="ignore" />
 
     <issue id="UseCompatTextViewDrawableXml" severity="ignore" />
     <issue id="AcceptsUserCertificates" severity="ignore" />