From 8d446fcc162b40443f9e834d096215d73e8b30e2 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Thu, 11 Jul 2024 16:49:01 -0700
Subject: [PATCH] Move all core code into the same parent package

---
 .../com/topjohnwu/magisk/{ => core}/signing/ApkSignerV2.java  | 2 +-
 .../topjohnwu/magisk/{ => core}/signing/ByteArrayStream.java  | 2 +-
 .../java/com/topjohnwu/magisk/{ => core}/signing/JarMap.java  | 2 +-
 .../java/com/topjohnwu/magisk/{ => core}/signing/SignApk.java | 2 +-
 .../com/topjohnwu/magisk/{ => core}/signing/ZipUtils.java     | 2 +-
 .../main/java/com/topjohnwu/magisk/core/tasks/AppMigration.kt | 4 ++--
 .../com/topjohnwu/magisk/{ => core}/view/Notifications.kt     | 0
 .../java/com/topjohnwu/magisk/{ => core}/view/Shortcuts.kt    | 0
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename app/core/src/main/java/com/topjohnwu/magisk/{ => core}/signing/ApkSignerV2.java (99%)
 rename app/core/src/main/java/com/topjohnwu/magisk/{ => core}/signing/ByteArrayStream.java (94%)
 rename app/core/src/main/java/com/topjohnwu/magisk/{ => core}/signing/JarMap.java (99%)
 rename app/core/src/main/java/com/topjohnwu/magisk/{ => core}/signing/SignApk.java (99%)
 rename app/core/src/main/java/com/topjohnwu/magisk/{ => core}/signing/ZipUtils.java (99%)
 rename app/core/src/main/java/com/topjohnwu/magisk/{ => core}/view/Notifications.kt (100%)
 rename app/core/src/main/java/com/topjohnwu/magisk/{ => core}/view/Shortcuts.kt (100%)

diff --git a/app/core/src/main/java/com/topjohnwu/magisk/signing/ApkSignerV2.java b/app/core/src/main/java/com/topjohnwu/magisk/core/signing/ApkSignerV2.java
similarity index 99%
rename from app/core/src/main/java/com/topjohnwu/magisk/signing/ApkSignerV2.java
rename to app/core/src/main/java/com/topjohnwu/magisk/core/signing/ApkSignerV2.java
index b4ca2eceb..789ba1a05 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/signing/ApkSignerV2.java
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/signing/ApkSignerV2.java
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.signing;
+package com.topjohnwu.magisk.core.signing;
 
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/signing/ByteArrayStream.java b/app/core/src/main/java/com/topjohnwu/magisk/core/signing/ByteArrayStream.java
similarity index 94%
rename from app/core/src/main/java/com/topjohnwu/magisk/signing/ByteArrayStream.java
rename to app/core/src/main/java/com/topjohnwu/magisk/core/signing/ByteArrayStream.java
index 497accbed..c3cad9f38 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/signing/ByteArrayStream.java
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/signing/ByteArrayStream.java
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.signing;
+package com.topjohnwu.magisk.core.signing;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/signing/JarMap.java b/app/core/src/main/java/com/topjohnwu/magisk/core/signing/JarMap.java
similarity index 99%
rename from app/core/src/main/java/com/topjohnwu/magisk/signing/JarMap.java
rename to app/core/src/main/java/com/topjohnwu/magisk/core/signing/JarMap.java
index 4d30ad0b7..a1f528a4f 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/signing/JarMap.java
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/signing/JarMap.java
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.signing;
+package com.topjohnwu.magisk.core.signing;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/signing/SignApk.java b/app/core/src/main/java/com/topjohnwu/magisk/core/signing/SignApk.java
similarity index 99%
rename from app/core/src/main/java/com/topjohnwu/magisk/signing/SignApk.java
rename to app/core/src/main/java/com/topjohnwu/magisk/core/signing/SignApk.java
index d6be25a59..6a43b3fbe 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/signing/SignApk.java
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/signing/SignApk.java
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.signing;
+package com.topjohnwu.magisk.core.signing;
 
 import org.bouncycastle.asn1.ASN1Encoding;
 import org.bouncycastle.asn1.ASN1InputStream;
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/signing/ZipUtils.java b/app/core/src/main/java/com/topjohnwu/magisk/core/signing/ZipUtils.java
similarity index 99%
rename from app/core/src/main/java/com/topjohnwu/magisk/signing/ZipUtils.java
rename to app/core/src/main/java/com/topjohnwu/magisk/core/signing/ZipUtils.java
index 21b220171..2e92b7a6c 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/signing/ZipUtils.java
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/signing/ZipUtils.java
@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.signing;
+package com.topjohnwu.magisk.core.signing;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/AppMigration.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/AppMigration.kt
index 57c2ee522..3c977430a 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/AppMigration.kt
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/tasks/AppMigration.kt
@@ -15,10 +15,10 @@ import com.topjohnwu.magisk.core.ktx.await
 import com.topjohnwu.magisk.core.ktx.copyAndClose
 import com.topjohnwu.magisk.core.ktx.toast
 import com.topjohnwu.magisk.core.ktx.writeTo
+import com.topjohnwu.magisk.core.signing.JarMap
+import com.topjohnwu.magisk.core.signing.SignApk
 import com.topjohnwu.magisk.core.utils.AXML
 import com.topjohnwu.magisk.core.utils.Keygen
-import com.topjohnwu.magisk.signing.JarMap
-import com.topjohnwu.magisk.signing.SignApk
 import com.topjohnwu.magisk.utils.APKInstall
 import com.topjohnwu.superuser.Shell
 import kotlinx.coroutines.Dispatchers
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/view/Notifications.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/view/Notifications.kt
similarity index 100%
rename from app/core/src/main/java/com/topjohnwu/magisk/view/Notifications.kt
rename to app/core/src/main/java/com/topjohnwu/magisk/core/view/Notifications.kt
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/view/Shortcuts.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/view/Shortcuts.kt
similarity index 100%
rename from app/core/src/main/java/com/topjohnwu/magisk/view/Shortcuts.kt
rename to app/core/src/main/java/com/topjohnwu/magisk/core/view/Shortcuts.kt