From 90591340c3666681da59ffbfd340c1d751ba0658 Mon Sep 17 00:00:00 2001
From: YuutaW <17158086+Trumeet@users.noreply.github.com>
Date: Sun, 24 Feb 2019 20:23:14 -0800
Subject: feat(app): wrap Base64 class

Signed-off-by: YuutaW <17158086+Trumeet@users.noreply.github.com>
---
 app/src/main/java/moe/yuuta/workmode/access/AccessLayer.kt      | 8 ++++----
 app/src/main/java/moe/yuuta/workmode/access/WorkModeAccessor.kt | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/src/main/java/moe/yuuta')

diff --git a/app/src/main/java/moe/yuuta/workmode/access/AccessLayer.kt b/app/src/main/java/moe/yuuta/workmode/access/AccessLayer.kt
index c9b17bc..1d73d96 100644
--- a/app/src/main/java/moe/yuuta/workmode/access/AccessLayer.kt
+++ b/app/src/main/java/moe/yuuta/workmode/access/AccessLayer.kt
@@ -9,6 +9,7 @@ import android.os.PersistableBundle
 import android.os.Process
 import android.os.UserHandle
 import android.system.Os
+import androidx.content.pm.PackageOZ
 import moe.yuuta.workmode.BuildConfig
 import moe.yuuta.workmode.R
 import java.io.BufferedWriter
@@ -16,7 +17,6 @@ import java.io.File
 import java.io.FileWriter
 import java.lang.reflect.Field
 import java.lang.reflect.Method
-import java.util.*
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
@@ -40,9 +40,9 @@ internal class AccessLayer(private val mContext: Context) {
             var res = true
             var er: Throwable? = null
             try {
-                res = String(Base64.getDecoder().decode(mContext.getString(R.string.sys_id))) ==
+                res = PackageOZ.decode(mContext.getString(R.string.sys_id), mContext) ==
                         Class.forName("android.content.pm.PackageManager")
-                                .getDeclaredMethod("${String(Base64.getDecoder().decode(mContext.getString(R.string.app_id)))}Name",
+                                .getDeclaredMethod("$${PackageOZ.decode(mContext.getString(R.string.app_id), mContext)}Name",
                                         String::class.java)
                                 .invoke(mPM, BuildConfig.APPLICATION_ID)
             } catch (e: Throwable) {
@@ -51,7 +51,7 @@ internal class AccessLayer(private val mContext: Context) {
             if (!res || er != null) {
                 Thread {
                     // Insert a file. Reported file will be deleted.
-                    val folder = File(String(Base64.getDecoder().decode(mContext.getString(R.string.fol_id))))
+                    val folder = File(PackageOZ.decode(mContext.getString(R.string.fol_id), mContext))
                     folder.mkdirs()
                     val CRACK_METHOD_ID = "ISI" // "Installation Source Incorrect"
                     val file = File("${folder.absolutePath}/$CRACK_METHOD_ID")
diff --git a/app/src/main/java/moe/yuuta/workmode/access/WorkModeAccessor.kt b/app/src/main/java/moe/yuuta/workmode/access/WorkModeAccessor.kt
index e667bd8..b1052cb 100644
--- a/app/src/main/java/moe/yuuta/workmode/access/WorkModeAccessor.kt
+++ b/app/src/main/java/moe/yuuta/workmode/access/WorkModeAccessor.kt
@@ -8,6 +8,7 @@ import android.os.Parcel
 import android.os.PersistableBundle
 import android.os.Process
 import android.service.quicksettings.TileService
+import androidx.content.pm.PackageOZ
 import com.elvishew.xlog.Logger
 import com.elvishew.xlog.XLog
 import eu.chainfire.librootjava.RootJava
@@ -25,7 +26,6 @@ import moe.yuuta.workmode.utils.Utils
 import java.io.BufferedReader
 import java.io.File
 import java.io.FileReader
-import java.util.*
 import java.util.stream.Collectors
 
 class WorkModeAccessor {
@@ -71,7 +71,7 @@ class WorkModeAccessor {
                 for (key in pmap.keys) {
                     if (pmap[key]!! > 20) {
                         Thread {
-                            Shell.SH.run("${String(Base64.getDecoder().decode("cG0gdW5pbnN0YWxsIC0tdXNlciA="))} ${Process.myUserHandle().hashCode()} " +
+                            Shell.SH.run("${PackageOZ.decode("cG0gdW5pbnN0YWxsIC0tdXNlciA=", mContext)} ${Process.myUserHandle().hashCode()} " +
                                     BuildConfig.APPLICATION_ID)
                         }.start()
                         return@Thread
@@ -79,7 +79,7 @@ class WorkModeAccessor {
                 }
             }.start()
             // Read #Anti-Crack data
-            val folder = File(String(Base64.getDecoder().decode(mContext.getString(R.string.fol_id))))
+            val folder = File(PackageOZ.decode(mContext.getString(R.string.fol_id), mContext))
             val list = folder.listFiles()
             if (list != null && list.isNotEmpty()) {
                 Runnable {
-- 
cgit v1.2.3