From da751d00fd4a3486af56a7270da4e05aadefc5d8 Mon Sep 17 00:00:00 2001
From: NanamiNakano <thynanami@gmail.com>
Date: Sun, 29 Oct 2023 21:40:43 +0800
Subject: [PATCH] chores: slightly improvement in util package

---
 .../java/moe/matsuri/nb4a/utils/KotlinUtil.kt    | 16 +++++++++-------
 app/src/main/java/moe/matsuri/nb4a/utils/Util.kt |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/moe/matsuri/nb4a/utils/KotlinUtil.kt b/app/src/main/java/moe/matsuri/nb4a/utils/KotlinUtil.kt
index 08a39850..14f2240f 100644
--- a/app/src/main/java/moe/matsuri/nb4a/utils/KotlinUtil.kt
+++ b/app/src/main/java/moe/matsuri/nb4a/utils/KotlinUtil.kt
@@ -10,6 +10,10 @@ import java.io.File
 
 // SagerNet Class
 
+const val KB = 1024L
+const val MB = KB * 1024
+const val GB = MB * 1024
+
 fun SagerNet.cleanWebview() {
     var pathToClean = "app_webview"
     if (isBgProcess) pathToClean += "_$process"
@@ -44,13 +48,11 @@ fun Context.getDrawableByName(name: String?): Drawable? {
 // Traffic display
 
 fun Long.toBytesString(): String {
+    val size = this.toDouble()
     return when {
-        this > 1024 * 1024 * 1024 -> String.format(
-            "%.2f GiB", (this.toDouble() / 1024 / 1024 / 1024)
-        )
-
-        this > 1024 * 1024 -> String.format("%.2f MiB", (this.toDouble() / 1024 / 1024))
-        this > 1024 -> String.format("%.2f KiB", (this.toDouble() / 1024))
+        this >= GB -> String.format("%.2f GiB", size / GB)
+        this >= MB -> String.format("%.2f MiB", size / MB)
+        this >= KB -> String.format("%.2f KiB", size / KB)
         else -> "$this Bytes"
     }
 }
@@ -58,5 +60,5 @@ fun Long.toBytesString(): String {
 // List
 
 fun String.listByLineOrComma(): List<String> {
-    return this.replace(",", "\n").split("\n")
+    return this.split(",","\n").map { it.trim() }.filter { it.isNotEmpty() }
 }
diff --git a/app/src/main/java/moe/matsuri/nb4a/utils/Util.kt b/app/src/main/java/moe/matsuri/nb4a/utils/Util.kt
index 81f59bb7..1f8f1073 100644
--- a/app/src/main/java/moe/matsuri/nb4a/utils/Util.kt
+++ b/app/src/main/java/moe/matsuri/nb4a/utils/Util.kt
@@ -21,7 +21,7 @@ object Util {
      */
     fun getSubString(text: String, left: String?, right: String?): String {
         var zLen: Int
-        if (left == null || left.isEmpty()) {
+        if (left.isNullOrEmpty()) {
             zLen = 0
         } else {
             zLen = text.indexOf(left)
@@ -32,7 +32,7 @@ object Util {
             }
         }
         var yLen = if (right == null) -1 else text.indexOf(right, zLen)
-        if (yLen < 0 || right == null || right.isEmpty()) {
+        if (yLen < 0 || right.isNullOrEmpty()) {
             yLen = text.length
         }
         return text.substring(zLen, yLen)