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
eb5ce5be
Commit
eb5ce5be
authored
Aug 04, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix saving logs
Fix #1722
parent
71d855e8
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
15 deletions
+21
-15
MagiskFragment.kt
.../main/java/com/topjohnwu/magisk/ui/base/MagiskFragment.kt
+6
-6
LogFragment.kt
app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
+7
-3
LogViewModel.kt
...src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
+6
-4
ModulesFragment.kt
...in/java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt
+1
-1
ReposFragment.kt
...main/java/com/topjohnwu/magisk/ui/module/ReposFragment.kt
+1
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/base/MagiskFragment.kt
View file @
eb5ce5be
...
...
@@ -17,21 +17,21 @@ import kotlin.reflect.KClass
abstract
class
MagiskFragment
<
ViewModel
:
MagiskViewModel
,
Binding
:
ViewDataBinding
>
:
TeanityFragment
<
ViewModel
,
Binding
>(),
Navigator
{
protected
val
magiskActivity
get
()
=
activity
as
MagiskActivity
<*,
*>
protected
val
activity
get
()
=
requireActivity
()
as
MagiskActivity
<*,
*>
// We don't need nested fragments
override
val
baseFragments
:
List
<
KClass
<
Fragment
>>
=
listOf
()
override
fun
navigateTo
(
event
:
MagiskNavigationEvent
)
=
magiskA
ctivity
.
navigateTo
(
event
)
override
fun
navigateTo
(
event
:
MagiskNavigationEvent
)
=
a
ctivity
.
navigateTo
(
event
)
@CallSuper
override
fun
onEventDispatched
(
event
:
ViewEvent
)
{
super
.
onEventDispatched
(
event
)
when
(
event
)
{
is
BackPressEvent
->
magiskA
ctivity
.
onBackPressed
()
is
BackPressEvent
->
a
ctivity
.
onBackPressed
()
is
MagiskNavigationEvent
->
navigateTo
(
event
)
is
ViewActionEvent
->
event
.
action
(
requireActivity
())
is
PermissionEvent
->
magiskA
ctivity
.
withPermissions
(*
event
.
permissions
.
toTypedArray
())
{
is
PermissionEvent
->
a
ctivity
.
withPermissions
(*
event
.
permissions
.
toTypedArray
())
{
onSuccess
{
event
.
callback
.
onNext
(
true
)
}
onFailure
{
event
.
callback
.
onNext
(
false
)
...
...
@@ -42,10 +42,10 @@ abstract class MagiskFragment<ViewModel : MagiskViewModel, Binding : ViewDataBin
}
fun
withPermissions
(
vararg
permissions
:
String
,
builder
:
PermissionRequestBuilder
.()
->
Unit
)
{
magiskA
ctivity
.
withPermissions
(*
permissions
,
builder
=
builder
)
a
ctivity
.
withPermissions
(*
permissions
,
builder
=
builder
)
}
fun
openLink
(
url
:
String
)
=
magiskA
ctivity
.
openUrl
(
url
)
fun
openLink
(
url
:
String
)
=
a
ctivity
.
openUrl
(
url
)
open
fun
onBackPressed
():
Boolean
=
false
...
...
app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.kt
View file @
eb5ce5be
...
...
@@ -21,7 +21,7 @@ class LogFragment : MagiskFragment<LogViewModel, FragmentLogBinding>() {
override
fun
onEventDispatched
(
event
:
ViewEvent
)
{
super
.
onEventDispatched
(
event
)
when
(
event
)
{
is
PageChangedEvent
->
magiskA
ctivity
.
invalidateOptionsMenu
()
is
PageChangedEvent
->
a
ctivity
.
invalidateOptionsMenu
()
}
}
...
...
@@ -33,7 +33,7 @@ class LogFragment : MagiskFragment<LogViewModel, FragmentLogBinding>() {
override
fun
onStart
()
{
super
.
onStart
()
setHasOptionsMenu
(
true
)
magiskA
ctivity
.
setTitle
(
R
.
string
.
log
)
a
ctivity
.
setTitle
(
R
.
string
.
log
)
}
override
fun
onCreateOptionsMenu
(
menu
:
Menu
,
inflater
:
MenuInflater
)
{
...
...
@@ -43,7 +43,11 @@ class LogFragment : MagiskFragment<LogViewModel, FragmentLogBinding>() {
override
fun
onOptionsItemSelected
(
item
:
MenuItem
):
Boolean
{
when
(
item
.
itemId
)
{
R
.
id
.
menu_save
->
viewModel
.
saveLog
()
R
.
id
.
menu_save
->
activity
.
withExternalRW
{
onSuccess
{
viewModel
.
saveLog
()
}
}
R
.
id
.
menu_clear
->
viewModel
.
clearLog
()
R
.
id
.
menu_refresh
->
viewModel
.
refresh
()
}
...
...
app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt
View file @
eb5ce5be
...
...
@@ -9,6 +9,7 @@ import com.skoumal.teanity.util.DiffObservableList
import
com.skoumal.teanity.util.KObservableField
import
com.skoumal.teanity.viewevents.SnackbarEvent
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.Config
import
com.topjohnwu.magisk.Const
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.data.repository.LogRepository
...
...
@@ -22,8 +23,8 @@ import com.topjohnwu.magisk.ui.base.MagiskViewModel
import
com.topjohnwu.superuser.Shell
import
me.tatarka.bindingcollectionadapter2.BindingViewPagerAdapter
import
me.tatarka.bindingcollectionadapter2.OnItemBind
import
timber.log.Timber
import
java.io.File
import
java.io.IOException
import
java.util.*
class
LogViewModel
(
...
...
@@ -78,10 +79,11 @@ class LogViewModel(
now
.
get
(
Calendar
.
MINUTE
),
now
.
get
(
Calendar
.
SECOND
)
)
val
logFile
=
File
(
Con
st
.
EXTERNAL_PATH
,
filename
)
try
{
val
logFile
=
File
(
Con
fig
.
downloadDirectory
,
filename
)
runCatching
{
logFile
.
createNewFile
()
}
catch
(
e
:
IOException
)
{
}.
onFailure
{
Timber
.
e
(
it
)
return
}
...
...
app/src/main/java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt
View file @
eb5ce5be
...
...
@@ -88,7 +88,7 @@ class ModulesFragment : MagiskFragment<ModuleViewModel, FragmentModulesBinding>(
}
private
fun
selectFile
()
{
magiskA
ctivity
.
withExternalRW
{
a
ctivity
.
withExternalRW
{
onSuccess
{
val
intent
=
Intent
(
Intent
.
ACTION_GET_CONTENT
)
intent
.
type
=
"application/zip"
...
...
app/src/main/java/com/topjohnwu/magisk/ui/module/ReposFragment.kt
View file @
eb5ce5be
...
...
@@ -94,7 +94,7 @@ class ReposFragment : MagiskFragment<ModuleViewModel, FragmentReposBinding>(),
@SuppressLint
(
"MissingPermission"
)
private
fun
installModule
(
item
:
Repo
)
{
val
context
=
magiskA
ctivity
val
context
=
a
ctivity
fun
download
(
install
:
Boolean
)
=
context
.
withExternalRW
{
onSuccess
{
...
...
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