diff --git a/app/build.gradle b/app/build.gradle index 2baf3e63f..f8827dd49 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,7 +55,6 @@ androidExtensions { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation project(':net') implementation project(':shared') implementation project(':signing') diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0512f7bb9..163ef7469 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" package="com.topjohnwu.magisk"> + diff --git a/app/src/main/java/com/topjohnwu/magisk/App.kt b/app/src/main/java/com/topjohnwu/magisk/App.kt index e34d496a8..85e9fb2b7 100644 --- a/app/src/main/java/com/topjohnwu/magisk/App.kt +++ b/app/src/main/java/com/topjohnwu/magisk/App.kt @@ -16,7 +16,7 @@ import com.topjohnwu.magisk.di.koinModules import com.topjohnwu.magisk.extensions.get import com.topjohnwu.magisk.utils.LocaleManager import com.topjohnwu.magisk.utils.RootUtils -import com.topjohnwu.net.Networking +import com.topjohnwu.magisk.net.Networking import com.topjohnwu.superuser.Shell import org.koin.android.ext.koin.androidContext import org.koin.core.context.startKoin diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt index 654a1667e..c829a01fe 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt @@ -20,7 +20,7 @@ import com.topjohnwu.magisk.ui.module.ReposFragment import com.topjohnwu.magisk.ui.settings.SettingsFragment import com.topjohnwu.magisk.ui.superuser.SuperuserFragment import com.topjohnwu.magisk.utils.Utils -import com.topjohnwu.net.Networking +import com.topjohnwu.magisk.net.Networking import com.topjohnwu.superuser.Shell import org.koin.androidx.viewmodel.ext.android.viewModel import kotlin.reflect.KClass diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt index 3d0dca305..0c7b2d1e4 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt @@ -29,7 +29,7 @@ import com.topjohnwu.magisk.model.observer.Observer import com.topjohnwu.magisk.ui.base.BasePreferenceFragment import com.topjohnwu.magisk.utils.* import com.topjohnwu.magisk.view.dialogs.FingerprintAuthDialog -import com.topjohnwu.net.Networking +import com.topjohnwu.magisk.net.Networking import com.topjohnwu.superuser.Shell import io.reactivex.Completable import org.koin.android.ext.android.inject diff --git a/app/src/main/java/com/topjohnwu/magisk/view/dialogs/EnvFixDialog.kt b/app/src/main/java/com/topjohnwu/magisk/view/dialogs/EnvFixDialog.kt index ff139a7c6..b3b65b6de 100644 --- a/app/src/main/java/com/topjohnwu/magisk/view/dialogs/EnvFixDialog.kt +++ b/app/src/main/java/com/topjohnwu/magisk/view/dialogs/EnvFixDialog.kt @@ -10,7 +10,7 @@ import com.topjohnwu.magisk.extensions.cachedFile import com.topjohnwu.magisk.extensions.reboot import com.topjohnwu.magisk.tasks.MagiskInstaller import com.topjohnwu.magisk.utils.Utils -import com.topjohnwu.net.Networking +import com.topjohnwu.magisk.net.Networking import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.ShellUtils import com.topjohnwu.superuser.internal.UiThreadHandler diff --git a/net/.gitignore b/net/.gitignore deleted file mode 100644 index 796b96d1c..000000000 --- a/net/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/net/build.gradle b/net/build.gradle deleted file mode 100644 index b16ee12fb..000000000 --- a/net/build.gradle +++ /dev/null @@ -1,14 +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']) -} diff --git a/net/proguard-rules.pro b/net/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/net/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/net/src/main/AndroidManifest.xml b/net/src/main/AndroidManifest.xml deleted file mode 100644 index 8a07fd122..000000000 --- a/net/src/main/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/settings.gradle b/settings.gradle index d4a246b39..fda1b71b5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':net', ':signing', ':native', ':snet', ':stub', ':shared' +include ':app', ':signing', ':native', ':snet', ':stub', ':shared' diff --git a/net/src/main/java/com/topjohnwu/net/BadRequest.java b/shared/src/main/java/com/topjohnwu/magisk/net/BadRequest.java similarity index 97% rename from net/src/main/java/com/topjohnwu/net/BadRequest.java rename to shared/src/main/java/com/topjohnwu/magisk/net/BadRequest.java index f6be4ef78..36ba41673 100644 --- a/net/src/main/java/com/topjohnwu/net/BadRequest.java +++ b/shared/src/main/java/com/topjohnwu/magisk/net/BadRequest.java @@ -1,4 +1,4 @@ -package com.topjohnwu.net; +package com.topjohnwu.magisk.net; import org.json.JSONArray; import org.json.JSONObject; diff --git a/net/src/main/java/com/topjohnwu/net/ErrorHandler.java b/shared/src/main/java/com/topjohnwu/magisk/net/ErrorHandler.java similarity index 78% rename from net/src/main/java/com/topjohnwu/net/ErrorHandler.java rename to shared/src/main/java/com/topjohnwu/magisk/net/ErrorHandler.java index 12f7548c1..eeb9a3455 100644 --- a/net/src/main/java/com/topjohnwu/net/ErrorHandler.java +++ b/shared/src/main/java/com/topjohnwu/magisk/net/ErrorHandler.java @@ -1,4 +1,4 @@ -package com.topjohnwu.net; +package com.topjohnwu.magisk.net; import java.net.HttpURLConnection; diff --git a/net/src/main/java/com/topjohnwu/net/Networking.java b/shared/src/main/java/com/topjohnwu/magisk/net/Networking.java similarity index 98% rename from net/src/main/java/com/topjohnwu/net/Networking.java rename to shared/src/main/java/com/topjohnwu/magisk/net/Networking.java index c06faa382..10cbee3dc 100644 --- a/net/src/main/java/com/topjohnwu/net/Networking.java +++ b/shared/src/main/java/com/topjohnwu/magisk/net/Networking.java @@ -1,4 +1,4 @@ -package com.topjohnwu.net; +package com.topjohnwu.magisk.net; import android.content.Context; import android.net.ConnectivityManager; diff --git a/net/src/main/java/com/topjohnwu/net/NoSSLv3SocketFactory.java b/shared/src/main/java/com/topjohnwu/magisk/net/NoSSLv3SocketFactory.java similarity index 98% rename from net/src/main/java/com/topjohnwu/net/NoSSLv3SocketFactory.java rename to shared/src/main/java/com/topjohnwu/magisk/net/NoSSLv3SocketFactory.java index 5af965938..b7a5774f2 100644 --- a/net/src/main/java/com/topjohnwu/net/NoSSLv3SocketFactory.java +++ b/shared/src/main/java/com/topjohnwu/magisk/net/NoSSLv3SocketFactory.java @@ -1,4 +1,4 @@ -package com.topjohnwu.net; +package com.topjohnwu.magisk.net; import java.io.IOException; import java.net.InetAddress; diff --git a/net/src/main/java/com/topjohnwu/net/Request.java b/shared/src/main/java/com/topjohnwu/magisk/net/Request.java similarity index 99% rename from net/src/main/java/com/topjohnwu/net/Request.java rename to shared/src/main/java/com/topjohnwu/magisk/net/Request.java index 8b16facb9..f0373eb63 100644 --- a/net/src/main/java/com/topjohnwu/net/Request.java +++ b/shared/src/main/java/com/topjohnwu/magisk/net/Request.java @@ -1,4 +1,4 @@ -package com.topjohnwu.net; +package com.topjohnwu.magisk.net; import android.os.AsyncTask; diff --git a/net/src/main/java/com/topjohnwu/net/ResponseListener.java b/shared/src/main/java/com/topjohnwu/magisk/net/ResponseListener.java similarity index 68% rename from net/src/main/java/com/topjohnwu/net/ResponseListener.java rename to shared/src/main/java/com/topjohnwu/magisk/net/ResponseListener.java index c8f0be7b6..28875eda2 100644 --- a/net/src/main/java/com/topjohnwu/net/ResponseListener.java +++ b/shared/src/main/java/com/topjohnwu/magisk/net/ResponseListener.java @@ -1,4 +1,4 @@ -package com.topjohnwu.net; +package com.topjohnwu.magisk.net; public interface ResponseListener { void onResponse(T response); diff --git a/net/src/main/java/com/topjohnwu/net/SSLSocketWrapper.java b/shared/src/main/java/com/topjohnwu/magisk/net/SSLSocketWrapper.java similarity index 99% rename from net/src/main/java/com/topjohnwu/net/SSLSocketWrapper.java rename to shared/src/main/java/com/topjohnwu/magisk/net/SSLSocketWrapper.java index a86759c17..cb19e6512 100644 --- a/net/src/main/java/com/topjohnwu/net/SSLSocketWrapper.java +++ b/shared/src/main/java/com/topjohnwu/magisk/net/SSLSocketWrapper.java @@ -1,4 +1,4 @@ -package com.topjohnwu.net; +package com.topjohnwu.magisk.net; import java.io.IOException; import java.io.InputStream; diff --git a/stub/build.gradle b/stub/build.gradle index 9da7df4d9..45b69d518 100644 --- a/stub/build.gradle +++ b/stub/build.gradle @@ -16,6 +16,5 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(':net') implementation project(':shared') } diff --git a/stub/src/main/java/com/topjohnwu/magisk/MainActivity.java b/stub/src/main/java/com/topjohnwu/magisk/MainActivity.java index 8e9eb0e38..4c0be34d8 100644 --- a/stub/src/main/java/com/topjohnwu/magisk/MainActivity.java +++ b/stub/src/main/java/com/topjohnwu/magisk/MainActivity.java @@ -6,8 +6,8 @@ import android.app.Application; import android.os.Bundle; import com.topjohnwu.magisk.utils.APKInstall; -import com.topjohnwu.net.Networking; -import com.topjohnwu.net.ResponseListener; +import com.topjohnwu.magisk.net.Networking; +import com.topjohnwu.magisk.net.ResponseListener; import org.json.JSONException; import org.json.JSONObject;