From 3a885c893a5486b992498e1a39cb8c0b9e28fe93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Thu, 12 Sep 2019 16:17:39 +0200 Subject: [PATCH] android: fix running on Android 5 For some reason ART complains about these methods being overrides of package private ones from Timber. --- .../org/jitsi/meet/sdk/log/JitsiMeetBaseLogHandler.java | 6 +++--- .../org/jitsi/meet/sdk/log/JitsiMeetDefaultLogHandler.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/log/JitsiMeetBaseLogHandler.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/log/JitsiMeetBaseLogHandler.java index bd45f72e9..0a8b288b9 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/log/JitsiMeetBaseLogHandler.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/log/JitsiMeetBaseLogHandler.java @@ -37,13 +37,13 @@ public abstract class JitsiMeetBaseLogHandler extends Timber.Tree { protected void log(int priority, @Nullable String tag, @NotNull String msg, @Nullable Throwable t) { String errmsg = Log.getStackTraceString(t); if (errmsg.isEmpty()) { - doLog(priority, getTag(), msg); + doLog(priority, getDefaultTag(), msg); } else { - doLog(priority, getTag(), MessageFormat.format("{0}\n{1}", msg, errmsg)); + doLog(priority, getDefaultTag(), MessageFormat.format("{0}\n{1}", msg, errmsg)); } } protected abstract void doLog(int priority, @NotNull String tag, @NotNull String msg); - protected abstract String getTag(); + protected abstract String getDefaultTag(); } diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/log/JitsiMeetDefaultLogHandler.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/log/JitsiMeetDefaultLogHandler.java index dd3fd10db..09fb63cc0 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/log/JitsiMeetDefaultLogHandler.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/log/JitsiMeetDefaultLogHandler.java @@ -33,7 +33,7 @@ public class JitsiMeetDefaultLogHandler extends JitsiMeetBaseLogHandler { } @Override - protected String getTag() { + protected String getDefaultTag() { return TAG; } }