diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/UserAgentInterceptor.java b/core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/UserAgentInterceptor.java
deleted file mode 100644
index b061e19f5..000000000
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/UserAgentInterceptor.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Kiwix Android
- * Copyright (c) 2019 Kiwix <android.kiwix.org>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.kiwix.kiwixmobile.core.data.remote;
-
-import java.io.IOException;
-import okhttp3.Interceptor;
-import okhttp3.Request;
-import okhttp3.Response;
-
-/**
- * Created by mhutti1 on 20/04/17.
- */
-
-public class UserAgentInterceptor implements Interceptor {
-  public final String useragent;
-
-  public UserAgentInterceptor(String useragent) {
-    this.useragent = useragent;
-  }
-
-  @Override
-  public Response intercept(Chain chain) throws IOException {
-    Request originalRequest = chain.request();
-    Request newUserAgent = originalRequest.newBuilder().header("User-Agent", useragent).build();
-    return chain.proceed(newUserAgent);
-  }
-}
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/UserAgentInterceptor.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/UserAgentInterceptor.kt
new file mode 100644
index 000000000..ea7878dae
--- /dev/null
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/UserAgentInterceptor.kt
@@ -0,0 +1,30 @@
+/*
+ * Kiwix Android
+ * Copyright (c) 2022 Kiwix <android.kiwix.org>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package org.kiwix.kiwixmobile.core.data.remote
+
+import okhttp3.Interceptor
+import okhttp3.Interceptor.Chain
+import okhttp3.Response
+import java.io.IOException
+
+class UserAgentInterceptor(private val userAgent: String) : Interceptor {
+  @Throws(IOException::class)
+  override fun intercept(chain: Chain): Response =
+    chain.proceed(chain.request().newBuilder().header("User-Agent", userAgent).build())
+}