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
f615ed40
Commit
f615ed40
authored
Feb 17, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Several refinements
parent
430f2caf
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
9 deletions
+17
-9
InstallFragment.java
app/src/main/java/com/topjohnwu/magisk/InstallFragment.java
+2
-2
MainActivity.java
app/src/main/java/com/topjohnwu/magisk/MainActivity.java
+7
-3
SplashActivity.java
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
+1
-1
CheckUpdates.java
...c/main/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
+1
-1
strings.xml
app/src/main/res/values-zh-rTW/strings.xml
+4
-2
strings.xml
app/src/main/res/values/strings.xml
+2
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/InstallFragment.java
View file @
f615ed40
...
...
@@ -98,8 +98,8 @@ public class InstallFragment extends Fragment implements CallbackEvent.Listener<
}
else
{
uninstallButton
.
setOnClickListener
(
vi
->
{
new
AlertDialogBuilder
(
getActivity
())
.
setTitle
(
"Uninstall Magisk"
)
.
setMessage
(
"This will remove all modules, MagiskSU, and potentially re-encrypt your device\nAre you sure to process?"
)
.
setTitle
(
R
.
string
.
uninstall_magisk_title
)
.
setMessage
(
R
.
string
.
uninstall_magisk_msg
)
.
setPositiveButton
(
R
.
string
.
yes
,
(
dialogInterface
,
i
)
->
{
try
{
InputStream
in
=
getActivity
().
getAssets
().
open
(
UNINSTALLER
);
...
...
app/src/main/java/com/topjohnwu/magisk/MainActivity.java
View file @
f615ed40
...
...
@@ -78,9 +78,7 @@ public class MainActivity extends Activity
drawer
.
addDrawerListener
(
toggle
);
toggle
.
syncState
();
if
(
savedInstanceState
!=
null
)
navigate
(
savedInstanceState
.
getInt
(
SECTION
,
R
.
id
.
status
));
else
if
(
savedInstanceState
==
null
)
navigate
(
getIntent
().
getStringExtra
(
SECTION
));
navigationView
.
setNavigationItemSelectedListener
(
this
);
...
...
@@ -94,6 +92,12 @@ public class MainActivity extends Activity
checkHideSection
();
}
@Override
protected
void
onRestoreInstanceState
(
Bundle
savedInstanceState
)
{
super
.
onRestoreInstanceState
(
savedInstanceState
);
navigate
(
savedInstanceState
.
getInt
(
SECTION
,
R
.
id
.
status
));
}
@Override
protected
void
onSaveInstanceState
(
Bundle
outState
)
{
super
.
onSaveInstanceState
(
outState
);
...
...
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
View file @
f615ed40
...
...
@@ -64,7 +64,7 @@ public class SplashActivity extends Activity{
}
}.
exec
();
new
LoadApps
(
this
).
exec
();
new
CheckUpdates
(
this
,
!
"install"
.
equals
(
getIntent
().
getStringExtra
(
MainActivity
.
SECTION
))
){
new
CheckUpdates
(
this
,
false
){
@Override
protected
void
onPostExecute
(
Void
v
)
{
super
.
onPostExecute
(
v
);
...
...
app/src/main/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
View file @
f615ed40
...
...
@@ -58,7 +58,7 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
Intent
intent
=
new
Intent
(
magiskManager
,
SplashActivity
.
class
);
intent
.
putExtra
(
MainActivity
.
SECTION
,
"install"
);
TaskStackBuilder
stackBuilder
=
TaskStackBuilder
.
create
(
magiskManager
);
stackBuilder
.
addParentStack
(
Main
Activity
.
class
);
stackBuilder
.
addParentStack
(
Splash
Activity
.
class
);
stackBuilder
.
addNextIntent
(
intent
);
PendingIntent
pendingIntent
=
stackBuilder
.
getPendingIntent
(
NOTIFICATION_ID
,
PendingIntent
.
FLAG_UPDATE_CURRENT
);
builder
.
setContentIntent
(
pendingIntent
);
...
...
app/src/main/res/values-zh-rTW/strings.xml
View file @
f615ed40
...
...
@@ -42,7 +42,7 @@
<string
name=
"keep_dm_verity"
>
保留 dm-verity
</string>
<string
name=
"current_magisk_title"
>
已安裝 Magisk 版本:v%1$s
</string>
<string
name=
"install_magisk_title"
>
最新的 Magisk 版本:v%1$.1f
</string>
<string
name=
"uninstall"
>
卸載
</string>
<string
name=
"uninstall"
>
解除安裝
</string>
<string
name=
"reboot_countdown"
>
將在 %1$d 後重啟
</string>
<!--Module Fragment-->
...
...
@@ -104,7 +104,7 @@
<string
name=
"no_magisk_msg"
>
你想要下載並安裝 Magisk 嗎?
</string>
<string
name=
"downloading_toast"
>
正在下載 %1$s
</string>
<string
name=
"magisk_update_title"
>
Magisk 可更新!
</string>
<string
name=
"settings_reboot_toast"
>
勾選此項以啟用對所有 shell 命令及輸出的日誌記錄
</string>
<string
name=
"settings_reboot_toast"
>
重啟以完成設定
</string>
<string
name=
"release_notes"
>
發布說明
</string>
<string
name=
"repo_cache_cleared"
>
資源庫暫存已清除
</string>
<string
name=
"safetyNet_hide_notice"
>
此應用使用了 SafetyNet\n已默認由 MagiskHide 處理
</string>
...
...
@@ -186,5 +186,7 @@
<string
name=
"process_error"
>
處裡失敗
</string>
<string
name=
"download"
>
下載
</string>
<string
name=
"zip_process_title"
>
處理中
</string>
<string
name=
"uninstall_magisk_title"
>
解除安裝 Magisk
</string>
<string
name=
"uninstall_magisk_msg"
>
這將會刪除所有模組,MagiskSU,並有可能在目前未加密的情況下加密的的資料\n你確定要繼續嗎?
</string>
</resources>
app/src/main/res/values/strings.xml
View file @
f615ed40
...
...
@@ -47,6 +47,8 @@
<string
name=
"install_magisk_title"
>
Latest Magisk Version: v%1$.1f
</string>
<string
name=
"uninstall"
>
Uninstall
</string>
<string
name=
"reboot_countdown"
>
Rebooting in %1$d
</string>
<string
name=
"uninstall_magisk_title"
>
Uninstall Magisk
</string>
<string
name=
"uninstall_magisk_msg"
>
This will remove all modules, MagiskSU, and potentially encrypt your data if not encrypted\nAre you sure to continue?
</string>
<!--Module Fragment-->
<string
name=
"no_info_provided"
>
(No info provided)
</string>
...
...
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