From 967d3ea5938f240c878bc7a6f401539c79be5646 Mon Sep 17 00:00:00 2001
From: Dmitry Brant <dbrant@wikimedia.org>
Date: Tue, 14 May 2019 01:28:13 -0400
Subject: [PATCH] Remove unnecessary dependency on commons-codec. (#2945)

---
 app/build.gradle                                              | 1 -
 app/src/main/java/fr/free/nrw/commons/logging/LogsSender.java | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9a145f8a8..8e964c6cd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,6 @@ dependencies {
 
     // Utils
     implementation 'com.github.nicolas-raoul:Quadtree:ac16ea8035bf07'
-    implementation 'commons-codec:commons-codec:1.10'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'in.yuvi:http.fluent:1.3'
     implementation 'com.squareup.okhttp3:okhttp:3.12.1'
diff --git a/app/src/main/java/fr/free/nrw/commons/logging/LogsSender.java b/app/src/main/java/fr/free/nrw/commons/logging/LogsSender.java
index 448da7108..f4787dda0 100644
--- a/app/src/main/java/fr/free/nrw/commons/logging/LogsSender.java
+++ b/app/src/main/java/fr/free/nrw/commons/logging/LogsSender.java
@@ -9,7 +9,6 @@ import androidx.core.content.FileProvider;
 
 import org.acra.data.CrashReportData;
 import org.acra.sender.ReportSender;
-import org.apache.commons.codec.Charsets;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -17,6 +16,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -107,7 +107,7 @@ public abstract class LogsSender implements ReportSender {
             }
             attachUserInfo(builder);
             attachExtraInfo(builder);
-            byte[] metaData = builder.toString().getBytes(Charsets.UTF_8);
+            byte[] metaData = builder.toString().getBytes(Charset.forName("UTF-8"));
             File zipFile = new File(LogUtils.getLogZipDirectory(), logFileName);
             writeLogToZipFile(metaData, zipFile);
             return FileProvider