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
5537b083
Commit
5537b083
authored
Mar 31, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move surequest out of legacy
parent
6b085474
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
7 additions
and
51 deletions
+7
-51
stubs.kt
app/src/main/java/a/stubs.kt
+1
-1
Hacks.kt
app/src/main/java/com/topjohnwu/magisk/core/Hacks.kt
+1
-1
SuCallbackHandler.kt
...in/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt
+1
-1
ViewModelsModule.kt
...src/main/java/com/topjohnwu/magisk/di/ViewModelsModule.kt
+1
-3
RequestActivity.kt
...n/java/com/topjohnwu/magisk/ui/request/RequestActivity.kt
+0
-14
RequestViewModel.kt
.../java/com/topjohnwu/magisk/ui/request/RequestViewModel.kt
+0
-5
SuRequestActivity.kt
...va/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
+1
-1
SuRequestViewModel.kt
...a/com/topjohnwu/magisk/ui/surequest/SuRequestViewModel.kt
+1
-1
activity_request.xml
app/src/main/res/layout/activity_request.xml
+1
-1
activity_request_md2.xml
app/src/main/res/layout/activity_request_md2.xml
+0
-23
No files found.
app/src/main/java/a/stubs.kt
View file @
5537b083
...
@@ -6,7 +6,7 @@ import com.topjohnwu.magisk.core.App
...
@@ -6,7 +6,7 @@ import com.topjohnwu.magisk.core.App
import
com.topjohnwu.magisk.core.GeneralReceiver
import
com.topjohnwu.magisk.core.GeneralReceiver
import
com.topjohnwu.magisk.core.SplashActivity
import
com.topjohnwu.magisk.core.SplashActivity
import
com.topjohnwu.magisk.core.download.DownloadService
import
com.topjohnwu.magisk.core.download.DownloadService
import
com.topjohnwu.magisk.
legacy
.surequest.SuRequestActivity
import
com.topjohnwu.magisk.
ui
.surequest.SuRequestActivity
import
com.topjohnwu.magisk.ui.MainActivity
import
com.topjohnwu.magisk.ui.MainActivity
import
com.topjohnwu.signing.BootSigner
import
com.topjohnwu.signing.BootSigner
...
...
app/src/main/java/com/topjohnwu/magisk/core/Hacks.kt
View file @
5537b083
...
@@ -21,7 +21,7 @@ import com.topjohnwu.magisk.core.download.DownloadService
...
@@ -21,7 +21,7 @@ import com.topjohnwu.magisk.core.download.DownloadService
import
com.topjohnwu.magisk.core.utils.refreshLocale
import
com.topjohnwu.magisk.core.utils.refreshLocale
import
com.topjohnwu.magisk.core.utils.updateConfig
import
com.topjohnwu.magisk.core.utils.updateConfig
import
com.topjohnwu.magisk.extensions.forceGetDeclaredField
import
com.topjohnwu.magisk.extensions.forceGetDeclaredField
import
com.topjohnwu.magisk.
legacy
.surequest.SuRequestActivity
import
com.topjohnwu.magisk.
ui
.surequest.SuRequestActivity
import
com.topjohnwu.magisk.ui.MainActivity
import
com.topjohnwu.magisk.ui.MainActivity
fun
AssetManager
.
addAssetPath
(
path
:
String
)
{
fun
AssetManager
.
addAssetPath
(
path
:
String
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt
View file @
5537b083
...
@@ -20,7 +20,7 @@ import com.topjohnwu.magisk.extensions.get
...
@@ -20,7 +20,7 @@ import com.topjohnwu.magisk.extensions.get
import
com.topjohnwu.magisk.extensions.startActivity
import
com.topjohnwu.magisk.extensions.startActivity
import
com.topjohnwu.magisk.extensions.startActivityWithRoot
import
com.topjohnwu.magisk.extensions.startActivityWithRoot
import
com.topjohnwu.magisk.extensions.subscribeK
import
com.topjohnwu.magisk.extensions.subscribeK
import
com.topjohnwu.magisk.
legacy
.surequest.SuRequestActivity
import
com.topjohnwu.magisk.
ui
.surequest.SuRequestActivity
import
com.topjohnwu.magisk.model.entity.toLog
import
com.topjohnwu.magisk.model.entity.toLog
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
timber.log.Timber
import
timber.log.Timber
...
...
app/src/main/java/com/topjohnwu/magisk/di/ViewModelsModule.kt
View file @
5537b083
package
com.topjohnwu.magisk.di
package
com.topjohnwu.magisk.di
import
com.topjohnwu.magisk.legacy.surequest.SuRequestViewModel
import
com.topjohnwu.magisk.ui.MainViewModel
import
com.topjohnwu.magisk.ui.MainViewModel
import
com.topjohnwu.magisk.ui.flash.FlashFragmentArgs
import
com.topjohnwu.magisk.ui.flash.FlashFragmentArgs
import
com.topjohnwu.magisk.ui.flash.FlashViewModel
import
com.topjohnwu.magisk.ui.flash.FlashViewModel
...
@@ -9,10 +8,10 @@ import com.topjohnwu.magisk.ui.home.HomeViewModel
...
@@ -9,10 +8,10 @@ import com.topjohnwu.magisk.ui.home.HomeViewModel
import
com.topjohnwu.magisk.ui.install.InstallViewModel
import
com.topjohnwu.magisk.ui.install.InstallViewModel
import
com.topjohnwu.magisk.ui.log.LogViewModel
import
com.topjohnwu.magisk.ui.log.LogViewModel
import
com.topjohnwu.magisk.ui.module.ModuleViewModel
import
com.topjohnwu.magisk.ui.module.ModuleViewModel
import
com.topjohnwu.magisk.ui.request.RequestViewModel
import
com.topjohnwu.magisk.ui.safetynet.SafetynetViewModel
import
com.topjohnwu.magisk.ui.safetynet.SafetynetViewModel
import
com.topjohnwu.magisk.ui.settings.SettingsViewModel
import
com.topjohnwu.magisk.ui.settings.SettingsViewModel
import
com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
import
com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
import
com.topjohnwu.magisk.ui.surequest.SuRequestViewModel
import
com.topjohnwu.magisk.ui.theme.ThemeViewModel
import
com.topjohnwu.magisk.ui.theme.ThemeViewModel
import
org.koin.androidx.viewmodel.dsl.viewModel
import
org.koin.androidx.viewmodel.dsl.viewModel
import
org.koin.dsl.module
import
org.koin.dsl.module
...
@@ -22,7 +21,6 @@ val viewModelModules = module {
...
@@ -22,7 +21,6 @@ val viewModelModules = module {
viewModel
{
HomeViewModel
(
get
())
}
viewModel
{
HomeViewModel
(
get
())
}
viewModel
{
LogViewModel
(
get
())
}
viewModel
{
LogViewModel
(
get
())
}
viewModel
{
ModuleViewModel
(
get
(),
get
(),
get
())
}
viewModel
{
ModuleViewModel
(
get
(),
get
(),
get
())
}
viewModel
{
RequestViewModel
()
}
viewModel
{
SafetynetViewModel
(
get
())
}
viewModel
{
SafetynetViewModel
(
get
())
}
viewModel
{
SettingsViewModel
(
get
())
}
viewModel
{
SettingsViewModel
(
get
())
}
viewModel
{
SuperuserViewModel
(
get
(),
get
(),
get
())
}
viewModel
{
SuperuserViewModel
(
get
(),
get
(),
get
())
}
...
...
app/src/main/java/com/topjohnwu/magisk/ui/request/RequestActivity.kt
deleted
100644 → 0
View file @
6b085474
package
com.topjohnwu.magisk.ui.request
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.ActivityRequestMd2Binding
import
com.topjohnwu.magisk.ui.base.BaseUIActivity
import
org.koin.androidx.viewmodel.ext.android.viewModel
class
RequestActivity
:
BaseUIActivity
<
RequestViewModel
,
ActivityRequestMd2Binding
>()
{
override
val
navHost
=
TODO
()
override
val
layoutRes
=
R
.
layout
.
activity_request_md2
override
val
viewModel
by
viewModel
<
RequestViewModel
>()
}
app/src/main/java/com/topjohnwu/magisk/ui/request/RequestViewModel.kt
deleted
100644 → 0
View file @
6b085474
package
com.topjohnwu.magisk.ui.request
import
com.topjohnwu.magisk.ui.base.BaseViewModel
class
RequestViewModel
:
BaseViewModel
()
app/src/main/java/com/topjohnwu/magisk/
legacy
/surequest/SuRequestActivity.kt
→
app/src/main/java/com/topjohnwu/magisk/
ui
/surequest/SuRequestActivity.kt
View file @
5537b083
package
com.topjohnwu.magisk.
legacy
.surequest
package
com.topjohnwu.magisk.
ui
.surequest
import
android.content.Intent
import
android.content.Intent
import
android.content.pm.ActivityInfo
import
android.content.pm.ActivityInfo
...
...
app/src/main/java/com/topjohnwu/magisk/
legacy
/surequest/SuRequestViewModel.kt
→
app/src/main/java/com/topjohnwu/magisk/
ui
/surequest/SuRequestViewModel.kt
View file @
5537b083
package
com.topjohnwu.magisk.
legacy
.surequest
package
com.topjohnwu.magisk.
ui
.surequest
import
android.content.Intent
import
android.content.Intent
import
android.content.SharedPreferences
import
android.content.SharedPreferences
...
...
app/src/main/res/layout/activity_request.xml
View file @
5537b083
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
<variable
<variable
name=
"viewModel"
name=
"viewModel"
type=
"com.topjohnwu.magisk.
legacy
.surequest.SuRequestViewModel"
/>
type=
"com.topjohnwu.magisk.
ui
.surequest.SuRequestViewModel"
/>
</data>
</data>
...
...
app/src/main/res/layout/activity_request_md2.xml
deleted
100644 → 0
View file @
6b085474
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<data>
<variable
name=
"viewModel"
type=
"com.topjohnwu.magisk.ui.request.RequestViewModel"
/>
</data>
<androidx.core.widget.NestedScrollView
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:fillViewport=
"true"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
</androidx.core.widget.NestedScrollView>
</layout>
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