From a79ae9b576cfe3e4c7f5353d2b282c6a0de5db2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@jitsi.org>
Date: Tue, 17 Dec 2019 15:12:50 +0100
Subject: [PATCH] android: guard against potential exceptions when dealing with
 log handlers

---
 .../org/jitsi/meet/sdk/log/JitsiMeetLogger.java | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/log/JitsiMeetLogger.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/log/JitsiMeetLogger.java
index 178c92d22..b0765a9b7 100644
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/log/JitsiMeetLogger.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/log/JitsiMeetLogger.java
@@ -24,11 +24,24 @@ public class JitsiMeetLogger {
     }
 
     public static void addHandler(JitsiMeetBaseLogHandler handler) {
-        Timber.plant(handler);
+        if (!Timber.forest().contains(handler)) {
+            try {
+                Timber.plant(handler);
+            } catch (Throwable t) {
+                Timber.w(t, "Couldn't add log handler");
+            }
+
+        }
     }
 
     public static void removeHandler(JitsiMeetBaseLogHandler handler) {
-        Timber.uproot(handler);
+        if (Timber.forest().contains(handler)) {
+            try {
+                Timber.uproot(handler);
+            } catch (Throwable t) {
+                Timber.w(t, "Couldn't remove log handler");
+            }
+        }
     }
 
     public static void v(String message, Object... args) {