From c77cd4e19a01faee1127380a890efc4a3c571bdb Mon Sep 17 00:00:00 2001 From: gouri-panda Date: Thu, 20 Aug 2020 14:10:01 +0530 Subject: [PATCH 1/3] Convert FileReader.java file to kotlin --- .../main/{FileReader.java => FileReader.kt} | 43 +++++++++---------- 1 file changed, 20 insertions(+), 23 deletions(-) rename core/src/main/java/org/kiwix/kiwixmobile/core/main/{FileReader.java => FileReader.kt} (53%) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/FileReader.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/FileReader.kt similarity index 53% rename from core/src/main/java/org/kiwix/kiwixmobile/core/main/FileReader.java rename to core/src/main/java/org/kiwix/kiwixmobile/core/main/FileReader.kt index 5b5e3b473..f49a30fcc 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/FileReader.java +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/FileReader.kt @@ -15,31 +15,28 @@ * along with this program. If not, see . * */ -package org.kiwix.kiwixmobile.core.main; +package org.kiwix.kiwixmobile.core.main -import android.content.Context; -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; - -public class FileReader { - - public String readFile(String filePath, Context context) { - try { - StringBuilder buf = new StringBuilder(); - InputStream json = context.getAssets().open(filePath); - BufferedReader in = - new BufferedReader(new InputStreamReader(json, "UTF-8")); - String str; - - while ((str = in.readLine()) != null) { - buf.append(str); +import android.content.Context +import java.io.BufferedReader +import java.io.IOException +import java.io.InputStreamReader +class FileReader { + fun readFile(filePath: String?, context: Context): String { + return try { + val buf = StringBuilder() + val json = context.assets.open(filePath) + val bufferedReader = + BufferedReader(InputStreamReader(json, "UTF-8")) + var str: String? + while (bufferedReader.readLine().also { str = it } != null) { + buf.append(str) } - - in.close(); - return buf.toString(); - } catch (Exception e) { - return ""; + bufferedReader.close() + "$buf" + } catch (e: IOException) { + e.printStackTrace() + "" } } } From 1f87c1817ec4a79339a752cbff009ee4bf8b8231 Mon Sep 17 00:00:00 2001 From: gouri-panda Date: Thu, 20 Aug 2020 15:11:29 +0530 Subject: [PATCH 2/3] added bufferReader Extension added bufferReader Extension added bufferReader Extension --- .../org/kiwix/kiwixmobile/core/main/FileReader.kt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/FileReader.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/FileReader.kt index f49a30fcc..ee2b300cf 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/FileReader.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/FileReader.kt @@ -20,20 +20,12 @@ package org.kiwix.kiwixmobile.core.main import android.content.Context import java.io.BufferedReader import java.io.IOException -import java.io.InputStreamReader + class FileReader { fun readFile(filePath: String?, context: Context): String { return try { - val buf = StringBuilder() val json = context.assets.open(filePath) - val bufferedReader = - BufferedReader(InputStreamReader(json, "UTF-8")) - var str: String? - while (bufferedReader.readLine().also { str = it } != null) { - buf.append(str) - } - bufferedReader.close() - "$buf" + return json.bufferedReader().use(BufferedReader::readText) } catch (e: IOException) { e.printStackTrace() "" From 1e0eeb0bf16d2f9a217b44b834330778b4eca8e8 Mon Sep 17 00:00:00 2001 From: gouri-panda Date: Thu, 20 Aug 2020 17:25:49 +0530 Subject: [PATCH 3/3] formated code --- .../org/kiwix/kiwixmobile/core/main/FileReader.kt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/FileReader.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/FileReader.kt index ee2b300cf..da66d2f5e 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/FileReader.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/FileReader.kt @@ -22,13 +22,11 @@ import java.io.BufferedReader import java.io.IOException class FileReader { - fun readFile(filePath: String?, context: Context): String { - return try { - val json = context.assets.open(filePath) - return json.bufferedReader().use(BufferedReader::readText) - } catch (e: IOException) { - e.printStackTrace() - "" - } + fun readFile(filePath: String?, context: Context): String = try { + context.assets.open(filePath) + .bufferedReader() + .use(BufferedReader::readText) + } catch (e: IOException) { + "".also { e.printStackTrace() } } }