From de5c902fdbef713055229ffd9524e1c5a9180639 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 8 Mar 2019 10:19:22 -0500
Subject: [PATCH] Remove app-core module

Less confusion
---
 app-core/.gitignore                           |  2 --
 app-core/build.gradle                         | 21 -------------------
 app-core/proguard-rules.pro                   | 21 -------------------
 app-core/src/main/AndroidManifest.xml         |  4 ----
 app/build.gradle                              |  7 ++++++-
 app/src/main/AndroidManifest.xml              |  1 +
 .../main/java/com/topjohnwu/magisk/App.java   |  1 -
 .../java/com/topjohnwu/magisk/Config.java     |  0
 .../main/java/com/topjohnwu/magisk/Const.java |  0
 .../magisk/container/BaseModule.java          |  0
 .../topjohnwu/magisk/container/Module.java    |  0
 .../topjohnwu/magisk/container/Policy.java    |  0
 .../com/topjohnwu/magisk/container/Repo.java  |  0
 .../magisk/container/SuLogEntry.java          |  0
 .../topjohnwu/magisk/container/TarEntry.java  |  0
 .../magisk/container/ValueSortedMap.java      |  0
 .../topjohnwu/magisk/database/MagiskDB.java   |  0
 .../magisk/database/RepoDatabaseHelper.java   |  0
 .../topjohnwu/magisk/tasks/CheckUpdates.java  |  0
 .../com/topjohnwu/magisk/tasks/FlashZip.java  |  0
 .../magisk/tasks/MagiskInstaller.java         |  0
 .../topjohnwu/magisk/tasks/UpdateRepos.java   |  0
 .../magisk/utils/FingerprintHelper.java       |  0
 .../magisk/utils/ISafetyNetHelper.java        |  0
 .../topjohnwu/magisk/utils/LocaleManager.java |  0
 .../com/topjohnwu/magisk/utils/Logger.java    |  2 +-
 .../com/topjohnwu/magisk/utils/RootUtils.java |  2 +-
 .../topjohnwu/magisk/utils/SuConnector.java   |  0
 .../com/topjohnwu/magisk/utils/SuLogger.java  |  0
 .../com/topjohnwu/magisk/utils/Topic.java     |  0
 .../com/topjohnwu/magisk/utils/Utils.java     |  0
 .../com/topjohnwu/magisk/utils/ZipUtils.java  |  0
 app/src/main/res/raw/.gitignore               |  1 +
 .../src/main/res/raw/nonroot_utils.sh         |  0
 {app-core => app}/src/main/res/raw/utils.sh   |  0
 build.py                                      | 10 +++++----
 settings.gradle                               |  2 +-
 37 files changed, 17 insertions(+), 57 deletions(-)
 delete mode 100644 app-core/.gitignore
 delete mode 100644 app-core/build.gradle
 delete mode 100644 app-core/proguard-rules.pro
 delete mode 100644 app-core/src/main/AndroidManifest.xml
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/App.java (97%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/Config.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/Const.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/container/BaseModule.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/container/Module.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/container/Policy.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/container/Repo.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/container/SuLogEntry.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/container/TarEntry.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/container/ValueSortedMap.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/database/MagiskDB.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/tasks/CheckUpdates.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/tasks/FlashZip.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/tasks/UpdateRepos.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/utils/FingerprintHelper.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/utils/ISafetyNetHelper.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/utils/Logger.java (92%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/utils/RootUtils.java (97%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/utils/SuConnector.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/utils/SuLogger.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/utils/Topic.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/utils/Utils.java (100%)
 rename {app-core => app}/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java (100%)
 create mode 100644 app/src/main/res/raw/.gitignore
 rename {app-core => app}/src/main/res/raw/nonroot_utils.sh (100%)
 rename {app-core => app}/src/main/res/raw/utils.sh (100%)

diff --git a/app-core/.gitignore b/app-core/.gitignore
deleted file mode 100644
index 512bf037e..000000000
--- a/app-core/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build
-src/main/res/raw/util_functions.sh
diff --git a/app-core/build.gradle b/app-core/build.gradle
deleted file mode 100644
index 36a7d82a4..000000000
--- a/app-core/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    api project(':net')
-    api project(':signing')
-    api 'org.kamranzafar:jtar:2.3'
-
-    def libsuVersion = '2.3.1'
-    api "com.github.topjohnwu.libsu:core:${libsuVersion}"
-    api "com.github.topjohnwu.libsu:io:${libsuVersion}"
-}
diff --git a/app-core/proguard-rules.pro b/app-core/proguard-rules.pro
deleted file mode 100644
index f1b424510..000000000
--- a/app-core/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/app-core/src/main/AndroidManifest.xml b/app-core/src/main/AndroidManifest.xml
deleted file mode 100644
index cd9b95e1e..000000000
--- a/app-core/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.topjohnwu.magisk.core" >
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-</manifest>
diff --git a/app/build.gradle b/app/build.gradle
index a537316cd..57406f856 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,9 +24,10 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':net')
     implementation project(':shared')
-    implementation project(':app-core')
+    implementation project(':signing')
     implementation 'ru.noties:markwon:2.0.1'
     implementation 'com.caverock:androidsvg-aar:1.3'
+    implementation 'org.kamranzafar:jtar:2.3'
     implementation 'net.sourceforge.streamsupport:android-retrostreams:1.7.0'
 
     def androidXVersion = "1.0.0"
@@ -40,6 +41,10 @@ dependencies {
     implementation 'androidx.room:room-runtime:2.0.0'
     implementation 'androidx.transition:transition:1.0.1'
 
+    def libsuVersion = '2.3.1'
+    implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
+    implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
+
     def butterKnifeVersion = '10.1.0'
     implementation "com.jakewharton:butterknife-runtime:${butterKnifeVersion}"
     annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c28ad9250..db46be8fa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
 
     <application
         android:allowBackup="true"
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/App.java b/app/src/main/java/com/topjohnwu/magisk/App.java
similarity index 97%
rename from app-core/src/main/java/com/topjohnwu/magisk/App.java
rename to app/src/main/java/com/topjohnwu/magisk/App.java
index 205baaee7..b3de6b3ae 100644
--- a/app-core/src/main/java/com/topjohnwu/magisk/App.java
+++ b/app/src/main/java/com/topjohnwu/magisk/App.java
@@ -8,7 +8,6 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.preference.PreferenceManager;
 
-import com.topjohnwu.magisk.core.BuildConfig;
 import com.topjohnwu.magisk.database.MagiskDB;
 import com.topjohnwu.magisk.database.RepoDatabaseHelper;
 import com.topjohnwu.magisk.utils.LocaleManager;
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/Config.java b/app/src/main/java/com/topjohnwu/magisk/Config.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/Config.java
rename to app/src/main/java/com/topjohnwu/magisk/Config.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/Const.java b/app/src/main/java/com/topjohnwu/magisk/Const.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/Const.java
rename to app/src/main/java/com/topjohnwu/magisk/Const.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/container/BaseModule.java b/app/src/main/java/com/topjohnwu/magisk/container/BaseModule.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/container/BaseModule.java
rename to app/src/main/java/com/topjohnwu/magisk/container/BaseModule.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/container/Module.java b/app/src/main/java/com/topjohnwu/magisk/container/Module.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/container/Module.java
rename to app/src/main/java/com/topjohnwu/magisk/container/Module.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/container/Policy.java b/app/src/main/java/com/topjohnwu/magisk/container/Policy.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/container/Policy.java
rename to app/src/main/java/com/topjohnwu/magisk/container/Policy.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/container/Repo.java b/app/src/main/java/com/topjohnwu/magisk/container/Repo.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/container/Repo.java
rename to app/src/main/java/com/topjohnwu/magisk/container/Repo.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/container/SuLogEntry.java b/app/src/main/java/com/topjohnwu/magisk/container/SuLogEntry.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/container/SuLogEntry.java
rename to app/src/main/java/com/topjohnwu/magisk/container/SuLogEntry.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/container/TarEntry.java b/app/src/main/java/com/topjohnwu/magisk/container/TarEntry.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/container/TarEntry.java
rename to app/src/main/java/com/topjohnwu/magisk/container/TarEntry.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/container/ValueSortedMap.java b/app/src/main/java/com/topjohnwu/magisk/container/ValueSortedMap.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/container/ValueSortedMap.java
rename to app/src/main/java/com/topjohnwu/magisk/container/ValueSortedMap.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/database/MagiskDB.java b/app/src/main/java/com/topjohnwu/magisk/database/MagiskDB.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/database/MagiskDB.java
rename to app/src/main/java/com/topjohnwu/magisk/database/MagiskDB.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java b/app/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java
rename to app/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/tasks/CheckUpdates.java b/app/src/main/java/com/topjohnwu/magisk/tasks/CheckUpdates.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/tasks/CheckUpdates.java
rename to app/src/main/java/com/topjohnwu/magisk/tasks/CheckUpdates.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/tasks/FlashZip.java b/app/src/main/java/com/topjohnwu/magisk/tasks/FlashZip.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/tasks/FlashZip.java
rename to app/src/main/java/com/topjohnwu/magisk/tasks/FlashZip.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java b/app/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java
rename to app/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/tasks/UpdateRepos.java b/app/src/main/java/com/topjohnwu/magisk/tasks/UpdateRepos.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/tasks/UpdateRepos.java
rename to app/src/main/java/com/topjohnwu/magisk/tasks/UpdateRepos.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/utils/FingerprintHelper.java b/app/src/main/java/com/topjohnwu/magisk/utils/FingerprintHelper.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/utils/FingerprintHelper.java
rename to app/src/main/java/com/topjohnwu/magisk/utils/FingerprintHelper.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/utils/ISafetyNetHelper.java b/app/src/main/java/com/topjohnwu/magisk/utils/ISafetyNetHelper.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/utils/ISafetyNetHelper.java
rename to app/src/main/java/com/topjohnwu/magisk/utils/ISafetyNetHelper.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.java b/app/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.java
rename to app/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/utils/Logger.java b/app/src/main/java/com/topjohnwu/magisk/utils/Logger.java
similarity index 92%
rename from app-core/src/main/java/com/topjohnwu/magisk/utils/Logger.java
rename to app/src/main/java/com/topjohnwu/magisk/utils/Logger.java
index fbab69a55..68756e91a 100644
--- a/app-core/src/main/java/com/topjohnwu/magisk/utils/Logger.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/Logger.java
@@ -2,8 +2,8 @@ package com.topjohnwu.magisk.utils;
 
 import android.util.Log;
 
+import com.topjohnwu.magisk.BuildConfig;
 import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.core.BuildConfig;
 
 public class Logger {
 
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/utils/RootUtils.java b/app/src/main/java/com/topjohnwu/magisk/utils/RootUtils.java
similarity index 97%
rename from app-core/src/main/java/com/topjohnwu/magisk/utils/RootUtils.java
rename to app/src/main/java/com/topjohnwu/magisk/utils/RootUtils.java
index b28b16490..fe7ddc3ed 100644
--- a/app-core/src/main/java/com/topjohnwu/magisk/utils/RootUtils.java
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/RootUtils.java
@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
-import com.topjohnwu.magisk.core.R;
+import com.topjohnwu.magisk.R;
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.ShellUtils;
 import com.topjohnwu.superuser.io.SuFile;
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/utils/SuConnector.java b/app/src/main/java/com/topjohnwu/magisk/utils/SuConnector.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/utils/SuConnector.java
rename to app/src/main/java/com/topjohnwu/magisk/utils/SuConnector.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/utils/SuLogger.java b/app/src/main/java/com/topjohnwu/magisk/utils/SuLogger.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/utils/SuLogger.java
rename to app/src/main/java/com/topjohnwu/magisk/utils/SuLogger.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/utils/Topic.java b/app/src/main/java/com/topjohnwu/magisk/utils/Topic.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/utils/Topic.java
rename to app/src/main/java/com/topjohnwu/magisk/utils/Topic.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/utils/Utils.java b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/utils/Utils.java
rename to app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java b/app/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java
similarity index 100%
rename from app-core/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java
rename to app/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java
diff --git a/app/src/main/res/raw/.gitignore b/app/src/main/res/raw/.gitignore
new file mode 100644
index 000000000..298e40df1
--- /dev/null
+++ b/app/src/main/res/raw/.gitignore
@@ -0,0 +1 @@
+/util_functions.sh
diff --git a/app-core/src/main/res/raw/nonroot_utils.sh b/app/src/main/res/raw/nonroot_utils.sh
similarity index 100%
rename from app-core/src/main/res/raw/nonroot_utils.sh
rename to app/src/main/res/raw/nonroot_utils.sh
diff --git a/app-core/src/main/res/raw/utils.sh b/app/src/main/res/raw/utils.sh
similarity index 100%
rename from app-core/src/main/res/raw/utils.sh
rename to app/src/main/res/raw/utils.sh
diff --git a/build.py b/build.py
index 34490e27d..906778556 100755
--- a/build.py
+++ b/build.py
@@ -234,7 +234,8 @@ def build_binary(args):
 def build_apk(args, module):
     build_type = 'Release' if args.release else 'Debug'
 
-    proc = execv([gradlew, f'{module}:assemble{build_type}', '-PconfigPath=' + os.path.abspath(args.config)])
+    proc = execv([gradlew, f'{module}:assemble{build_type}',
+                 '-PconfigPath=' + os.path.abspath(args.config)])
     if proc.returncode != 0:
         error('Build Magisk Manager failed!')
 
@@ -251,7 +252,7 @@ def build_apk(args, module):
 def build_app(args):
     header('Building Magisk Manager')
     source = os.path.join('scripts', 'util_functions.sh')
-    target = os.path.join('app-core', 'src', 'main',
+    target = os.path.join('app', 'src', 'main',
                           'res', 'raw', 'util_functions.sh')
     cp(source, target)
     build_apk(args, 'app')
@@ -324,8 +325,9 @@ def zip_main(args):
         source = os.path.join('scripts', 'util_functions.sh')
         with open(source, 'r') as script:
             # Add version info util_functions.sh
-            util_func = script.read().replace('#MAGISK_VERSION_STUB',
-                                              f'MAGISK_VER="{config["version"]}"\nMAGISK_VER_CODE={config["versionCode"]}')
+            util_func = script.read().replace(
+                '#MAGISK_VERSION_STUB',
+                f'MAGISK_VER="{config["version"]}"\nMAGISK_VER_CODE={config["versionCode"]}')
             target = os.path.join('common', 'util_functions.sh')
             vprint(f'zip: {source} -> {target}')
             zipf.writestr(target, util_func)
diff --git a/settings.gradle b/settings.gradle
index 8089be3ec..d4a246b39 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':app-core', ':net', ':signing', ':native', ':snet', ':stub', ':shared'
+include ':app', ':net', ':signing', ':native', ':snet', ':stub', ':shared'