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
eb169cb1
Commit
eb169cb1
authored
May 13, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Converted classmap to kotlin
parent
92789c31
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
36 additions
and
37 deletions
+36
-37
ClassMap.java
app/src/main/java/com/topjohnwu/magisk/ClassMap.java
+0
-31
ClassMap.kt
app/src/main/java/com/topjohnwu/magisk/ClassMap.kt
+27
-0
GeneralReceiver.kt
...va/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt
+1
-1
MainActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+1
-1
SplashActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
+1
-1
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
Utils.java
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
+4
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/ClassMap.java
deleted
100644 → 0
View file @
92789c31
package
com
.
topjohnwu
.
magisk
;
import
com.topjohnwu.magisk.model.download.DownloadModuleService
;
import
com.topjohnwu.magisk.model.receiver.GeneralReceiver
;
import
com.topjohnwu.magisk.model.update.UpdateCheckService
;
import
com.topjohnwu.magisk.ui.MainActivity
;
import
com.topjohnwu.magisk.ui.SplashActivity
;
import
com.topjohnwu.magisk.ui.flash.FlashActivity
;
import
com.topjohnwu.magisk.ui.surequest.SuRequestActivity
;
import
java.util.HashMap
;
import
java.util.Map
;
public
class
ClassMap
{
private
static
Map
<
Class
,
Class
>
classMap
=
new
HashMap
<>();
static
{
classMap
.
put
(
App
.
class
,
a
.
e
.
class
);
classMap
.
put
(
MainActivity
.
class
,
a
.
b
.
class
);
classMap
.
put
(
SplashActivity
.
class
,
a
.
c
.
class
);
classMap
.
put
(
FlashActivity
.
class
,
a
.
f
.
class
);
classMap
.
put
(
UpdateCheckService
.
class
,
a
.
g
.
class
);
classMap
.
put
(
GeneralReceiver
.
class
,
a
.
h
.
class
);
classMap
.
put
(
DownloadModuleService
.
class
,
a
.
j
.
class
);
classMap
.
put
(
SuRequestActivity
.
class
,
a
.
m
.
class
);
}
public
static
<
T
>
Class
<
T
>
get
(
Class
c
)
{
return
classMap
.
get
(
c
);
}
}
app/src/main/java/com/topjohnwu/magisk/ClassMap.kt
0 → 100644
View file @
eb169cb1
package
com.topjohnwu.magisk
import
com.topjohnwu.magisk.model.download.DownloadModuleService
import
com.topjohnwu.magisk.model.receiver.GeneralReceiver
import
com.topjohnwu.magisk.model.update.UpdateCheckService
import
com.topjohnwu.magisk.ui.MainActivity
import
com.topjohnwu.magisk.ui.SplashActivity
import
com.topjohnwu.magisk.ui.flash.FlashActivity
import
com.topjohnwu.magisk.ui.surequest.SuRequestActivity
object
ClassMap
{
private
val
map
=
mapOf
(
App
::
class
.
java
to
a
.
e
::
class
.
java
,
MainActivity
::
class
.
java
to
a
.
b
::
class
.
java
,
SplashActivity
::
class
.
java
to
a
.
c
::
class
.
java
,
FlashActivity
::
class
.
java
to
a
.
f
::
class
.
java
,
UpdateCheckService
::
class
.
java
to
a
.
g
::
class
.
java
,
GeneralReceiver
::
class
.
java
to
a
.
h
::
class
.
java
,
DownloadModuleService
::
class
.
java
to
a
.
j
::
class
.
java
,
SuRequestActivity
::
class
.
java
to
a
.
m
::
class
.
java
)
@JvmStatic
operator
fun
get
(
c
:
Class
<
*
>):
Class
<
*
>?
{
return
map
.
getOrElse
(
c
)
{
null
}
//as? Class<T>
}
}
app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt
View file @
eb169cb1
...
...
@@ -41,7 +41,7 @@ open class GeneralReceiver : BroadcastReceiver() {
}
when
(
action
)
{
SuRequestActivity
.
REQUEST
->
{
val
i
=
Intent
(
context
,
ClassMap
.
get
<
Any
>(
SuRequestActivity
::
class
.
java
)
)
val
i
=
Intent
(
context
,
ClassMap
[
SuRequestActivity
::
class
.
java
]
)
.
setAction
(
action
)
.
putExtra
(
"socket"
,
intent
.
getStringExtra
(
"socket"
))
.
addFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
)
...
...
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
View file @
eb169cb1
...
...
@@ -48,7 +48,7 @@ open class MainActivity : MagiskActivity<MainViewModel, ActivityMainBinding>() {
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
if
(!
SplashActivity
.
DONE
)
{
startActivity
(
Intent
(
this
,
ClassMap
.
get
<
Any
>(
SplashActivity
::
class
.
java
)
))
startActivity
(
Intent
(
this
,
ClassMap
[
SplashActivity
::
class
.
java
]
))
finish
()
}
...
...
app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
View file @
eb169cb1
...
...
@@ -66,7 +66,7 @@ open class SplashActivity : AppCompatActivity() {
//UpdateRepos().exec()
}
val
intent
=
Intent
(
this
,
ClassMap
.
get
<
Any
>(
MainActivity
::
class
.
java
)
)
val
intent
=
Intent
(
this
,
ClassMap
[
MainActivity
::
class
.
java
]
)
intent
.
putExtra
(
Const
.
Key
.
OPEN_SECTION
,
getIntent
().
getStringExtra
(
Const
.
Key
.
OPEN_SECTION
))
DONE
=
true
startActivity
(
intent
)
...
...
app/src/main/java/com/topjohnwu/magisk/ui/module/ModulesFragment.kt
View file @
eb169cb1
...
...
@@ -28,7 +28,7 @@ class ModulesFragment : MagiskFragment<ModuleViewModel, FragmentModulesBinding>(
override
fun
onActivityResult
(
requestCode
:
Int
,
resultCode
:
Int
,
data
:
Intent
?)
{
if
(
requestCode
==
Const
.
ID
.
FETCH_ZIP
&&
resultCode
==
Activity
.
RESULT_OK
&&
data
!=
null
)
{
// Get the URI of the selected file
val
intent
=
Intent
(
activity
,
ClassMap
.
get
<
Any
>(
FlashActivity
::
class
.
java
)
)
val
intent
=
Intent
(
activity
,
ClassMap
[
FlashActivity
::
class
.
java
]
)
intent
.
setData
(
data
.
data
).
putExtra
(
Const
.
Key
.
FLASH_ACTION
,
Const
.
Value
.
FLASH_ZIP
)
startActivity
(
intent
)
}
...
...
app/src/main/java/com/topjohnwu/magisk/ui/module/ReposFragment.kt
View file @
eb169cb1
...
...
@@ -82,7 +82,7 @@ class ReposFragment : MagiskFragment<ModuleViewModel, FragmentReposBinding>(),
fun
download
(
install
:
Boolean
)
{
context
.
runWithExternalRW
{
val
intent
=
Intent
(
activity
,
ClassMap
.
get
<
Any
>(
DownloadModuleService
::
class
.
java
)
)
val
intent
=
Intent
(
activity
,
ClassMap
[
DownloadModuleService
::
class
.
java
]
)
.
putExtra
(
"repo"
,
item
).
putExtra
(
"install"
,
install
)
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
O
)
{
context
.
startForegroundService
(
intent
)
//hmm, service starts itself in foreground, this seems unnecessary
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
View file @
eb169cb1
...
...
@@ -30,6 +30,7 @@ import java.util.concurrent.TimeUnit;
import
androidx.annotation.WorkerThread
;
import
androidx.work.Constraints
;
import
androidx.work.ExistingPeriodicWorkPolicy
;
import
androidx.work.ListenableWorker
;
import
androidx.work.NetworkType
;
import
androidx.work.PeriodicWorkRequest
;
import
androidx.work.WorkManager
;
...
...
@@ -110,13 +111,15 @@ public class Utils {
return
BuildConfig
.
VERSION_NAME
.
contains
(
"-"
);
}
@SuppressWarnings
(
"unchecked"
)
public
static
void
scheduleUpdateCheck
()
{
if
(
Config
.
get
(
Config
.
Key
.
CHECK_UPDATES
))
{
Constraints
constraints
=
new
Constraints
.
Builder
()
.
setRequiredNetworkType
(
NetworkType
.
CONNECTED
)
.
build
();
Class
<?
extends
ListenableWorker
>
service
=
(
Class
<?
extends
ListenableWorker
>)
ClassMap
.
get
(
UpdateCheckService
.
class
);
PeriodicWorkRequest
request
=
new
PeriodicWorkRequest
.
Builder
(
ClassMap
.
get
(
UpdateCheckService
.
class
)
,
12
,
TimeUnit
.
HOURS
)
.
Builder
(
service
,
12
,
TimeUnit
.
HOURS
)
.
setConstraints
(
constraints
)
.
build
();
WorkManager
.
getInstance
().
enqueueUniquePeriodicWork
(
...
...
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