From 2266362e247e7b0c8e871b34285b1ca479af2130 Mon Sep 17 00:00:00 2001 From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com> Date: Sat, 12 Apr 2025 00:33:46 +0800 Subject: [PATCH] Changing the package name --- .github/workflows/build-manager.yml | 18 ++++---- .github/workflows/ksud.yml | 2 +- .github/workflows/{zakomksd.yml => susfs.yml} | 16 +++---- manager/app/build.gradle.kts | 2 +- .../zako/zako/IKsuInterface.aidl | 3 +- manager/app/src/main/cpp/jni.cc | 24 +++++------ .../ultra => zako/zako}/UltraShellHelper.java | 6 +-- .../ultra => zako/zako}/UltraToolInstall.java | 5 +-- .../zako/zako/KernelSUApplication.kt | 2 +- .../{shirkneko => zako}/zako/zako/Kernels.kt | 2 +- .../{shirkneko => zako}/zako/zako/Natives.kt | 2 +- .../zako/zako/profile/Capabilities.kt | 2 +- .../zako/zako/profile/Groups.kt | 2 +- .../zako/zako/ui/KsuService.java | 4 +- .../zako/zako/ui/MainActivity.kt | 28 ++++++------- .../zako/zako/ui/component/AboutCard.kt | 8 ++-- .../zako/zako/ui/component/Dialog.kt | 2 +- .../zako/zako/ui/component/KeyEventBlocker.kt | 2 +- .../zako/zako/ui/component/SearchBar.kt | 4 +- .../zako/zako/ui/component/SettingsItem.kt | 2 +- .../zako/zako/ui/component/SwitchItem.kt | 2 +- .../ui/component/profile/AppProfileConfig.kt | 8 ++-- .../ui/component/profile/RootProfileConfig.kt | 14 +++---- .../ui/component/profile/TemplateConfig.kt | 12 +++--- .../zako/zako/ui/screen/AppProfile.kt | 30 ++++++------- .../zako/ui/screen/BottomBarDestination.kt | 4 +- .../zako/ui/screen/ExecuteModuleAction.kt | 10 ++--- .../zako/zako/ui/screen/Flash.kt | 8 ++-- .../zako/zako/ui/screen/Home.kt | 21 +++++----- .../zako/zako/ui/screen/Install.kt | 20 ++++----- .../zako/zako/ui/screen/Module.kt | 42 +++++++++---------- .../zako/zako/ui/screen/MoreSettings.kt | 30 ++++++------- .../zako/zako/ui/screen/Settings.kt | 34 +++++++-------- .../zako/zako/ui/screen/SuperUser.kt | 12 +++--- .../zako/zako/ui/screen/Template.kt | 8 ++-- .../zako/zako/ui/screen/TemplateEditor.kt | 18 ++++---- .../zako/zako/ui/screen/kpm.kt | 28 ++++++------- .../zako/zako/ui/theme/CardManage.kt | 2 +- .../zako/zako/ui/theme/Color.kt | 2 +- .../zako/zako/ui/theme/Theme.kt | 2 +- .../zako/zako/ui/theme/Type.kt | 2 +- .../zako/zako/ui/util/CompositionProvider.kt | 2 +- .../zako/zako/ui/util/Downloader.kt | 6 +-- .../zako/zako/ui/util/HanziToPinyin.java | 2 +- .../zako/zako/ui/util/HyperlinkText.kt | 2 +- .../zako/zako/ui/util/KsuCli.kt | 12 +++--- .../zako/zako/ui/util/LogEvent.kt | 6 +-- .../zako/zako/ui/util/ModuleModify.kt | 4 +- .../zako/zako/ui/util/SELinuxChecker.kt | 4 +- .../zako/ui/util/module/LatestVersionInfo.kt | 2 +- .../zako/zako/ui/viewmodel/KpmViewModel.kt | 4 +- .../zako/zako/ui/viewmodel/ModuleViewModel.kt | 6 +-- .../zako/ui/viewmodel/SuperUserViewModel.kt | 14 +++---- .../zako/ui/viewmodel/TemplateViewModel.kt | 14 +++---- .../zako/zako/ui/webui/MimeUtil.java | 2 +- .../zako/zako/ui/webui/SuFilePathHandler.java | 2 +- .../zako/zako/ui/webui/WebUIActivity.kt | 4 +- .../zako/zako/ui/webui/WebViewInterface.kt | 13 +++--- .../zako/zako/utils/AssetsUtil.kt | 2 +- manager/app/src/main/jniLibs/.gitignore | 4 +- userspace/ksud/Cargo.lock | 2 +- userspace/ksud/Cargo.toml | 2 +- userspace/{zakomksd => susfs}/.gitignore | 0 userspace/{zakomksd => susfs}/jni/Android.mk | 4 +- .../{zakomksd => susfs}/jni/Application.mk | 0 .../jni/zakomksd.c => susfs/jni/susfs.c} | 0 66 files changed, 275 insertions(+), 283 deletions(-) rename .github/workflows/{zakomksd.yml => susfs.yml} (65%) rename manager/app/src/main/aidl/{shirkneko => zako}/zako/zako/IKsuInterface.aidl (77%) rename manager/app/src/main/java/io/{sukisu/ultra => zako/zako}/UltraShellHelper.java (86%) rename manager/app/src/main/java/io/{sukisu/ultra => zako/zako}/UltraToolInstall.java (75%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/KernelSUApplication.kt (96%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/Kernels.kt (96%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/Natives.kt (99%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/profile/Capabilities.kt (99%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/profile/Groups.kt (99%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/KsuService.java (96%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/MainActivity.kt (91%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/component/AboutCard.kt (95%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/component/Dialog.kt (99%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/component/KeyEventBlocker.kt (94%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/component/SearchBar.kt (98%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/component/SettingsItem.kt (97%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/component/SwitchItem.kt (95%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/component/profile/AppProfileConfig.kt (91%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/component/profile/RootProfileConfig.kt (98%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/component/profile/TemplateConfig.kt (93%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/screen/AppProfile.kt (94%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/screen/BottomBarDestination.kt (95%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/screen/ExecuteModuleAction.kt (95%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/screen/Flash.kt (98%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/screen/Home.kt (98%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/screen/Install.kt (97%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/screen/Module.kt (97%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/screen/MoreSettings.kt (97%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/screen/Settings.kt (96%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/screen/SuperUser.kt (98%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/screen/Template.kt (98%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/screen/TemplateEditor.kt (96%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/screen/kpm.kt (96%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/theme/CardManage.kt (98%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/theme/Color.kt (99%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/theme/Theme.kt (99%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/theme/Type.kt (95%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/util/CompositionProvider.kt (86%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/util/Downloader.kt (97%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/util/HanziToPinyin.java (99%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/util/HyperlinkText.kt (98%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/util/KsuCli.kt (98%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/util/LogEvent.kt (97%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/util/ModuleModify.kt (99%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/util/SELinuxChecker.kt (93%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/util/module/LatestVersionInfo.kt (78%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/viewmodel/KpmViewModel.kt (98%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/viewmodel/ModuleViewModel.kt (97%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/viewmodel/SuperUserViewModel.kt (95%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/viewmodel/TemplateViewModel.kt (96%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/webui/MimeUtil.java (98%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/webui/SuFilePathHandler.java (99%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/webui/WebUIActivity.kt (97%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/ui/webui/WebViewInterface.kt (95%) rename manager/app/src/main/java/{shirkneko => zako}/zako/zako/utils/AssetsUtil.kt (95%) rename userspace/{zakomksd => susfs}/.gitignore (100%) rename userspace/{zakomksd => susfs}/jni/Android.mk (58%) rename userspace/{zakomksd => susfs}/jni/Application.mk (100%) rename userspace/{zakomksd/jni/zakomksd.c => susfs/jni/susfs.c} (100%) diff --git a/.github/workflows/build-manager.yml b/.github/workflows/build-manager.yml index ab1574b8..8eac9219 100644 --- a/.github/workflows/build-manager.yml +++ b/.github/workflows/build-manager.yml @@ -8,7 +8,7 @@ on: - 'manager/**' - 'kernel/**' - 'userspace/ksud/**' - - 'userspace/zakomksd/**' + - 'userspace/susfs/**' - 'userspace/kpmmgr/**' pull_request: branches: [ "main" ] @@ -83,7 +83,7 @@ jobs: with: upload: ${{ needs.check-build-lkm.outputs.upload_lkm == 'true' }} secrets: inherit - build-zakomksd: + build-susfs: if: ${{ always() }} needs: [ check-build-lkm, build-lkm ] strategy: @@ -91,7 +91,7 @@ jobs: include: - target: aarch64-linux-android os: ubuntu-latest - uses: ./.github/workflows/zakomksd.yml + uses: ./.github/workflows/susfs.yml with: target: ${{ matrix.target }} os: ${{ matrix.os }} @@ -174,10 +174,10 @@ jobs: - name: Setup Android SDK uses: android-actions/setup-android@v3 - - name: Download arm64 zakomksd + - name: Download arm64 susfs uses: actions/download-artifact@v4 with: - name: zakomksd-aarch64-linux-android + name: susfs-aarch64-linux-android path: . - name: Download arm64 kpmmgr @@ -202,18 +202,18 @@ jobs: run: | mkdir -p app/src/main/jniLibs/arm64-v8a mkdir -p app/src/main/jniLibs/x86_64 - cp -f ../aarch64-linux-android/release/zakomk ../manager/app/src/main/jniLibs/arm64-v8a/libzakomk.so - cp -f ../x86_64-linux-android/release/zakomk ../manager/app/src/main/jniLibs/x86_64/libzakomk.so + cp -f ../aarch64-linux-android/release/zakozako ../manager/app/src/main/jniLibs/arm64-v8a/libzakozako.so + cp -f ../x86_64-linux-android/release/zakozako ../manager/app/src/main/jniLibs/x86_64/libzakozako.so - name: Copy kpmmgr to app jniLibs run: | mkdir -p app/src/main/jniLibs/arm64-v8a cp -f ../arm64-v8a/kpmmgr ../manager/app/src/main/jniLibs/arm64-v8a/libkpmmgr.so - - name: Copy zakomksd to app jniLibs + - name: Copy susfs to app jniLibs run: | mkdir -p app/src/main/jniLibs/arm64-v8a - cp -f ../arm64-v8a/zakomksd ../manager/app/src/main/jniLibs/arm64-v8a/libzakomksd.so + cp -f ../arm64-v8a/zakozakozako ../manager/app/src/main/jniLibs/arm64-v8a/libzakozakozako.so - name: Build with Gradle run: | diff --git a/.github/workflows/ksud.yml b/.github/workflows/ksud.yml index 65f52599..5fedf28d 100644 --- a/.github/workflows/ksud.yml +++ b/.github/workflows/ksud.yml @@ -71,4 +71,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: ksud-${{ inputs.target }} - path: userspace/ksud/target/**/release/zakomk* + path: userspace/ksud/target/**/release/zakozako* diff --git a/.github/workflows/zakomksd.yml b/.github/workflows/susfs.yml similarity index 65% rename from .github/workflows/zakomksd.yml rename to .github/workflows/susfs.yml index 10fe0d85..957be1f1 100644 --- a/.github/workflows/zakomksd.yml +++ b/.github/workflows/susfs.yml @@ -1,11 +1,11 @@ -name: Build zakomksd +name: Build susfs on: push: branches: [ "mian" ] paths: - - '.github/workflows/zakomksd.yml' - - 'userspace/zakomksd/**' + - '.github/workflows/susfs.yml' + - 'userspace/susfs/**' workflow_dispatch: workflow_call: inputs: @@ -19,7 +19,7 @@ on: jobs: build-susfs: - name: Build userspace zakomksd + name: Build userspace susfs runs-on: ubuntu-latest steps: @@ -28,13 +28,13 @@ jobs: with: fetch-depth: 0 - - name: Build zakomksd - working-directory: ./userspace/zakomksd + - name: Build susfs + working-directory: ./userspace/susfs run: | $ANDROID_NDK_HOME/ndk-build - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: - name: zakomksd-aarch64-linux-android - path: ./userspace/zakomksd/libs + name: susfs-aarch64-linux-android + path: ./userspace/susfs/libs diff --git a/manager/app/build.gradle.kts b/manager/app/build.gradle.kts index 820d3c41..4ae8872b 100644 --- a/manager/app/build.gradle.kts +++ b/manager/app/build.gradle.kts @@ -25,7 +25,7 @@ apksign { } android { - namespace = "shirkneko.zako.sukisu" + namespace = "zako.zako.zako" buildTypes { release { diff --git a/manager/app/src/main/aidl/shirkneko/zako/zako/IKsuInterface.aidl b/manager/app/src/main/aidl/zako/zako/zako/IKsuInterface.aidl similarity index 77% rename from manager/app/src/main/aidl/shirkneko/zako/zako/IKsuInterface.aidl rename to manager/app/src/main/aidl/zako/zako/zako/IKsuInterface.aidl index 126c3343..63b8df06 100644 --- a/manager/app/src/main/aidl/shirkneko/zako/zako/IKsuInterface.aidl +++ b/manager/app/src/main/aidl/zako/zako/zako/IKsuInterface.aidl @@ -1,5 +1,4 @@ -// IKsuInterface.aidl -package shirkneko.zako.sukisu; +package zako.zako.zako; import android.content.pm.PackageInfo; import rikka.parcelablelist.ParcelableListSlice; diff --git a/manager/app/src/main/cpp/jni.cc b/manager/app/src/main/cpp/jni.cc index 21b39b41..15bfeb20 100644 --- a/manager/app/src/main/cpp/jni.cc +++ b/manager/app/src/main/cpp/jni.cc @@ -12,7 +12,7 @@ extern "C" JNIEXPORT jboolean JNICALL -Java_shirkneko_zako_sukisu_Natives_becomeManager(JNIEnv *env, jobject, jstring pkg) { +Java_zako_zako_zako_Natives_becomeManager(JNIEnv *env, jobject, jstring pkg) { auto cpkg = env->GetStringUTFChars(pkg, nullptr); auto result = become_manager(cpkg); env->ReleaseStringUTFChars(pkg, cpkg); @@ -21,13 +21,13 @@ Java_shirkneko_zako_sukisu_Natives_becomeManager(JNIEnv *env, jobject, jstring p extern "C" JNIEXPORT jint JNICALL -Java_shirkneko_zako_sukisu_Natives_getVersion(JNIEnv *env, jobject) { +Java_zako_zako_zako_Natives_getVersion(JNIEnv *env, jobject) { return get_version(); } extern "C" JNIEXPORT jintArray JNICALL -Java_shirkneko_zako_sukisu_Natives_getAllowList(JNIEnv *env, jobject) { +Java_zako_zako_zako_Natives_getAllowList(JNIEnv *env, jobject) { int uids[1024]; int size = 0; bool result = get_allow_list(uids, &size); @@ -42,13 +42,13 @@ Java_shirkneko_zako_sukisu_Natives_getAllowList(JNIEnv *env, jobject) { extern "C" JNIEXPORT jboolean JNICALL -Java_shirkneko_zako_sukisu_Natives_isSafeMode(JNIEnv *env, jclass clazz) { +Java_zako_zako_zako_Natives_isSafeMode(JNIEnv *env, jclass clazz) { return is_safe_mode(); } extern "C" JNIEXPORT jboolean JNICALL -Java_shirkneko_zako_sukisu_Natives_isLkmMode(JNIEnv *env, jclass clazz) { +Java_zako_zako_zako_Natives_isLkmMode(JNIEnv *env, jclass clazz) { return is_lkm_mode(); } @@ -111,7 +111,7 @@ static void fillArrayWithList(JNIEnv *env, jobject list, int *data, int count) { extern "C" JNIEXPORT jobject JNICALL -Java_shirkneko_zako_sukisu_Natives_getAppProfile(JNIEnv *env, jobject, jstring pkg, jint uid) { +Java_zako_zako_zako_Natives_getAppProfile(JNIEnv *env, jobject, jstring pkg, jint uid) { if (env->GetStringLength(pkg) > KSU_MAX_PACKAGE_NAME) { return nullptr; } @@ -129,7 +129,7 @@ Java_shirkneko_zako_sukisu_Natives_getAppProfile(JNIEnv *env, jobject, jstring p bool useDefaultProfile = !get_app_profile(key, &profile); - auto cls = env->FindClass("shirkneko/zako/sukisu/Natives$Profile"); + auto cls = env->FindClass("zako/zako/zako/Natives$Profile"); auto constructor = env->GetMethodID(cls, "", "()V"); auto obj = env->NewObject(cls, constructor); auto keyField = env->GetFieldID(cls, "name", "Ljava/lang/String;"); @@ -207,8 +207,8 @@ Java_shirkneko_zako_sukisu_Natives_getAppProfile(JNIEnv *env, jobject, jstring p extern "C" JNIEXPORT jboolean JNICALL -Java_shirkneko_zako_sukisu_Natives_setAppProfile(JNIEnv *env, jobject clazz, jobject profile) { - auto cls = env->FindClass("shirkneko/zako/sukisu/Natives$Profile"); +Java_zako_zako_zako_Natives_setAppProfile(JNIEnv *env, jobject clazz, jobject profile) { + auto cls = env->FindClass("zako/zako/zako/Natives$Profile"); auto keyField = env->GetFieldID(cls, "name", "Ljava/lang/String;"); auto currentUidField = env->GetFieldID(cls, "currentUid", "I"); @@ -293,16 +293,16 @@ Java_shirkneko_zako_sukisu_Natives_setAppProfile(JNIEnv *env, jobject clazz, job } extern "C" JNIEXPORT jboolean JNICALL -Java_shirkneko_zako_sukisu_Natives_uidShouldUmount(JNIEnv *env, jobject thiz, jint uid) { +Java_zako_zako_zako_Natives_uidShouldUmount(JNIEnv *env, jobject thiz, jint uid) { return uid_should_umount(uid); } extern "C" JNIEXPORT jboolean JNICALL -Java_shirkneko_zako_sukisu_Natives_isSuEnabled(JNIEnv *env, jobject thiz) { +Java_zako_zako_zako_Natives_isSuEnabled(JNIEnv *env, jobject thiz) { return is_su_enabled(); } extern "C" JNIEXPORT jboolean JNICALL -Java_shirkneko_zako_sukisu_Natives_setSuEnabled(JNIEnv *env, jobject thiz, jboolean enabled) { +Java_zako_zako_zako_Natives_setSuEnabled(JNIEnv *env, jobject thiz, jboolean enabled) { return set_su_enabled(enabled); } \ No newline at end of file diff --git a/manager/app/src/main/java/io/sukisu/ultra/UltraShellHelper.java b/manager/app/src/main/java/io/zako/zako/UltraShellHelper.java similarity index 86% rename from manager/app/src/main/java/io/sukisu/ultra/UltraShellHelper.java rename to manager/app/src/main/java/io/zako/zako/UltraShellHelper.java index e6d1d172..4de82aa6 100644 --- a/manager/app/src/main/java/io/sukisu/ultra/UltraShellHelper.java +++ b/manager/app/src/main/java/io/zako/zako/UltraShellHelper.java @@ -1,10 +1,8 @@ -package io.sukisu.ultra; - -import com.topjohnwu.superuser.Shell; +package io.zako.zako; import java.util.ArrayList; -import shirkneko.zako.sukisu.ui.util.KsuCli; +import zako.zako.zako.ui.util.KsuCli; public class UltraShellHelper { public static String runCmd(String cmds) { diff --git a/manager/app/src/main/java/io/sukisu/ultra/UltraToolInstall.java b/manager/app/src/main/java/io/zako/zako/UltraToolInstall.java similarity index 75% rename from manager/app/src/main/java/io/sukisu/ultra/UltraToolInstall.java rename to manager/app/src/main/java/io/zako/zako/UltraToolInstall.java index d3829e2a..88747231 100644 --- a/manager/app/src/main/java/io/sukisu/ultra/UltraToolInstall.java +++ b/manager/app/src/main/java/io/zako/zako/UltraToolInstall.java @@ -1,7 +1,6 @@ -package io.sukisu.ultra; +package io.zako.zako; -import static shirkneko.zako.sukisu.ui.util.KsuCliKt.getKpmmgrPath; -import shirkneko.zako.sukisu.ui.util.KsuCli; +import static zako.zako.zako.ui.util.KsuCliKt.getKpmmgrPath; public class UltraToolInstall { private static final String OUTSIDE_KPMMGR_PATH = "/data/adb/ksu/bin/kpmmgr"; diff --git a/manager/app/src/main/java/shirkneko/zako/zako/KernelSUApplication.kt b/manager/app/src/main/java/zako/zako/zako/KernelSUApplication.kt similarity index 96% rename from manager/app/src/main/java/shirkneko/zako/zako/KernelSUApplication.kt rename to manager/app/src/main/java/zako/zako/zako/KernelSUApplication.kt index bc6afc75..e9c16f1e 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/KernelSUApplication.kt +++ b/manager/app/src/main/java/zako/zako/zako/KernelSUApplication.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu +package zako.zako.zako import android.app.Application import coil.Coil diff --git a/manager/app/src/main/java/shirkneko/zako/zako/Kernels.kt b/manager/app/src/main/java/zako/zako/zako/Kernels.kt similarity index 96% rename from manager/app/src/main/java/shirkneko/zako/zako/Kernels.kt rename to manager/app/src/main/java/zako/zako/zako/Kernels.kt index d77e8419..b017ab19 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/Kernels.kt +++ b/manager/app/src/main/java/zako/zako/zako/Kernels.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu +package zako.zako.zako import android.system.Os diff --git a/manager/app/src/main/java/shirkneko/zako/zako/Natives.kt b/manager/app/src/main/java/zako/zako/zako/Natives.kt similarity index 99% rename from manager/app/src/main/java/shirkneko/zako/zako/Natives.kt rename to manager/app/src/main/java/zako/zako/zako/Natives.kt index 03b8e664..42f4ee95 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/Natives.kt +++ b/manager/app/src/main/java/zako/zako/zako/Natives.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu +package zako.zako.zako import android.os.Parcelable import androidx.annotation.Keep diff --git a/manager/app/src/main/java/shirkneko/zako/zako/profile/Capabilities.kt b/manager/app/src/main/java/zako/zako/zako/profile/Capabilities.kt similarity index 99% rename from manager/app/src/main/java/shirkneko/zako/zako/profile/Capabilities.kt rename to manager/app/src/main/java/zako/zako/zako/profile/Capabilities.kt index 7e2faafd..dd2fbc92 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/profile/Capabilities.kt +++ b/manager/app/src/main/java/zako/zako/zako/profile/Capabilities.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.profile +package zako.zako.zako.profile /** * @author weishu diff --git a/manager/app/src/main/java/shirkneko/zako/zako/profile/Groups.kt b/manager/app/src/main/java/zako/zako/zako/profile/Groups.kt similarity index 99% rename from manager/app/src/main/java/shirkneko/zako/zako/profile/Groups.kt rename to manager/app/src/main/java/zako/zako/zako/profile/Groups.kt index 04dddb36..d0015400 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/profile/Groups.kt +++ b/manager/app/src/main/java/zako/zako/zako/profile/Groups.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.profile +package zako.zako.zako.profile /** * https://cs.android.com/android/platform/superproject/main/+/main:system/core/libcutils/include/private/android_filesystem_config.h diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/KsuService.java b/manager/app/src/main/java/zako/zako/zako/ui/KsuService.java similarity index 96% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/KsuService.java rename to manager/app/src/main/java/zako/zako/zako/ui/KsuService.java index 71d3ddb9..57debc26 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/KsuService.java +++ b/manager/app/src/main/java/zako/zako/zako/ui/KsuService.java @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui; +package zako.zako.zako.ui; import android.content.Context; import android.content.Intent; @@ -17,7 +17,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import shirkneko.zako.sukisu.IKsuInterface; +import zako.zako.zako.IKsuInterface; import rikka.parcelablelist.ParcelableListSlice; /** diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/MainActivity.kt b/manager/app/src/main/java/zako/zako/zako/ui/MainActivity.kt similarity index 91% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/MainActivity.kt rename to manager/app/src/main/java/zako/zako/zako/ui/MainActivity.kt index 3e34f2d5..6d5d3522 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/MainActivity.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/MainActivity.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui +package zako.zako.zako.ui import android.os.Build import android.os.Bundle @@ -30,8 +30,6 @@ import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.luminance import androidx.compose.ui.res.stringResource import androidx.navigation.NavBackStackEntry import androidx.navigation.NavHostController @@ -41,18 +39,18 @@ import com.ramcosta.composedestinations.animations.NavHostAnimatedDestinationSty import com.ramcosta.composedestinations.generated.NavGraphs import com.ramcosta.composedestinations.utils.isRouteOnBackStackAsState import com.ramcosta.composedestinations.utils.rememberDestinationsNavigator -import io.sukisu.ultra.UltraToolInstall -import shirkneko.zako.sukisu.Natives -import shirkneko.zako.sukisu.ksuApp -import shirkneko.zako.sukisu.ui.screen.BottomBarDestination -import shirkneko.zako.sukisu.ui.theme.CardConfig -import shirkneko.zako.sukisu.ui.theme.KernelSUTheme -import shirkneko.zako.sukisu.ui.theme.loadCustomBackground -import shirkneko.zako.sukisu.ui.theme.loadThemeMode -import shirkneko.zako.sukisu.ui.util.LocalSnackbarHost -import shirkneko.zako.sukisu.ui.util.getKpmVersion -import shirkneko.zako.sukisu.ui.util.rootAvailable -import shirkneko.zako.sukisu.ui.util.install +import io.zako.zako.UltraToolInstall +import zako.zako.zako.Natives +import zako.zako.zako.ksuApp +import zako.zako.zako.ui.screen.BottomBarDestination +import zako.zako.zako.ui.theme.CardConfig +import zako.zako.zako.ui.theme.KernelSUTheme +import zako.zako.zako.ui.theme.loadCustomBackground +import zako.zako.zako.ui.theme.loadThemeMode +import zako.zako.zako.ui.util.LocalSnackbarHost +import zako.zako.zako.ui.util.getKpmVersion +import zako.zako.zako.ui.util.rootAvailable +import zako.zako.zako.ui.util.install class MainActivity : ComponentActivity() { diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/AboutCard.kt b/manager/app/src/main/java/zako/zako/zako/ui/component/AboutCard.kt similarity index 95% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/component/AboutCard.kt rename to manager/app/src/main/java/zako/zako/zako/ui/component/AboutCard.kt index 2a9d7a7a..ff483606 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/AboutCard.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/component/AboutCard.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.component +package zako.zako.zako.ui.component import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Column @@ -31,8 +31,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.window.Dialog -import shirkneko.zako.sukisu.BuildConfig -import shirkneko.zako.sukisu.R +import zako.zako.zako.BuildConfig +import zako.zako.zako.R @Preview @Composable @@ -98,7 +98,7 @@ private fun AboutCardContent() { val annotatedString = AnnotatedString.Companion.fromHtml( htmlString = stringResource( id = R.string.about_source_code, - "GitHub", + "GitHub", "Telegram" ), linkStyles = TextLinkStyles( diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/Dialog.kt b/manager/app/src/main/java/zako/zako/zako/ui/component/Dialog.kt similarity index 99% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/component/Dialog.kt rename to manager/app/src/main/java/zako/zako/zako/ui/component/Dialog.kt index 3bc75030..13c9f54e 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/Dialog.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/component/Dialog.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.component +package zako.zako.zako.ui.component import android.graphics.text.LineBreaker import android.os.Build diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/KeyEventBlocker.kt b/manager/app/src/main/java/zako/zako/zako/ui/component/KeyEventBlocker.kt similarity index 94% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/component/KeyEventBlocker.kt rename to manager/app/src/main/java/zako/zako/zako/ui/component/KeyEventBlocker.kt index 325ed92d..954255dd 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/KeyEventBlocker.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/component/KeyEventBlocker.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.component +package zako.zako.zako.ui.component import androidx.compose.foundation.focusable import androidx.compose.foundation.layout.Box diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/SearchBar.kt b/manager/app/src/main/java/zako/zako/zako/ui/component/SearchBar.kt similarity index 98% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/component/SearchBar.kt rename to manager/app/src/main/java/zako/zako/zako/ui/component/SearchBar.kt index eb412617..d7bc237a 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/SearchBar.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/component/SearchBar.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.component +package zako.zako.zako.ui.component import android.util.Log import androidx.compose.animation.AnimatedVisibility @@ -42,7 +42,7 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import shirkneko.zako.sukisu.ui.theme.CardConfig +import zako.zako.zako.ui.theme.CardConfig private const val TAG = "SearchBar" diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/SettingsItem.kt b/manager/app/src/main/java/zako/zako/zako/ui/component/SettingsItem.kt similarity index 97% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/component/SettingsItem.kt rename to manager/app/src/main/java/zako/zako/zako/ui/component/SettingsItem.kt index 1c8ce6db..eb0eb60a 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/SettingsItem.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/component/SettingsItem.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.component +package zako.zako.zako.ui.component import androidx.compose.foundation.LocalIndication import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/SwitchItem.kt b/manager/app/src/main/java/zako/zako/zako/ui/component/SwitchItem.kt similarity index 95% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/component/SwitchItem.kt rename to manager/app/src/main/java/zako/zako/zako/ui/component/SwitchItem.kt index 637564f8..fd2f6857 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/SwitchItem.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/component/SwitchItem.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.component +package zako.zako.zako.ui.component import androidx.compose.material3.Icon import androidx.compose.material3.ListItem diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/profile/AppProfileConfig.kt b/manager/app/src/main/java/zako/zako/zako/ui/component/profile/AppProfileConfig.kt similarity index 91% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/component/profile/AppProfileConfig.kt rename to manager/app/src/main/java/zako/zako/zako/ui/component/profile/AppProfileConfig.kt index 0aa53b08..a5ab6a77 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/profile/AppProfileConfig.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/component/profile/AppProfileConfig.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.component.profile +package zako.zako.zako.ui.component.profile import androidx.compose.foundation.layout.Column import androidx.compose.material3.OutlinedTextField @@ -11,9 +11,9 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import shirkneko.zako.sukisu.Natives -import shirkneko.zako.sukisu.R -import shirkneko.zako.sukisu.ui.component.SwitchItem +import zako.zako.zako.Natives +import zako.zako.zako.R +import zako.zako.zako.ui.component.SwitchItem @Composable fun AppProfileConfig( diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/profile/RootProfileConfig.kt b/manager/app/src/main/java/zako/zako/zako/ui/component/profile/RootProfileConfig.kt similarity index 98% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/component/profile/RootProfileConfig.kt rename to manager/app/src/main/java/zako/zako/zako/ui/component/profile/RootProfileConfig.kt index 8a6bdd3a..c96c8835 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/profile/RootProfileConfig.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/component/profile/RootProfileConfig.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.component.profile +package zako.zako.zako.ui.component.profile import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column @@ -42,12 +42,12 @@ import com.maxkeppeler.sheets.input.models.ValidationResult import com.maxkeppeler.sheets.list.ListDialog import com.maxkeppeler.sheets.list.models.ListOption import com.maxkeppeler.sheets.list.models.ListSelection -import shirkneko.zako.sukisu.Natives -import shirkneko.zako.sukisu.R -import shirkneko.zako.sukisu.profile.Capabilities -import shirkneko.zako.sukisu.profile.Groups -import shirkneko.zako.sukisu.ui.component.rememberCustomDialog -import shirkneko.zako.sukisu.ui.util.isSepolicyValid +import zako.zako.zako.Natives +import zako.zako.zako.R +import zako.zako.zako.profile.Capabilities +import zako.zako.zako.profile.Groups +import zako.zako.zako.ui.component.rememberCustomDialog +import zako.zako.zako.ui.util.isSepolicyValid @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/profile/TemplateConfig.kt b/manager/app/src/main/java/zako/zako/zako/ui/component/profile/TemplateConfig.kt similarity index 93% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/component/profile/TemplateConfig.kt rename to manager/app/src/main/java/zako/zako/zako/ui/component/profile/TemplateConfig.kt index 5100343e..fc1334ed 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/component/profile/TemplateConfig.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/component/profile/TemplateConfig.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.component.profile +package zako.zako.zako.ui.component.profile import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material.icons.Icons @@ -23,11 +23,11 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import shirkneko.zako.sukisu.Natives -import shirkneko.zako.sukisu.R -import shirkneko.zako.sukisu.ui.util.listAppProfileTemplates -import shirkneko.zako.sukisu.ui.util.setSepolicy -import shirkneko.zako.sukisu.ui.viewmodel.getTemplateInfoById +import zako.zako.zako.Natives +import zako.zako.zako.R +import zako.zako.zako.ui.util.listAppProfileTemplates +import zako.zako.zako.ui.util.setSepolicy +import zako.zako.zako.ui.viewmodel.getTemplateInfoById /** * @author weishu diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/AppProfile.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/AppProfile.kt similarity index 94% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/screen/AppProfile.kt rename to manager/app/src/main/java/zako/zako/zako/ui/screen/AppProfile.kt index 6d7ee314..a662ad28 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/AppProfile.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/AppProfile.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.screen +package zako.zako.zako.ui.screen import androidx.annotation.StringRes import androidx.compose.animation.Crossfade @@ -64,20 +64,20 @@ import com.ramcosta.composedestinations.generated.destinations.AppProfileTemplat import com.ramcosta.composedestinations.generated.destinations.TemplateEditorScreenDestination import com.ramcosta.composedestinations.navigation.DestinationsNavigator import kotlinx.coroutines.launch -import shirkneko.zako.sukisu.Natives -import shirkneko.zako.sukisu.R -import shirkneko.zako.sukisu.ui.component.SwitchItem -import shirkneko.zako.sukisu.ui.component.profile.AppProfileConfig -import shirkneko.zako.sukisu.ui.component.profile.RootProfileConfig -import shirkneko.zako.sukisu.ui.component.profile.TemplateConfig -import shirkneko.zako.sukisu.ui.util.LocalSnackbarHost -import shirkneko.zako.sukisu.ui.util.forceStopApp -import shirkneko.zako.sukisu.ui.util.getSepolicy -import shirkneko.zako.sukisu.ui.util.launchApp -import shirkneko.zako.sukisu.ui.util.restartApp -import shirkneko.zako.sukisu.ui.util.setSepolicy -import shirkneko.zako.sukisu.ui.viewmodel.SuperUserViewModel -import shirkneko.zako.sukisu.ui.viewmodel.getTemplateInfoById +import zako.zako.zako.Natives +import zako.zako.zako.R +import zako.zako.zako.ui.component.SwitchItem +import zako.zako.zako.ui.component.profile.AppProfileConfig +import zako.zako.zako.ui.component.profile.RootProfileConfig +import zako.zako.zako.ui.component.profile.TemplateConfig +import zako.zako.zako.ui.util.LocalSnackbarHost +import zako.zako.zako.ui.util.forceStopApp +import zako.zako.zako.ui.util.getSepolicy +import zako.zako.zako.ui.util.launchApp +import zako.zako.zako.ui.util.restartApp +import zako.zako.zako.ui.util.setSepolicy +import zako.zako.zako.ui.viewmodel.SuperUserViewModel +import zako.zako.zako.ui.viewmodel.getTemplateInfoById /** * @author weishu diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/BottomBarDestination.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/BottomBarDestination.kt similarity index 95% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/screen/BottomBarDestination.kt rename to manager/app/src/main/java/zako/zako/zako/ui/screen/BottomBarDestination.kt index 0812085b..deb2ad7a 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/BottomBarDestination.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/BottomBarDestination.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.screen +package zako.zako.zako.ui.screen import androidx.annotation.StringRes import androidx.compose.material.icons.Icons @@ -11,7 +11,7 @@ import com.ramcosta.composedestinations.generated.destinations.SuperUserScreenDe import com.ramcosta.composedestinations.generated.destinations.SettingScreenDestination import com.ramcosta.composedestinations.generated.destinations.KpmScreenDestination import com.ramcosta.composedestinations.spec.DirectionDestinationSpec -import shirkneko.zako.sukisu.R +import zako.zako.zako.R enum class BottomBarDestination( val direction: DirectionDestinationSpec, diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/ExecuteModuleAction.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/ExecuteModuleAction.kt similarity index 95% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/screen/ExecuteModuleAction.kt rename to manager/app/src/main/java/zako/zako/zako/ui/screen/ExecuteModuleAction.kt index 79aae3f0..284891ec 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/ExecuteModuleAction.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/ExecuteModuleAction.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.screen +package zako.zako.zako.ui.screen import android.os.Environment import androidx.compose.foundation.layout.Column @@ -37,10 +37,10 @@ import com.ramcosta.composedestinations.navigation.DestinationsNavigator import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import shirkneko.zako.sukisu.R -import shirkneko.zako.sukisu.ui.component.KeyEventBlocker -import shirkneko.zako.sukisu.ui.util.LocalSnackbarHost -import shirkneko.zako.sukisu.ui.util.runModuleAction +import zako.zako.zako.R +import zako.zako.zako.ui.component.KeyEventBlocker +import zako.zako.zako.ui.util.LocalSnackbarHost +import zako.zako.zako.ui.util.runModuleAction import java.io.File import java.text.SimpleDateFormat import java.util.Date diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Flash.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/Flash.kt similarity index 98% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Flash.kt rename to manager/app/src/main/java/zako/zako/zako/ui/screen/Flash.kt index d3663517..2a10f8f5 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Flash.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/Flash.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.screen +package zako.zako.zako.ui.screen import android.net.Uri import android.os.Environment @@ -30,9 +30,9 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import kotlinx.parcelize.Parcelize -import shirkneko.zako.sukisu.R -import shirkneko.zako.sukisu.ui.component.KeyEventBlocker -import shirkneko.zako.sukisu.ui.util.* +import zako.zako.zako.ui.component.KeyEventBlocker +import zako.zako.zako.ui.util.* +import zako.zako.zako.R import java.io.File import java.text.SimpleDateFormat import java.util.* diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Home.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/Home.kt similarity index 98% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Home.kt rename to manager/app/src/main/java/zako/zako/zako/ui/screen/Home.kt index b274f28a..c9720caf 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Home.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/Home.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.screen +package zako.zako.zako.ui.screen import android.annotation.SuppressLint import android.content.Context @@ -33,15 +33,15 @@ import com.ramcosta.composedestinations.generated.destinations.SettingScreenDest import com.ramcosta.composedestinations.navigation.DestinationsNavigator import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import shirkneko.zako.sukisu.* -import shirkneko.zako.sukisu.R -import shirkneko.zako.sukisu.ui.component.rememberConfirmDialog -import shirkneko.zako.sukisu.ui.util.* -import shirkneko.zako.sukisu.ui.util.module.LatestVersionInfo +import zako.zako.zako.* +import zako.zako.zako.R +import zako.zako.zako.ui.component.rememberConfirmDialog +import zako.zako.zako.ui.util.* +import zako.zako.zako.ui.util.module.LatestVersionInfo import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import shirkneko.zako.sukisu.ui.theme.getCardColors -import shirkneko.zako.sukisu.ui.theme.getCardElevation +import zako.zako.zako.ui.theme.getCardColors +import zako.zako.zako.ui.theme.getCardElevation import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.getValue import androidx.compose.runtime.setValue @@ -49,11 +49,10 @@ import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeOut import androidx.compose.animation.shrinkVertically import androidx.compose.runtime.saveable.rememberSaveable -import shirkneko.zako.sukisu.ui.theme.CardConfig +import zako.zako.zako.ui.theme.CardConfig import androidx.core.content.edit import java.io.BufferedReader import java.io.InputStreamReader -import java.util.Scanner import java.util.zip.GZIPInputStream import kotlin.random.Random @@ -442,7 +441,7 @@ fun WarningCard( @Composable fun ContributionCard() { val uriHandler = LocalUriHandler.current - val links = listOf("https://github.com/ShirkNeko", "https://github.com/udochina") + val links = listOf("https://github.com/zako", "https://github.com/udochina") ElevatedCard( colors = getCardColors(MaterialTheme.colorScheme.secondaryContainer), elevation = CardDefaults.cardElevation(defaultElevation = getCardElevation()) diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Install.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/Install.kt similarity index 97% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Install.kt rename to manager/app/src/main/java/zako/zako/zako/ui/screen/Install.kt index 28e19c45..83290dce 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Install.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/Install.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.screen +package zako.zako.zako.ui.screen import android.app.Activity import android.content.Context @@ -35,15 +35,15 @@ import com.ramcosta.composedestinations.annotation.RootGraph import com.ramcosta.composedestinations.generated.destinations.FlashScreenDestination import com.ramcosta.composedestinations.navigation.DestinationsNavigator import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator -import shirkneko.zako.sukisu.R -import shirkneko.zako.sukisu.ui.component.DialogHandle -import shirkneko.zako.sukisu.ui.component.rememberConfirmDialog -import shirkneko.zako.sukisu.ui.component.rememberCustomDialog -import shirkneko.zako.sukisu.ui.theme.ThemeConfig -import shirkneko.zako.sukisu.ui.theme.getCardColors -import shirkneko.zako.sukisu.ui.theme.getCardElevation -import shirkneko.zako.sukisu.ui.util.* -import shirkneko.zako.sukisu.utils.AssetsUtil +import zako.zako.zako.ui.component.DialogHandle +import zako.zako.zako.ui.component.rememberConfirmDialog +import zako.zako.zako.ui.component.rememberCustomDialog +import zako.zako.zako.ui.theme.ThemeConfig +import zako.zako.zako.ui.theme.getCardColors +import zako.zako.zako.ui.theme.getCardElevation +import zako.zako.zako.ui.util.* +import zako.zako.zako.R +import zako.zako.zako.utils.AssetsUtil import java.io.File import java.io.FileOutputStream import java.io.IOException diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Module.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/Module.kt similarity index 97% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Module.kt rename to manager/app/src/main/java/zako/zako/zako/ui/screen/Module.kt index 3286925b..9e26fd33 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Module.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/Module.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.screen +package zako.zako.zako.ui.screen import android.app.Activity.* import android.content.Context @@ -88,32 +88,32 @@ import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import shirkneko.zako.sukisu.Natives -import shirkneko.zako.sukisu.R -import shirkneko.zako.sukisu.ui.component.ConfirmResult -import shirkneko.zako.sukisu.ui.component.SearchAppBar -import shirkneko.zako.sukisu.ui.component.rememberConfirmDialog -import shirkneko.zako.sukisu.ui.component.rememberLoadingDialog -import shirkneko.zako.sukisu.ui.util.DownloadListener -import shirkneko.zako.sukisu.ui.util.* -import shirkneko.zako.sukisu.ui.util.download -import shirkneko.zako.sukisu.ui.util.hasMagisk -import shirkneko.zako.sukisu.ui.util.reboot -import shirkneko.zako.sukisu.ui.util.restoreModule -import shirkneko.zako.sukisu.ui.util.toggleModule -import shirkneko.zako.sukisu.ui.util.uninstallModule -import shirkneko.zako.sukisu.ui.webui.WebUIActivity +import zako.zako.zako.Natives +import zako.zako.zako.ui.component.ConfirmResult +import zako.zako.zako.ui.component.SearchAppBar +import zako.zako.zako.ui.component.rememberConfirmDialog +import zako.zako.zako.ui.component.rememberLoadingDialog +import zako.zako.zako.ui.util.DownloadListener +import zako.zako.zako.ui.util.* +import zako.zako.zako.ui.util.download +import zako.zako.zako.ui.util.hasMagisk +import zako.zako.zako.ui.util.reboot +import zako.zako.zako.ui.util.restoreModule +import zako.zako.zako.ui.util.toggleModule +import zako.zako.zako.ui.util.uninstallModule +import zako.zako.zako.ui.webui.WebUIActivity import okhttp3.OkHttpClient -import shirkneko.zako.sukisu.ui.util.ModuleModify -import shirkneko.zako.sukisu.ui.theme.getCardColors -import shirkneko.zako.sukisu.ui.theme.getCardElevation -import shirkneko.zako.sukisu.ui.viewmodel.ModuleViewModel +import zako.zako.zako.ui.util.ModuleModify +import zako.zako.zako.ui.theme.getCardColors +import zako.zako.zako.ui.theme.getCardElevation +import zako.zako.zako.ui.viewmodel.ModuleViewModel import java.io.BufferedReader import java.io.InputStreamReader import java.util.zip.ZipInputStream import androidx.core.content.edit import androidx.core.net.toUri -import shirkneko.zako.sukisu.ui.theme.ThemeConfig +import zako.zako.zako.ui.theme.ThemeConfig +import zako.zako.zako.R @OptIn(ExperimentalMaterial3Api::class) diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/MoreSettings.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/MoreSettings.kt similarity index 97% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/screen/MoreSettings.kt rename to manager/app/src/main/java/zako/zako/zako/ui/screen/MoreSettings.kt index f3e5c1b7..8734bc55 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/MoreSettings.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/MoreSettings.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.screen +package zako.zako.zako.ui.screen import androidx.compose.animation.AnimatedVisibility import android.content.Context @@ -37,21 +37,21 @@ import com.topjohnwu.superuser.Shell import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import shirkneko.zako.sukisu.R -import shirkneko.zako.sukisu.ui.component.SwitchItem -import shirkneko.zako.sukisu.ui.theme.CardConfig -import shirkneko.zako.sukisu.ui.theme.ThemeColors -import shirkneko.zako.sukisu.ui.theme.ThemeConfig -import shirkneko.zako.sukisu.ui.theme.saveCustomBackground -import shirkneko.zako.sukisu.ui.theme.saveThemeColors -import shirkneko.zako.sukisu.ui.theme.saveThemeMode -import shirkneko.zako.sukisu.ui.theme.saveDynamicColorState -import shirkneko.zako.sukisu.ui.util.getSuSFS -import shirkneko.zako.sukisu.ui.util.getSuSFSFeatures -import shirkneko.zako.sukisu.ui.util.susfsSUS_SU_0 -import shirkneko.zako.sukisu.ui.util.susfsSUS_SU_2 -import shirkneko.zako.sukisu.ui.util.susfsSUS_SU_Mode +import zako.zako.zako.ui.component.SwitchItem +import zako.zako.zako.ui.theme.CardConfig +import zako.zako.zako.ui.theme.ThemeColors +import zako.zako.zako.ui.theme.ThemeConfig +import zako.zako.zako.ui.theme.saveCustomBackground +import zako.zako.zako.ui.theme.saveThemeColors +import zako.zako.zako.ui.theme.saveThemeMode +import zako.zako.zako.ui.theme.saveDynamicColorState +import zako.zako.zako.ui.util.getSuSFS +import zako.zako.zako.ui.util.getSuSFSFeatures +import zako.zako.zako.ui.util.susfsSUS_SU_0 +import zako.zako.zako.ui.util.susfsSUS_SU_2 +import zako.zako.zako.ui.util.susfsSUS_SU_Mode import androidx.core.content.edit +import zako.zako.zako.R fun saveCardConfig(context: Context) { diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Settings.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/Settings.kt similarity index 96% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Settings.kt rename to manager/app/src/main/java/zako/zako/zako/ui/screen/Settings.kt index 77cdeef8..06385c13 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Settings.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/Settings.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.screen +package zako.zako.zako.ui.screen import android.content.Context import android.content.Intent @@ -64,22 +64,22 @@ import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import shirkneko.zako.sukisu.BuildConfig -import shirkneko.zako.sukisu.Natives -import shirkneko.zako.sukisu.R -import shirkneko.zako.sukisu.ui.component.AboutDialog -import shirkneko.zako.sukisu.ui.component.ConfirmResult -import shirkneko.zako.sukisu.ui.component.DialogHandle -import shirkneko.zako.sukisu.ui.component.SwitchItem -import shirkneko.zako.sukisu.ui.component.rememberConfirmDialog -import shirkneko.zako.sukisu.ui.component.rememberCustomDialog -import shirkneko.zako.sukisu.ui.component.rememberLoadingDialog -import shirkneko.zako.sukisu.ui.theme.CardConfig -import shirkneko.zako.sukisu.ui.theme.ThemeConfig -import shirkneko.zako.sukisu.ui.theme.getCardColors -import shirkneko.zako.sukisu.ui.theme.getCardElevation -import shirkneko.zako.sukisu.ui.util.LocalSnackbarHost -import shirkneko.zako.sukisu.ui.util.getBugreportFile +import zako.zako.zako.BuildConfig +import zako.zako.zako.Natives +import zako.zako.zako.R +import zako.zako.zako.ui.component.AboutDialog +import zako.zako.zako.ui.component.ConfirmResult +import zako.zako.zako.ui.component.DialogHandle +import zako.zako.zako.ui.component.SwitchItem +import zako.zako.zako.ui.component.rememberConfirmDialog +import zako.zako.zako.ui.component.rememberCustomDialog +import zako.zako.zako.ui.component.rememberLoadingDialog +import zako.zako.zako.ui.theme.CardConfig +import zako.zako.zako.ui.theme.ThemeConfig +import zako.zako.zako.ui.theme.getCardColors +import zako.zako.zako.ui.theme.getCardElevation +import zako.zako.zako.ui.util.LocalSnackbarHost +import zako.zako.zako.ui.util.getBugreportFile import java.time.LocalDateTime import java.time.format.DateTimeFormatter diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/SuperUser.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/SuperUser.kt similarity index 98% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/screen/SuperUser.kt rename to manager/app/src/main/java/zako/zako/zako/ui/screen/SuperUser.kt index 0cef65bb..f177b664 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/SuperUser.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/SuperUser.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.screen +package zako.zako.zako.ui.screen import androidx.compose.foundation.background import androidx.compose.foundation.gestures.detectTapGestures @@ -24,6 +24,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.viewmodel.compose.viewModel +import zako.zako.zako.R import coil.compose.AsyncImage import coil.request.ImageRequest import com.ramcosta.composedestinations.annotation.Destination @@ -31,11 +32,10 @@ import com.ramcosta.composedestinations.annotation.RootGraph import com.ramcosta.composedestinations.generated.destinations.AppProfileScreenDestination import com.ramcosta.composedestinations.navigation.DestinationsNavigator import kotlinx.coroutines.launch -import shirkneko.zako.sukisu.Natives -import shirkneko.zako.sukisu.R -import shirkneko.zako.sukisu.ui.component.SearchAppBar -import shirkneko.zako.sukisu.ui.util.ModuleModify -import shirkneko.zako.sukisu.ui.viewmodel.SuperUserViewModel +import zako.zako.zako.Natives +import zako.zako.zako.ui.component.SearchAppBar +import zako.zako.zako.ui.util.ModuleModify +import zako.zako.zako.ui.viewmodel.SuperUserViewModel @OptIn(ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class) @Destination diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Template.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/Template.kt similarity index 98% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Template.kt rename to manager/app/src/main/java/zako/zako/zako/ui/screen/Template.kt index 3ba1dd79..80571466 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/Template.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/Template.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.screen +package zako.zako.zako.ui.screen import android.widget.Toast import androidx.compose.foundation.clickable @@ -59,9 +59,9 @@ import com.ramcosta.composedestinations.result.ResultRecipient import com.ramcosta.composedestinations.result.getOr import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import shirkneko.zako.sukisu.R -import shirkneko.zako.sukisu.ui.theme.ThemeConfig -import shirkneko.zako.sukisu.ui.viewmodel.TemplateViewModel +import zako.zako.zako.R +import zako.zako.zako.ui.theme.ThemeConfig +import zako.zako.zako.ui.viewmodel.TemplateViewModel /** * @author weishu diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/TemplateEditor.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/TemplateEditor.kt similarity index 96% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/screen/TemplateEditor.kt rename to manager/app/src/main/java/zako/zako/zako/ui/screen/TemplateEditor.kt index 3a7dee79..61e80d55 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/TemplateEditor.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/TemplateEditor.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.screen +package zako.zako.zako.ui.screen import android.widget.Toast import androidx.activity.compose.BackHandler @@ -47,14 +47,14 @@ import androidx.compose.ui.text.input.KeyboardType import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootGraph import com.ramcosta.composedestinations.result.ResultBackNavigator -import shirkneko.zako.sukisu.Natives -import shirkneko.zako.sukisu.R -import shirkneko.zako.sukisu.ui.component.profile.RootProfileConfig -import shirkneko.zako.sukisu.ui.util.deleteAppProfileTemplate -import shirkneko.zako.sukisu.ui.util.getAppProfileTemplate -import shirkneko.zako.sukisu.ui.util.setAppProfileTemplate -import shirkneko.zako.sukisu.ui.viewmodel.TemplateViewModel -import shirkneko.zako.sukisu.ui.viewmodel.toJSON +import zako.zako.zako.Natives +import zako.zako.zako.R +import zako.zako.zako.ui.component.profile.RootProfileConfig +import zako.zako.zako.ui.util.deleteAppProfileTemplate +import zako.zako.zako.ui.util.getAppProfileTemplate +import zako.zako.zako.ui.util.setAppProfileTemplate +import zako.zako.zako.ui.viewmodel.TemplateViewModel +import zako.zako.zako.ui.viewmodel.toJSON import androidx.lifecycle.compose.dropUnlessResumed /** diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/kpm.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/kpm.kt similarity index 96% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/screen/kpm.kt rename to manager/app/src/main/java/zako/zako/zako/ui/screen/kpm.kt index d3c689ad..7b11603b 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/screen/kpm.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/kpm.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.screen +package zako.zako.zako.ui.screen import android.app.Activity.RESULT_OK import android.content.Context @@ -25,27 +25,27 @@ import com.ramcosta.composedestinations.annotation.RootGraph import com.ramcosta.composedestinations.navigation.DestinationsNavigator import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import shirkneko.zako.sukisu.R -import shirkneko.zako.sukisu.ui.component.ConfirmResult -import shirkneko.zako.sukisu.ui.component.SearchAppBar -import shirkneko.zako.sukisu.ui.component.rememberConfirmDialog -import shirkneko.zako.sukisu.ui.theme.getCardColors -import shirkneko.zako.sukisu.ui.theme.getCardElevation -import shirkneko.zako.sukisu.ui.viewmodel.KpmViewModel -import shirkneko.zako.sukisu.ui.util.loadKpmModule -import shirkneko.zako.sukisu.ui.util.unloadKpmModule +import zako.zako.zako.ui.component.ConfirmResult +import zako.zako.zako.ui.component.SearchAppBar +import zako.zako.zako.ui.component.rememberConfirmDialog +import zako.zako.zako.ui.theme.getCardColors +import zako.zako.zako.ui.theme.getCardElevation +import zako.zako.zako.ui.viewmodel.KpmViewModel +import zako.zako.zako.ui.util.loadKpmModule +import zako.zako.zako.ui.util.unloadKpmModule import java.io.File import androidx.core.content.edit -import shirkneko.zako.sukisu.ui.theme.ThemeConfig -import shirkneko.zako.sukisu.ui.component.rememberCustomDialog -import shirkneko.zako.sukisu.ui.component.ConfirmDialogHandle +import zako.zako.zako.ui.theme.ThemeConfig +import zako.zako.zako.ui.component.rememberCustomDialog +import zako.zako.zako.ui.component.ConfirmDialogHandle +import zako.zako.zako.R import java.net.URLDecoder import java.net.URLEncoder /** * KPM 管理界面 * 以下内核模块功能由KernelPatch开发，经过修改后加入SukiSU Ultra的内核模块功能 - * 开发者：Shirkneko, Liaokong + * 开发者：zako, Liaokong */ @OptIn(ExperimentalMaterial3Api::class) @Destination diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/theme/CardManage.kt b/manager/app/src/main/java/zako/zako/zako/ui/theme/CardManage.kt similarity index 98% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/theme/CardManage.kt rename to manager/app/src/main/java/zako/zako/zako/ui/theme/CardManage.kt index 16048c2c..0abd702b 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/theme/CardManage.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/theme/CardManage.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.theme +package zako.zako.zako.ui.theme import android.content.Context import androidx.compose.foundation.isSystemInDarkTheme diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/theme/Color.kt b/manager/app/src/main/java/zako/zako/zako/ui/theme/Color.kt similarity index 99% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/theme/Color.kt rename to manager/app/src/main/java/zako/zako/zako/ui/theme/Color.kt index 55f76d96..c34c1c00 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/theme/Color.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.theme +package zako.zako.zako.ui.theme import androidx.compose.ui.graphics.Color diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/theme/Theme.kt b/manager/app/src/main/java/zako/zako/zako/ui/theme/Theme.kt similarity index 99% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/theme/Theme.kt rename to manager/app/src/main/java/zako/zako/zako/ui/theme/Theme.kt index 4ac64ad5..6bbc2209 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/theme/Theme.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.theme +package zako.zako.zako.ui.theme import android.content.ContentResolver import android.content.Context diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/theme/Type.kt b/manager/app/src/main/java/zako/zako/zako/ui/theme/Type.kt similarity index 95% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/theme/Type.kt rename to manager/app/src/main/java/zako/zako/zako/ui/theme/Type.kt index 171c50ec..e305a8ce 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/theme/Type.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.theme +package zako.zako.zako.ui.theme import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontFamily diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/CompositionProvider.kt b/manager/app/src/main/java/zako/zako/zako/ui/util/CompositionProvider.kt similarity index 86% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/util/CompositionProvider.kt rename to manager/app/src/main/java/zako/zako/zako/ui/util/CompositionProvider.kt index debf62b9..4c51f0aa 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/CompositionProvider.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/util/CompositionProvider.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.util +package zako.zako.zako.ui.util import androidx.compose.material3.SnackbarHostState import androidx.compose.runtime.compositionLocalOf diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/Downloader.kt b/manager/app/src/main/java/zako/zako/zako/ui/util/Downloader.kt similarity index 97% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/util/Downloader.kt rename to manager/app/src/main/java/zako/zako/zako/ui/util/Downloader.kt index 8791f492..b31187be 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/Downloader.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/util/Downloader.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.util +package zako.zako.zako.ui.util import android.annotation.SuppressLint import android.app.DownloadManager @@ -12,7 +12,7 @@ import android.util.Log import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.core.content.ContextCompat -import shirkneko.zako.sukisu.ui.util.module.LatestVersionInfo +import zako.zako.zako.ui.util.module.LatestVersionInfo /** * @author weishu @@ -64,7 +64,7 @@ fun download( fun checkNewVersion(): LatestVersionInfo { // 改为新的 release 接口 - val url = "https://api.github.com/repos/ShirkNeko/SukiSU-Ultra/releases/latest" + val url = "https://api.github.com/repos/zako/SukiSU-Ultra/releases/latest" val defaultValue = LatestVersionInfo() return runCatching { okhttp3.OkHttpClient().newCall(okhttp3.Request.Builder().url(url).build()).execute() diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/HanziToPinyin.java b/manager/app/src/main/java/zako/zako/zako/ui/util/HanziToPinyin.java similarity index 99% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/util/HanziToPinyin.java rename to manager/app/src/main/java/zako/zako/zako/ui/util/HanziToPinyin.java index 6dcae8af..7eec25b9 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/HanziToPinyin.java +++ b/manager/app/src/main/java/zako/zako/zako/ui/util/HanziToPinyin.java @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.util; +package zako.zako.zako.ui.util; /* * Copyright (C) 2009 The Android Open Source Project * diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/HyperlinkText.kt b/manager/app/src/main/java/zako/zako/zako/ui/util/HyperlinkText.kt similarity index 98% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/util/HyperlinkText.kt rename to manager/app/src/main/java/zako/zako/zako/ui/util/HyperlinkText.kt index 29a28c11..2c5481aa 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/HyperlinkText.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/util/HyperlinkText.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.util +package zako.zako.zako.ui.util import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.material3.MaterialTheme diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/KsuCli.kt b/manager/app/src/main/java/zako/zako/zako/ui/util/KsuCli.kt similarity index 98% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/util/KsuCli.kt rename to manager/app/src/main/java/zako/zako/zako/ui/util/KsuCli.kt index 97f671b4..b623c2b1 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/KsuCli.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/util/KsuCli.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.util +package zako.zako.zako.ui.util import android.content.ContentResolver import android.content.Context @@ -16,9 +16,9 @@ import com.topjohnwu.superuser.ShellUtils import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.parcelize.Parcelize -import shirkneko.zako.sukisu.BuildConfig -import shirkneko.zako.sukisu.Natives -import shirkneko.zako.sukisu.ksuApp +import zako.zako.zako.BuildConfig +import zako.zako.zako.Natives +import zako.zako.zako.ksuApp import org.json.JSONArray import java.io.File @@ -30,7 +30,7 @@ import java.io.File private const val TAG = "KsuCli" private fun getKsuDaemonPath(): String { - return ksuApp.applicationInfo.nativeLibraryDir + File.separator + "libzakomk.so" + return ksuApp.applicationInfo.nativeLibraryDir + File.separator + "libzakozako.so" } object KsuCli { @@ -437,7 +437,7 @@ fun restartApp(packageName: String) { } private fun getSuSFSDaemonPath(): String { - return ksuApp.applicationInfo.nativeLibraryDir + File.separator + "libzakomksd.so" + return ksuApp.applicationInfo.nativeLibraryDir + File.separator + "libzakozakozako.so" } fun getSuSFS(): String { diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/LogEvent.kt b/manager/app/src/main/java/zako/zako/zako/ui/util/LogEvent.kt similarity index 97% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/util/LogEvent.kt rename to manager/app/src/main/java/zako/zako/zako/ui/util/LogEvent.kt index 87d59443..850c4e7a 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/LogEvent.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/util/LogEvent.kt @@ -1,11 +1,11 @@ -package shirkneko.zako.sukisu.ui.util +package zako.zako.zako.ui.util import android.content.Context import android.os.Build import android.system.Os import com.topjohnwu.superuser.ShellUtils -import shirkneko.zako.sukisu.Natives -import shirkneko.zako.sukisu.ui.screen.getManagerVersion +import zako.zako.zako.Natives +import zako.zako.zako.ui.screen.getManagerVersion import java.io.File import java.io.FileWriter import java.io.PrintWriter diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/ModuleModify.kt b/manager/app/src/main/java/zako/zako/zako/ui/util/ModuleModify.kt similarity index 99% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/util/ModuleModify.kt rename to manager/app/src/main/java/zako/zako/zako/ui/util/ModuleModify.kt index 27f12882..2716fb93 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/ModuleModify.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/util/ModuleModify.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.util +package zako.zako.zako.ui.util import android.app.AlertDialog import android.content.Context @@ -16,7 +16,7 @@ import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import shirkneko.zako.sukisu.R +import zako.zako.zako.R import java.io.BufferedReader import java.io.IOException import java.io.InputStreamReader diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/SELinuxChecker.kt b/manager/app/src/main/java/zako/zako/zako/ui/util/SELinuxChecker.kt similarity index 93% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/util/SELinuxChecker.kt rename to manager/app/src/main/java/zako/zako/zako/ui/util/SELinuxChecker.kt index 50f12188..4121c036 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/SELinuxChecker.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/util/SELinuxChecker.kt @@ -1,9 +1,9 @@ -package shirkneko.zako.sukisu.ui.util +package zako.zako.zako.ui.util import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import com.topjohnwu.superuser.Shell -import shirkneko.zako.sukisu.R +import zako.zako.zako.R @Composable fun getSELinuxStatus(): String { diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/module/LatestVersionInfo.kt b/manager/app/src/main/java/zako/zako/zako/ui/util/module/LatestVersionInfo.kt similarity index 78% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/util/module/LatestVersionInfo.kt rename to manager/app/src/main/java/zako/zako/zako/ui/util/module/LatestVersionInfo.kt index c55df63a..3a292b4a 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/util/module/LatestVersionInfo.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/util/module/LatestVersionInfo.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.util.module +package zako.zako.zako.ui.util.module data class LatestVersionInfo( val versionCode : Int = 0, diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/viewmodel/KpmViewModel.kt b/manager/app/src/main/java/zako/zako/zako/ui/viewmodel/KpmViewModel.kt similarity index 98% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/viewmodel/KpmViewModel.kt rename to manager/app/src/main/java/zako/zako/zako/ui/viewmodel/KpmViewModel.kt index 8de6660e..4a417cce 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/viewmodel/KpmViewModel.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/viewmodel/KpmViewModel.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.viewmodel +package zako.zako.zako.ui.viewmodel import android.util.Log import androidx.compose.runtime.getValue @@ -9,7 +9,7 @@ import androidx.lifecycle.viewModelScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import shirkneko.zako.sukisu.ui.util.* +import zako.zako.zako.ui.util.* class KpmViewModel : ViewModel() { var moduleList by mutableStateOf(emptyList()) diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/viewmodel/ModuleViewModel.kt b/manager/app/src/main/java/zako/zako/zako/ui/viewmodel/ModuleViewModel.kt similarity index 97% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/viewmodel/ModuleViewModel.kt rename to manager/app/src/main/java/zako/zako/zako/ui/viewmodel/ModuleViewModel.kt index e5dc70da..72b4207d 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/viewmodel/ModuleViewModel.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/viewmodel/ModuleViewModel.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.viewmodel +package zako.zako.zako.ui.viewmodel import android.os.SystemClock import android.util.Log @@ -10,8 +10,8 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import shirkneko.zako.sukisu.ui.util.HanziToPinyin -import shirkneko.zako.sukisu.ui.util.listModules +import zako.zako.zako.ui.util.HanziToPinyin +import zako.zako.zako.ui.util.listModules import org.json.JSONArray import org.json.JSONObject import java.text.Collator diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/viewmodel/SuperUserViewModel.kt b/manager/app/src/main/java/zako/zako/zako/ui/viewmodel/SuperUserViewModel.kt similarity index 95% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/viewmodel/SuperUserViewModel.kt rename to manager/app/src/main/java/zako/zako/zako/ui/viewmodel/SuperUserViewModel.kt index 549612ce..1ce7186e 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/viewmodel/SuperUserViewModel.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/viewmodel/SuperUserViewModel.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.viewmodel +package zako.zako.zako.ui.viewmodel import android.content.ComponentName import android.content.Intent @@ -18,12 +18,12 @@ import com.topjohnwu.superuser.Shell import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.parcelize.Parcelize -import shirkneko.zako.sukisu.IKsuInterface -import shirkneko.zako.sukisu.Natives -import shirkneko.zako.sukisu.ksuApp -import shirkneko.zako.sukisu.ui.KsuService -import shirkneko.zako.sukisu.ui.util.HanziToPinyin -import shirkneko.zako.sukisu.ui.util.KsuCli +import zako.zako.zako.IKsuInterface +import zako.zako.zako.Natives +import zako.zako.zako.ksuApp +import zako.zako.zako.ui.KsuService +import zako.zako.zako.ui.util.HanziToPinyin +import zako.zako.zako.ui.util.KsuCli import java.text.Collator import java.util.* import kotlin.coroutines.resume diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/viewmodel/TemplateViewModel.kt b/manager/app/src/main/java/zako/zako/zako/ui/viewmodel/TemplateViewModel.kt similarity index 96% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/viewmodel/TemplateViewModel.kt rename to manager/app/src/main/java/zako/zako/zako/ui/viewmodel/TemplateViewModel.kt index adc87522..70389dd1 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/viewmodel/TemplateViewModel.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/viewmodel/TemplateViewModel.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.viewmodel +package zako.zako.zako.ui.viewmodel import android.os.Parcelable import android.util.Log @@ -10,12 +10,12 @@ import androidx.lifecycle.ViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.parcelize.Parcelize -import shirkneko.zako.sukisu.Natives -import shirkneko.zako.sukisu.profile.Capabilities -import shirkneko.zako.sukisu.profile.Groups -import shirkneko.zako.sukisu.ui.util.getAppProfileTemplate -import shirkneko.zako.sukisu.ui.util.listAppProfileTemplates -import shirkneko.zako.sukisu.ui.util.setAppProfileTemplate +import zako.zako.zako.Natives +import zako.zako.zako.profile.Capabilities +import zako.zako.zako.profile.Groups +import zako.zako.zako.ui.util.getAppProfileTemplate +import zako.zako.zako.ui.util.listAppProfileTemplates +import zako.zako.zako.ui.util.setAppProfileTemplate import okhttp3.OkHttpClient import okhttp3.Request import org.json.JSONArray diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/webui/MimeUtil.java b/manager/app/src/main/java/zako/zako/zako/ui/webui/MimeUtil.java similarity index 98% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/webui/MimeUtil.java rename to manager/app/src/main/java/zako/zako/zako/ui/webui/MimeUtil.java index 33af5fe8..aaa44afb 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/webui/MimeUtil.java +++ b/manager/app/src/main/java/zako/zako/zako/ui/webui/MimeUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package shirkneko.zako.sukisu.ui.webui; +package zako.zako.zako.ui.webui; import java.net.URLConnection; diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/webui/SuFilePathHandler.java b/manager/app/src/main/java/zako/zako/zako/ui/webui/SuFilePathHandler.java similarity index 99% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/webui/SuFilePathHandler.java rename to manager/app/src/main/java/zako/zako/zako/ui/webui/SuFilePathHandler.java index 5ba98f2d..1ffccb80 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/webui/SuFilePathHandler.java +++ b/manager/app/src/main/java/zako/zako/zako/ui/webui/SuFilePathHandler.java @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.webui; +package zako.zako.zako.ui.webui; import android.content.Context; import android.util.Log; diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/webui/WebUIActivity.kt b/manager/app/src/main/java/zako/zako/zako/ui/webui/WebUIActivity.kt similarity index 97% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/webui/WebUIActivity.kt rename to manager/app/src/main/java/zako/zako/zako/ui/webui/WebUIActivity.kt index b452d119..2bcff2b3 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/webui/WebUIActivity.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/webui/WebUIActivity.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.webui +package zako.zako.zako.ui.webui import android.annotation.SuppressLint import android.app.ActivityManager @@ -16,7 +16,7 @@ import androidx.core.view.WindowInsetsCompat import androidx.core.view.updateLayoutParams import androidx.webkit.WebViewAssetLoader import com.topjohnwu.superuser.Shell -import shirkneko.zako.sukisu.ui.util.createRootShell +import zako.zako.zako.ui.util.createRootShell import java.io.File @SuppressLint("SetJavaScriptEnabled") diff --git a/manager/app/src/main/java/shirkneko/zako/zako/ui/webui/WebViewInterface.kt b/manager/app/src/main/java/zako/zako/zako/ui/webui/WebViewInterface.kt similarity index 95% rename from manager/app/src/main/java/shirkneko/zako/zako/ui/webui/WebViewInterface.kt rename to manager/app/src/main/java/zako/zako/zako/ui/webui/WebViewInterface.kt index e4576429..4876672d 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/ui/webui/WebViewInterface.kt +++ b/manager/app/src/main/java/zako/zako/zako/ui/webui/WebViewInterface.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.ui.webui +package zako.zako.zako.ui.webui import android.app.Activity import android.content.Context @@ -14,14 +14,13 @@ import androidx.core.view.WindowInsetsControllerCompat import com.topjohnwu.superuser.CallbackList import com.topjohnwu.superuser.ShellUtils import com.topjohnwu.superuser.internal.UiThreadHandler -import shirkneko.zako.sukisu.ui.util.createRootShell -import shirkneko.zako.sukisu.ui.util.listModules -import shirkneko.zako.sukisu.ui.util.withNewRootShell +import zako.zako.zako.ui.util.createRootShell +import zako.zako.zako.ui.util.listModules +import zako.zako.zako.ui.util.withNewRootShell import org.json.JSONArray import org.json.JSONObject -import shirkneko.zako.sukisu.ui.util.KsuCli -import shirkneko.zako.sukisu.ui.util.controlKpmModule -import shirkneko.zako.sukisu.ui.util.listKpmModules +import zako.zako.zako.ui.util.controlKpmModule +import zako.zako.zako.ui.util.listKpmModules import java.io.File import java.util.concurrent.CompletableFuture diff --git a/manager/app/src/main/java/shirkneko/zako/zako/utils/AssetsUtil.kt b/manager/app/src/main/java/zako/zako/zako/utils/AssetsUtil.kt similarity index 95% rename from manager/app/src/main/java/shirkneko/zako/zako/utils/AssetsUtil.kt rename to manager/app/src/main/java/zako/zako/zako/utils/AssetsUtil.kt index 080b057d..2c05c647 100644 --- a/manager/app/src/main/java/shirkneko/zako/zako/utils/AssetsUtil.kt +++ b/manager/app/src/main/java/zako/zako/zako/utils/AssetsUtil.kt @@ -1,4 +1,4 @@ -package shirkneko.zako.sukisu.utils +package zako.zako.zako.utils import android.content.Context import java.io.File diff --git a/manager/app/src/main/jniLibs/.gitignore b/manager/app/src/main/jniLibs/.gitignore index f6481cde..53b706e0 100644 --- a/manager/app/src/main/jniLibs/.gitignore +++ b/manager/app/src/main/jniLibs/.gitignore @@ -1,3 +1,3 @@ -libzakomk.so -libzakomksd.so +libzakozako.so +libzakozakozako.so libkpmmgr.so \ No newline at end of file diff --git a/userspace/ksud/Cargo.lock b/userspace/ksud/Cargo.lock index 733ada44..76b21a4c 100644 --- a/userspace/ksud/Cargo.lock +++ b/userspace/ksud/Cargo.lock @@ -784,7 +784,7 @@ dependencies = [ ] [[package]] -name = "zakomk" +name = "zakozako" version = "0.1.0" dependencies = [ "android-properties", diff --git a/userspace/ksud/Cargo.toml b/userspace/ksud/Cargo.toml index b307df45..9c82f41c 100644 --- a/userspace/ksud/Cargo.toml +++ b/userspace/ksud/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "zakomk" +name = "zakozako" version = "0.1.0" edition = "2024" diff --git a/userspace/zakomksd/.gitignore b/userspace/susfs/.gitignore similarity index 100% rename from userspace/zakomksd/.gitignore rename to userspace/susfs/.gitignore diff --git a/userspace/zakomksd/jni/Android.mk b/userspace/susfs/jni/Android.mk similarity index 58% rename from userspace/zakomksd/jni/Android.mk rename to userspace/susfs/jni/Android.mk index 92ecd077..1eeffee9 100644 --- a/userspace/zakomksd/jni/Android.mk +++ b/userspace/susfs/jni/Android.mk @@ -1,6 +1,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := zakomksd -LOCAL_SRC_FILES := zakomksd.c +LOCAL_MODULE := zakozakozako +LOCAL_SRC_FILES := susfs.c include $(BUILD_EXECUTABLE) diff --git a/userspace/zakomksd/jni/Application.mk b/userspace/susfs/jni/Application.mk similarity index 100% rename from userspace/zakomksd/jni/Application.mk rename to userspace/susfs/jni/Application.mk diff --git a/userspace/zakomksd/jni/zakomksd.c b/userspace/susfs/jni/susfs.c similarity index 100% rename from userspace/zakomksd/jni/zakomksd.c rename to userspace/susfs/jni/susfs.c