Remove net module

app/build.gradle

@@ -55,7 +55,6 @@ androidExtensions {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation project(':net')
     implementation project(':shared')
     implementation project(':signing')
 

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.magisk">
 
+    <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

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

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

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

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

net/.gitignore

@@ -1 +0,0 @@
-/build

net/build.gradle

@@ -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'])
-}

net/proguard-rules.pro

@@ -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

net/src/main/AndroidManifest.xml

@@ -1,5 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.topjohnwu.net">
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-</manifest>

settings.gradle

@@ -1 +1 @@
-include ':app', ':net', ':signing', ':native', ':snet', ':stub', ':shared'
+include ':app', ':signing', ':native', ':snet', ':stub', ':shared'

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;

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;
 

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;

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;

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;
 

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<T> {
     void onResponse(T response);

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;

stub/build.gradle

@@ -16,6 +16,5 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation project(':net')
     implementation project(':shared')
 }

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.magisk.net.Networking;
-import com.topjohnwu.net.ResponseListener;
+import com.topjohnwu.magisk.net.ResponseListener;
 
 import org.json.JSONException;
 import org.json.JSONObject;