Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
8f077474
Commit
8f077474
authored
Aug 04, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove net module
parent
eb5ce5be
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
15 additions
and
57 deletions
+15
-57
build.gradle
app/build.gradle
+0
-1
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-0
App.kt
app/src/main/java/com/topjohnwu/magisk/App.kt
+1
-1
MainActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+1
-1
SettingsFragment.kt
...java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
+1
-1
EnvFixDialog.kt
...in/java/com/topjohnwu/magisk/view/dialogs/EnvFixDialog.kt
+1
-1
.gitignore
net/.gitignore
+0
-1
build.gradle
net/build.gradle
+0
-14
proguard-rules.pro
net/proguard-rules.pro
+0
-21
AndroidManifest.xml
net/src/main/AndroidManifest.xml
+0
-5
settings.gradle
settings.gradle
+1
-1
BadRequest.java
...ed/src/main/java/com/topjohnwu/magisk/net/BadRequest.java
+1
-1
ErrorHandler.java
.../src/main/java/com/topjohnwu/magisk/net/ErrorHandler.java
+1
-1
Networking.java
...ed/src/main/java/com/topjohnwu/magisk/net/Networking.java
+1
-1
NoSSLv3SocketFactory.java
...n/java/com/topjohnwu/magisk/net/NoSSLv3SocketFactory.java
+1
-1
Request.java
shared/src/main/java/com/topjohnwu/magisk/net/Request.java
+1
-1
ResponseListener.java
.../main/java/com/topjohnwu/magisk/net/ResponseListener.java
+1
-1
SSLSocketWrapper.java
.../main/java/com/topjohnwu/magisk/net/SSLSocketWrapper.java
+1
-1
build.gradle
stub/build.gradle
+0
-1
MainActivity.java
stub/src/main/java/com/topjohnwu/magisk/MainActivity.java
+2
-2
No files found.
app/build.gradle
View file @
8f077474
...
...
@@ -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
View file @
8f077474
...
...
@@ -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
View file @
8f077474
...
...
@@ -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
View file @
8f077474
...
...
@@ -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
View file @
8f077474
...
...
@@ -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
View file @
8f077474
...
...
@@ -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
deleted
100644 → 0
View file @
eb5ce5be
/build
net/build.gradle
deleted
100644 → 0
View file @
eb5ce5be
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
deleted
100644 → 0
View file @
eb5ce5be
# 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
deleted
100644 → 0
View file @
eb5ce5be
<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
View file @
8f077474
include
':app'
,
':
net'
,
':
signing'
,
':native'
,
':snet'
,
':stub'
,
':shared'
include
':app'
,
':signing'
,
':native'
,
':snet'
,
':stub'
,
':shared'
net/src/main/java/com/topjohnwu
/net/BadRequest.java
→
shared/src/main/java/com/topjohnwu/magisk
/net/BadRequest.java
View file @
8f077474
package
com
.
topjohnwu
.
net
;
package
com
.
topjohnwu
.
magisk
.
net
;
import
org.json.JSONArray
;
import
org.json.JSONObject
;
...
...
net/src/main/java/com/topjohnwu
/net/ErrorHandler.java
→
shared/src/main/java/com/topjohnwu/magisk
/net/ErrorHandler.java
View file @
8f077474
package
com
.
topjohnwu
.
net
;
package
com
.
topjohnwu
.
magisk
.
net
;
import
java.net.HttpURLConnection
;
...
...
net/src/main/java/com/topjohnwu
/net/Networking.java
→
shared/src/main/java/com/topjohnwu/magisk
/net/Networking.java
View file @
8f077474
package
com
.
topjohnwu
.
net
;
package
com
.
topjohnwu
.
magisk
.
net
;
import
android.content.Context
;
import
android.net.ConnectivityManager
;
...
...
net/src/main/java/com/topjohnwu
/net/NoSSLv3SocketFactory.java
→
shared/src/main/java/com/topjohnwu/magisk
/net/NoSSLv3SocketFactory.java
View file @
8f077474
package
com
.
topjohnwu
.
net
;
package
com
.
topjohnwu
.
magisk
.
net
;
import
java.io.IOException
;
import
java.net.InetAddress
;
...
...
net/src/main/java/com/topjohnwu
/net/Request.java
→
shared/src/main/java/com/topjohnwu/magisk
/net/Request.java
View file @
8f077474
package
com
.
topjohnwu
.
net
;
package
com
.
topjohnwu
.
magisk
.
net
;
import
android.os.AsyncTask
;
...
...
net/src/main/java/com/topjohnwu
/net/ResponseListener.java
→
shared/src/main/java/com/topjohnwu/magisk
/net/ResponseListener.java
View file @
8f077474
package
com
.
topjohnwu
.
net
;
package
com
.
topjohnwu
.
magisk
.
net
;
public
interface
ResponseListener
<
T
>
{
void
onResponse
(
T
response
);
...
...
net/src/main/java/com/topjohnwu
/net/SSLSocketWrapper.java
→
shared/src/main/java/com/topjohnwu/magisk
/net/SSLSocketWrapper.java
View file @
8f077474
package
com
.
topjohnwu
.
net
;
package
com
.
topjohnwu
.
magisk
.
net
;
import
java.io.IOException
;
import
java.io.InputStream
;
...
...
stub/build.gradle
View file @
8f077474
...
...
@@ -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
View file @
8f077474
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment