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
85d9bd91
Commit
85d9bd91
authored
Aug 22, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compile errors
parent
39e96222
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
24 deletions
+20
-24
BasePreferenceFragment.kt
...va/com/topjohnwu/magisk/ui/base/BasePreferenceFragment.kt
+0
-4
SettingsFragment.kt
...java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
+20
-20
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/base/BasePreferenceFragment.kt
View file @
85d9bd91
...
@@ -59,8 +59,4 @@ abstract class BasePreferenceFragment : PreferenceFragmentCompat(),
...
@@ -59,8 +59,4 @@ abstract class BasePreferenceFragment : PreferenceFragmentCompat(),
else
else
view
.
setPadding
(
0
,
view
.
paddingTop
,
view
.
paddingRight
,
view
.
paddingBottom
)
view
.
setPadding
(
0
,
view
.
paddingTop
,
view
.
paddingRight
,
view
.
paddingBottom
)
}
}
protected
fun
<
T
:
Preference
>
findPref
(
key
:
CharSequence
):
T
{
return
findPreference
(
key
)
as
T
}
}
}
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
View file @
85d9bd91
...
@@ -57,46 +57,46 @@ class SettingsFragment : BasePreferenceFragment() {
...
@@ -57,46 +57,46 @@ class SettingsFragment : BasePreferenceFragment() {
preferenceManager
.
setStorageDeviceProtected
()
preferenceManager
.
setStorageDeviceProtected
()
setPreferencesFromResource
(
R
.
xml
.
app_settings
,
rootKey
)
setPreferencesFromResource
(
R
.
xml
.
app_settings
,
rootKey
)
updateChannel
=
findPref
(
Config
.
Key
.
UPDATE_CHANNEL
)
updateChannel
=
findPref
erence
(
Config
.
Key
.
UPDATE_CHANNEL
)
!!
rootConfig
=
findPref
(
Config
.
Key
.
ROOT_ACCESS
)
rootConfig
=
findPref
erence
(
Config
.
Key
.
ROOT_ACCESS
)
!!
autoRes
=
findPref
(
Config
.
Key
.
SU_AUTO_RESPONSE
)
autoRes
=
findPref
erence
(
Config
.
Key
.
SU_AUTO_RESPONSE
)
!!
requestTimeout
=
findPref
(
Config
.
Key
.
SU_REQUEST_TIMEOUT
)
requestTimeout
=
findPref
erence
(
Config
.
Key
.
SU_REQUEST_TIMEOUT
)
!!
suNotification
=
findPref
(
Config
.
Key
.
SU_NOTIFICATION
)
suNotification
=
findPref
erence
(
Config
.
Key
.
SU_NOTIFICATION
)
!!
multiuserConfig
=
findPref
(
Config
.
Key
.
SU_MULTIUSER_MODE
)
multiuserConfig
=
findPref
erence
(
Config
.
Key
.
SU_MULTIUSER_MODE
)
!!
nsConfig
=
findPref
(
Config
.
Key
.
SU_MNT_NS
)
nsConfig
=
findPref
erence
(
Config
.
Key
.
SU_MNT_NS
)
!!
val
reauth
=
findPreference
(
Config
.
Key
.
SU_REAUTH
)
as
SwitchPreferenceCompat
val
reauth
=
findPreference
<
SwitchPreferenceCompat
>(
Config
.
Key
.
SU_REAUTH
)
!!
val
fingerprint
=
findPreference
(
Config
.
Key
.
SU_FINGERPRINT
)
as
SwitchPreferenceCompat
val
fingerprint
=
findPreference
<
SwitchPreferenceCompat
>(
Config
.
Key
.
SU_FINGERPRINT
)
!!
val
generalCatagory
=
findPreference
(
"general"
)
as
PreferenceCategory
val
generalCatagory
=
findPreference
<
PreferenceCategory
>(
"general"
)
!!
val
magiskCategory
=
findPreference
(
"magisk"
)
as
PreferenceCategory
val
magiskCategory
=
findPreference
<
PreferenceCategory
>(
"magisk"
)
!!
val
suCategory
=
findPreference
(
"superuser"
)
as
PreferenceCategory
val
suCategory
=
findPreference
<
PreferenceCategory
>(
"superuser"
)
!!
val
hideManager
=
findPreference
(
"hide"
)
val
hideManager
=
findPreference
<
Preference
>(
"hide"
)
!!
hideManager
.
setOnPreferenceClickListener
{
hideManager
.
setOnPreferenceClickListener
{
PatchAPK
.
hideManager
(
requireContext
())
PatchAPK
.
hideManager
(
requireContext
())
true
true
}
}
val
restoreManager
=
findPreference
(
"restore"
)
val
restoreManager
=
findPreference
<
Preference
>
(
"restore"
)
restoreManager
.
setOnPreferenceClickListener
{
restoreManager
?
.
setOnPreferenceClickListener
{
DownloadService
(
requireContext
())
{
DownloadService
(
requireContext
())
{
subject
=
DownloadSubject
.
Manager
(
Configuration
.
APK
.
Restore
)
subject
=
DownloadSubject
.
Manager
(
Configuration
.
APK
.
Restore
)
}
}
true
true
}
}
findPreference
(
"clear"
)
.
setOnPreferenceClickListener
{
findPreference
<
Preference
>(
"clear"
)
?
.
setOnPreferenceClickListener
{
Completable
.
fromAction
{
repoDB
.
clear
()
}.
subscribeK
{
Completable
.
fromAction
{
repoDB
.
clear
()
}.
subscribeK
{
Utils
.
toast
(
R
.
string
.
repo_cache_cleared
,
Toast
.
LENGTH_SHORT
)
Utils
.
toast
(
R
.
string
.
repo_cache_cleared
,
Toast
.
LENGTH_SHORT
)
}
}
true
true
}
}
findPreference
(
"hosts"
)
.
setOnPreferenceClickListener
{
findPreference
<
Preference
>(
"hosts"
)
?
.
setOnPreferenceClickListener
{
Shell
.
su
(
"add_hosts_module"
).
submit
{
Shell
.
su
(
"add_hosts_module"
).
submit
{
Utils
.
toast
(
R
.
string
.
settings_hosts_toast
,
Toast
.
LENGTH_SHORT
)
Utils
.
toast
(
R
.
string
.
settings_hosts_toast
,
Toast
.
LENGTH_SHORT
)
}
}
true
true
}
}
findPreference
(
Config
.
Key
.
DOWNLOAD_PATH
)
.
apply
{
findPreference
<
Preference
>(
Config
.
Key
.
DOWNLOAD_PATH
)
?
.
apply
{
summary
=
Config
.
downloadPath
summary
=
Config
.
downloadPath
}.
setOnPreferenceClickListener
{
preference
->
}
?
.
setOnPreferenceClickListener
{
preference
->
activity
.
withExternalRW
{
activity
.
withExternalRW
{
onSuccess
{
onSuccess
{
showDownloadDialog
{
showDownloadDialog
{
...
@@ -122,7 +122,7 @@ class SettingsFragment : BasePreferenceFragment() {
...
@@ -122,7 +122,7 @@ class SettingsFragment : BasePreferenceFragment() {
true
true
}
}
setLocalePreference
(
findPreference
(
Config
.
Key
.
LOCALE
)
as
ListPreference
)
setLocalePreference
(
findPreference
(
Config
.
Key
.
LOCALE
)
!!
)
/* We only show canary channels if user is already on canary channel
/* We only show canary channels if user is already on canary channel
* or the user have already chosen canary channel */
* or the user have already chosen canary channel */
...
...
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