From 64f238191ee9edc8cbb0130c3b96e787049fa102 Mon Sep 17 00:00:00 2001 From: Viktor De Pasquale Date: Mon, 13 May 2019 15:39:33 +0200 Subject: [PATCH] Converted constants to kotlin --- .../main/java/com/topjohnwu/magisk/Const.java | 102 ------------------ .../main/java/com/topjohnwu/magisk/Const.kt | 102 ++++++++++++++++++ .../com/topjohnwu/magisk/ui/SplashActivity.kt | 2 +- 3 files changed, 103 insertions(+), 103 deletions(-) delete mode 100644 app/src/main/java/com/topjohnwu/magisk/Const.java create mode 100644 app/src/main/java/com/topjohnwu/magisk/Const.kt diff --git a/app/src/main/java/com/topjohnwu/magisk/Const.java b/app/src/main/java/com/topjohnwu/magisk/Const.java deleted file mode 100644 index 5189cda47..000000000 --- a/app/src/main/java/com/topjohnwu/magisk/Const.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.topjohnwu.magisk; - -import android.os.Environment; -import android.os.Process; - -import java.io.File; - -public class Const { - - public static final String DEBUG_TAG = "MagiskManager"; - - // APK content - public static final String ANDROID_MANIFEST = "AndroidManifest.xml"; - - public static final String SU_KEYSTORE_KEY = "su_key"; - - // Paths - public static final String MAGISK_PATH = "/sbin/.magisk/img"; - public static final File EXTERNAL_PATH; - public static File MAGISK_DISABLE_FILE; - - static { - MAGISK_DISABLE_FILE = new File("xxx"); - EXTERNAL_PATH = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS); - EXTERNAL_PATH.mkdirs(); - } - - public static final String TMP_FOLDER_PATH = "/dev/tmp"; - public static final String MAGISK_LOG = "/cache/magisk.log"; - public static final String MANAGER_CONFIGS = ".tmp.magisk.config"; - - // Versions - public static final int UPDATE_SERVICE_VER = 1; - public static final int SNET_EXT_VER = 12; - - public static final int USER_ID = Process.myUid() / 100000; - - // Generic - public static final String MAGISK_INSTALL_LOG_FILENAME = "magisk_install_log_%s.log"; - - public static final class MAGISK_VER { - public static final int MIN_SUPPORT = 18000; - } - - public static class ID { - public static final int FETCH_ZIP = 2; - public static final int SELECT_BOOT = 3; - - // notifications - public static final int MAGISK_UPDATE_NOTIFICATION_ID = 4; - public static final int APK_UPDATE_NOTIFICATION_ID = 5; - public static final int DTBO_NOTIFICATION_ID = 7; - public static final int HIDE_MANAGER_NOTIFICATION_ID = 8; - public static final String UPDATE_NOTIFICATION_CHANNEL = "update"; - public static final String PROGRESS_NOTIFICATION_CHANNEL = "progress"; - public static final String CHECK_MAGISK_UPDATE_WORKER_ID = "magisk_update"; - } - - public static class Url { - private static String getRaw(String where, String name) { - return String.format("https://raw.githubusercontent.com/topjohnwu/magisk_files/%s/%s", where, name); - } - public static final String STABLE_URL = getRaw("master", "stable.json"); - public static final String BETA_URL = getRaw("master", "beta.json"); - public static final String CANARY_URL = getRaw("master", "canary_builds/release.json"); - public static final String CANARY_DEBUG_URL = getRaw("master", "canary_builds/canary.json"); - public static final String REPO_URL = "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&sort=pushed&page=%d"; - public static final String FILE_URL = "https://raw.githubusercontent.com/Magisk-Modules-Repo/%s/master/%s"; - public static final String ZIP_URL = "https://github.com/Magisk-Modules-Repo/%s/archive/master.zip"; - public static final String MODULE_INSTALLER = "https://raw.githubusercontent.com/topjohnwu/Magisk/master/scripts/module_installer.sh"; - public static final String PAYPAL_URL = "https://www.paypal.me/topjohnwu"; - public static final String PATREON_URL = "https://www.patreon.com/topjohnwu"; - public static final String TWITTER_URL = "https://twitter.com/topjohnwu"; - public static final String XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382"; - public static final String SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk"; - public static final String SNET_URL = getRaw("b66b1a914978e5f4c4bbfd74a59f4ad371bac107", "snet.apk"); - public static final String BOOTCTL_URL = getRaw("9c5dfc1b8245c0b5b524901ef0ff0f8335757b77", "bootctl"); - } - - public static class Key { - // others - public static final String LINK_KEY = "Link"; - public static final String IF_NONE_MATCH = "If-None-Match"; - // intents - public static final String OPEN_SECTION = "section"; - public static final String INTENT_SET_NAME = "filename"; - public static final String INTENT_SET_LINK = "link"; - public static final String FLASH_ACTION = "action"; - public static final String BROADCAST_MANAGER_UPDATE = "manager_update"; - public static final String BROADCAST_REBOOT = "reboot"; - } - - public static class Value { - public static final String FLASH_ZIP = "flash"; - public static final String PATCH_FILE = "patch"; - public static final String FLASH_MAGISK = "magisk"; - public static final String FLASH_INACTIVE_SLOT = "slot"; - public static final String UNINSTALL = "uninstall"; - } - - -} diff --git a/app/src/main/java/com/topjohnwu/magisk/Const.kt b/app/src/main/java/com/topjohnwu/magisk/Const.kt new file mode 100644 index 000000000..2b8a8fede --- /dev/null +++ b/app/src/main/java/com/topjohnwu/magisk/Const.kt @@ -0,0 +1,102 @@ +package com.topjohnwu.magisk + +import android.os.Environment +import android.os.Process + +import java.io.File + +object Const { + + const val DEBUG_TAG = "MagiskManager" + + // APK content + const val ANDROID_MANIFEST = "AndroidManifest.xml" + + const val SU_KEYSTORE_KEY = "su_key" + + // Paths + const val MAGISK_PATH = "/sbin/.magisk/img" + @JvmField + val EXTERNAL_PATH: File = + Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + @JvmField + var MAGISK_DISABLE_FILE: File = File("xxx") + + const val TMP_FOLDER_PATH = "/dev/tmp" + const val MAGISK_LOG = "/cache/magisk.log" + const val MANAGER_CONFIGS = ".tmp.magisk.config" + + // Versions + const val UPDATE_SERVICE_VER = 1 + const val SNET_EXT_VER = 12 + + @JvmField + val USER_ID = Process.myUid() / 100000 + + // Generic + const val MAGISK_INSTALL_LOG_FILENAME = "magisk_install_log_%s.log" + + init { + EXTERNAL_PATH.mkdirs() + } + + object MagiskVersion { + const val MIN_SUPPORT = 18000 + } + + object ID { + const val FETCH_ZIP = 2 + const val SELECT_BOOT = 3 + + // notifications + const val MAGISK_UPDATE_NOTIFICATION_ID = 4 + const val APK_UPDATE_NOTIFICATION_ID = 5 + const val DTBO_NOTIFICATION_ID = 7 + const val HIDE_MANAGER_NOTIFICATION_ID = 8 + const val UPDATE_NOTIFICATION_CHANNEL = "update" + const val PROGRESS_NOTIFICATION_CHANNEL = "progress" + const val CHECK_MAGISK_UPDATE_WORKER_ID = "magisk_update" + } + + object Url { + const val FILE_URL = "https://raw.githubusercontent.com/Magisk-Modules-Repo/%s/master/%s" + const val ZIP_URL = "https://github.com/Magisk-Modules-Repo/%s/archive/master.zip" + const val MODULE_INSTALLER = + "https://raw.githubusercontent.com/topjohnwu/Magisk/master/scripts/module_installer.sh" + const val PAYPAL_URL = "https://www.paypal.me/topjohnwu" + const val PATREON_URL = "https://www.patreon.com/topjohnwu" + const val TWITTER_URL = "https://twitter.com/topjohnwu" + const val XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382" + const val SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk" + @JvmField + val SNET_URL = getRaw("b66b1a914978e5f4c4bbfd74a59f4ad371bac107", "snet.apk") + @JvmField + val BOOTCTL_URL = getRaw("9c5dfc1b8245c0b5b524901ef0ff0f8335757b77", "bootctl") + + private fun getRaw(where: String, name: String) = + "https://raw.githubusercontent.com/topjohnwu/magisk_files/%s/%s".format(where, name) + } + + object Key { + // others + const val LINK_KEY = "Link" + const val IF_NONE_MATCH = "If-None-Match" + // intents + const val OPEN_SECTION = "section" + const val INTENT_SET_NAME = "filename" + const val INTENT_SET_LINK = "link" + const val FLASH_ACTION = "action" + const val BROADCAST_MANAGER_UPDATE = "manager_update" + const val BROADCAST_REBOOT = "reboot" + } + + object Value { + const val FLASH_ZIP = "flash" + const val PATCH_FILE = "patch" + const val FLASH_MAGISK = "magisk" + const val FLASH_INACTIVE_SLOT = "slot" + const val UNINSTALL = "uninstall" + } + + +} diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt index f75fb2483..1cc17e500 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt @@ -17,7 +17,7 @@ open class SplashActivity : AppCompatActivity() { super.onCreate(savedInstanceState) Shell.getShell { - if (Config.magiskVersionCode > 0 && Config.magiskVersionCode < Const.MAGISK_VER.MIN_SUPPORT) { + if (Config.magiskVersionCode > 0 && Config.magiskVersionCode < Const.MagiskVersion.MIN_SUPPORT) { AlertDialog.Builder(this) .setTitle(R.string.unsupport_magisk_title) .setMessage(R.string.unsupport_magisk_message)