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
6092d7ca
Commit
6092d7ca
authored
Oct 11, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor cleanups
parent
66cad101
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
44 additions
and
54 deletions
+44
-54
AndroidManifest.xml
app/shared/src/main/AndroidManifest.xml
+1
-7
p.java
app/shared/src/main/java/a/p.java
+0
-7
FileProvider.java
...ared/src/main/java/com/topjohnwu/magisk/FileProvider.java
+0
-10
ProviderCallHandler.java
...c/main/java/com/topjohnwu/magisk/ProviderCallHandler.java
+0
-8
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+8
-0
stubs.kt
app/src/main/java/a/stubs.kt
+5
-2
App.kt
app/src/main/java/com/topjohnwu/magisk/core/App.kt
+0
-3
Hacks.kt
app/src/main/java/com/topjohnwu/magisk/core/Hacks.kt
+1
-1
Provider.kt
app/src/main/java/com/topjohnwu/magisk/core/Provider.kt
+19
-0
Receiver.kt
app/src/main/java/com/topjohnwu/magisk/core/Receiver.kt
+1
-1
SuCallbackHandler.kt
...in/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt
+1
-8
AndroidManifest.xml
stub/src/main/AndroidManifest.xml
+8
-1
a.java
stub/src/main/java/a/a.java
+0
-6
No files found.
app/shared/src/main/AndroidManifest.xml
View file @
6092d7ca
...
...
@@ -12,12 +12,6 @@
android:supportsRtl=
"true"
android:theme=
"@android:style/Theme.Translucent.NoTitleBar"
tools:ignore=
"UnusedAttribute"
>
<provider
android:name=
"a.p"
android:authorities=
"${applicationId}.provider"
android:exported=
"false"
android:grantUriPermissions=
"true"
>
</provider>
</application>
</manifest>
app/shared/src/main/java/a/p.java
deleted
100644 → 0
View file @
66cad101
package
a
;
import
com.topjohnwu.magisk.FileProvider
;
public
class
p
extends
FileProvider
{
/* Stub */
}
app/shared/src/main/java/com/topjohnwu/magisk/FileProvider.java
View file @
6092d7ca
...
...
@@ -8,7 +8,6 @@ import android.database.Cursor;
import
android.database.MatrixCursor
;
import
android.net.Uri
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Environment
;
import
android.os.ParcelFileDescriptor
;
import
android.provider.OpenableColumns
;
...
...
@@ -34,8 +33,6 @@ public class FileProvider extends ContentProvider {
private
PathStrategy
mStrategy
;
public
static
ProviderCallHandler
callHandler
;
@Override
public
boolean
onCreate
()
{
return
true
;
...
...
@@ -131,13 +128,6 @@ public class FileProvider extends ContentProvider {
return
file
.
delete
()
?
1
:
0
;
}
@Override
public
Bundle
call
(
String
method
,
String
arg
,
Bundle
extras
)
{
if
(
callHandler
!=
null
)
return
callHandler
.
call
(
getContext
(),
method
,
arg
,
extras
);
return
Bundle
.
EMPTY
;
}
@Override
public
ParcelFileDescriptor
openFile
(
Uri
uri
,
String
mode
)
throws
FileNotFoundException
{
...
...
app/shared/src/main/java/com/topjohnwu/magisk/ProviderCallHandler.java
deleted
100644 → 0
View file @
66cad101
package
com
.
topjohnwu
.
magisk
;
import
android.content.Context
;
import
android.os.Bundle
;
public
interface
ProviderCallHandler
{
Bundle
call
(
Context
context
,
String
method
,
String
arg
,
Bundle
extras
);
}
app/src/main/AndroidManifest.xml
View file @
6092d7ca
...
...
@@ -65,6 +65,14 @@
<!-- DownloadService -->
<service
android:name=
"a.j"
/>
<!-- FileProvider -->
<provider
android:name=
"a.p"
android:authorities=
"${applicationId}.provider"
android:exported=
"false"
android:grantUriPermissions=
"true"
>
</provider>
<!-- Hardcode GMS version -->
<meta-data
android:name=
"com.google.android.gms.version"
...
...
app/src/main/java/a/stubs.kt
View file @
6092d7ca
...
...
@@ -2,7 +2,8 @@
package
a
import
com.topjohnwu.magisk.core.App
import
com.topjohnwu.magisk.core.GeneralReceiver
import
com.topjohnwu.magisk.core.Provider
import
com.topjohnwu.magisk.core.Receiver
import
com.topjohnwu.magisk.core.SplashActivity
import
com.topjohnwu.magisk.core.download.DownloadService
import
com.topjohnwu.magisk.ui.MainActivity
...
...
@@ -22,8 +23,10 @@ class e : App {
constructor
(
o
:
Any
)
:
super
(
o
)
}
class
h
:
General
Receiver
()
class
h
:
Receiver
()
class
j
:
DownloadService
()
class
m
:
SuRequestActivity
()
class
p
:
Provider
()
app/src/main/java/com/topjohnwu/magisk/core/App.kt
View file @
6092d7ca
...
...
@@ -10,8 +10,6 @@ import androidx.multidex.MultiDex
import
androidx.work.WorkManager
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.DynAPK
import
com.topjohnwu.magisk.FileProvider
import
com.topjohnwu.magisk.core.su.SuCallbackHandler
import
com.topjohnwu.magisk.core.utils.IODispatcherExecutor
import
com.topjohnwu.magisk.core.utils.RootInit
import
com.topjohnwu.magisk.core.utils.updateConfig
...
...
@@ -36,7 +34,6 @@ open class App() : Application() {
.
setInitializers
(
RootInit
::
class
.
java
)
.
setTimeout
(
2
))
Shell
.
EXECUTOR
=
IODispatcherExecutor
()
FileProvider
.
callHandler
=
SuCallbackHandler
// Always log full stack trace with Timber
Timber
.
plant
(
Timber
.
DebugTree
())
...
...
app/src/main/java/com/topjohnwu/magisk/core/Hacks.kt
View file @
6092d7ca
...
...
@@ -149,7 +149,7 @@ private object ClassMap {
App
::
class
.
java
to
a
.
e
::
class
.
java
,
MainActivity
::
class
.
java
to
a
.
b
::
class
.
java
,
SplashActivity
::
class
.
java
to
a
.
c
::
class
.
java
,
General
Receiver
::
class
.
java
to
a
.
h
::
class
.
java
,
Receiver
::
class
.
java
to
a
.
h
::
class
.
java
,
DownloadService
::
class
.
java
to
a
.
j
::
class
.
java
,
SuRequestActivity
::
class
.
java
to
a
.
m
::
class
.
java
)
...
...
app/src/main/java/com/topjohnwu/magisk/core/Provider.kt
0 → 100644
View file @
6092d7ca
package
com.topjohnwu.magisk.core
import
android.content.Context
import
android.content.pm.ProviderInfo
import
android.os.Bundle
import
com.topjohnwu.magisk.FileProvider
import
com.topjohnwu.magisk.core.su.SuCallbackHandler
open
class
Provider
:
FileProvider
()
{
override
fun
attachInfo
(
context
:
Context
,
info
:
ProviderInfo
?)
{
super
.
attachInfo
(
context
.
wrap
(),
info
)
}
override
fun
call
(
method
:
String
,
arg
:
String
?,
extras
:
Bundle
?):
Bundle
?
{
SuCallbackHandler
(
context
!!
,
method
,
extras
)
return
Bundle
.
EMPTY
}
}
app/src/main/java/com/topjohnwu/magisk/core/
General
Receiver.kt
→
app/src/main/java/com/topjohnwu/magisk/core/Receiver.kt
View file @
6092d7ca
...
...
@@ -11,7 +11,7 @@ import kotlinx.coroutines.GlobalScope
import
kotlinx.coroutines.launch
import
org.koin.core.inject
open
class
General
Receiver
:
BaseReceiver
()
{
open
class
Receiver
:
BaseReceiver
()
{
private
val
policyDB
:
PolicyDao
by
inject
()
...
...
app/src/main/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt
View file @
6092d7ca
...
...
@@ -7,14 +7,12 @@ import android.os.Bundle
import
android.os.Process
import
android.widget.Toast
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.ProviderCallHandler
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.intent
import
com.topjohnwu.magisk.core.model.su.SuPolicy
import
com.topjohnwu.magisk.core.model.su.toLog
import
com.topjohnwu.magisk.core.model.su.toPolicy
import
com.topjohnwu.magisk.core.wrap
import
com.topjohnwu.magisk.data.repository.LogRepository
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.ktx.startActivity
...
...
@@ -26,18 +24,13 @@ import kotlinx.coroutines.GlobalScope
import
kotlinx.coroutines.launch
import
timber.log.Timber
object
SuCallbackHandler
:
ProviderCallHandler
{
object
SuCallbackHandler
{
const
val
REQUEST
=
"request"
const
val
LOG
=
"log"
const
val
NOTIFY
=
"notify"
const
val
TEST
=
"test"
override
fun
call
(
context
:
Context
,
method
:
String
,
arg
:
String
?,
extras
:
Bundle
?):
Bundle
?
{
invoke
(
context
.
wrap
(),
method
,
extras
)
return
Bundle
.
EMPTY
}
operator
fun
invoke
(
context
:
Context
,
action
:
String
?,
data
:
Bundle
?)
{
data
?:
return
...
...
stub/src/main/AndroidManifest.xml
View file @
6092d7ca
...
...
@@ -10,13 +10,20 @@
android:allowBackup=
"true"
tools:ignore=
"AllowBackup"
>
<activity
android:name=
"
a.a
"
>
<activity
android:name=
"
.MainActivity
"
>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
</intent-filter>
</activity>
<provider
android:name=
".FileProvider"
android:authorities=
"${applicationId}.provider"
android:exported=
"false"
android:grantUriPermissions=
"true"
>
</provider>
</application>
</manifest>
stub/src/main/java/a/a.java
deleted
100644 → 0
View file @
66cad101
package
a
;
import
com.topjohnwu.magisk.MainActivity
;
public
class
a
extends
MainActivity
{
}
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