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
d2bcac81
Commit
d2bcac81
authored
Jul 13, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix update notifications on Android O
parent
080c37a7
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
1 deletion
+18
-1
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-0
MagiskManager.java
app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
+13
-0
Utils.java
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
+3
-1
strings.xml
app/src/main/res/values/strings.xml
+1
-0
No files found.
app/src/main/AndroidManifest.xml
View file @
d2bcac81
...
...
@@ -9,6 +9,7 @@
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
<uses-permission
android:name=
"android.permission.RECEIVE_BOOT_COMPLETED"
/>
<uses-permission
android:name=
"android.permission.VIBRATE"
/>
<uses-permission
android:name=
"android.permission.REQUEST_INSTALL_PACKAGES"
/>
<application
android:name=
".MagiskManager"
...
...
app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
View file @
d2bcac81
package
com
.
topjohnwu
.
magisk
;
import
android.app.Application
;
import
android.app.NotificationChannel
;
import
android.app.NotificationManager
;
import
android.content.Context
;
import
android.content.SharedPreferences
;
import
android.content.pm.ApplicationInfo
;
import
android.os.Build
;
import
android.os.Handler
;
import
android.preference.PreferenceManager
;
import
android.text.TextUtils
;
...
...
@@ -31,6 +35,7 @@ public class MagiskManager extends Application {
public
static
final
String
BUSYBOX_VERSION
=
"1.26.2"
;
public
static
final
String
MAGISKHIDE_PROP
=
"persist.magisk.hide"
;
public
static
final
String
DISABLE_INDICATION_PROP
=
"ro.magisk.disable"
;
public
static
final
String
NOTIFICATION_CHANNEL
=
"magisk_update_notice"
;
// Events
public
final
CallbackEvent
<
Void
>
blockDetectionDone
=
new
CallbackEvent
<>();
...
...
@@ -143,6 +148,14 @@ public class MagiskManager extends Application {
.
apply
();
// Add busybox to PATH
Shell
.
su
(
"PATH=$PATH:"
+
busybox
.
getParent
());
// Create notification channel on Android O
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
O
)
{
NotificationChannel
channel
=
new
NotificationChannel
(
NOTIFICATION_CHANNEL
,
getString
(
R
.
string
.
magisk_updates
),
NotificationManager
.
IMPORTANCE_DEFAULT
);
((
NotificationManager
)
getSystemService
(
Context
.
NOTIFICATION_SERVICE
)).
createNotificationChannel
(
channel
);
}
}
public
void
initSUConfig
()
{
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
View file @
d2bcac81
...
...
@@ -105,7 +105,7 @@ public class Utils {
receiver
.
setDownloadID
(
downloadManager
.
enqueue
(
request
));
}
receiver
.
setFilename
(
filename
);
context
.
registerReceiver
(
receiver
,
new
IntentFilter
(
DownloadManager
.
ACTION_DOWNLOAD_COMPLETE
));
context
.
getApplicationContext
().
registerReceiver
(
receiver
,
new
IntentFilter
(
DownloadManager
.
ACTION_DOWNLOAD_COMPLETE
));
}
public
static
String
getLegalFilename
(
CharSequence
filename
)
{
...
...
@@ -214,6 +214,7 @@ public class Utils {
builder
.
setSmallIcon
(
R
.
drawable
.
ic_magisk
)
.
setContentTitle
(
magiskManager
.
getString
(
R
.
string
.
magisk_update_title
))
.
setContentText
(
magiskManager
.
getString
(
R
.
string
.
magisk_update_available
,
magiskManager
.
remoteMagiskVersionString
))
.
setChannelId
(
MagiskManager
.
NOTIFICATION_CHANNEL
)
.
setVibrate
(
new
long
[]{
0
,
100
,
100
,
100
})
.
setAutoCancel
(
true
);
Intent
intent
=
new
Intent
(
magiskManager
,
SplashActivity
.
class
);
...
...
@@ -234,6 +235,7 @@ public class Utils {
builder
.
setSmallIcon
(
R
.
drawable
.
ic_magisk
)
.
setContentTitle
(
magiskManager
.
getString
(
R
.
string
.
manager_update_title
))
.
setContentText
(
magiskManager
.
getString
(
R
.
string
.
manager_download_install
))
.
setChannelId
(
MagiskManager
.
NOTIFICATION_CHANNEL
)
.
setVibrate
(
new
long
[]{
0
,
100
,
100
,
100
})
.
setAutoCancel
(
true
);
Intent
intent
=
new
Intent
(
magiskManager
,
ManagerUpdate
.
class
);
...
...
app/src/main/res/values/strings.xml
View file @
d2bcac81
...
...
@@ -132,6 +132,7 @@
<string
name=
"manual_boot_image"
>
Please manually select a boot image!
</string>
<string
name=
"manager_update_title"
>
New Magisk Manager Update Available!
</string>
<string
name=
"manager_download_install"
>
Press to download and install
</string>
<string
name=
"magisk_updates"
>
Magisk Updates
</string>
<!--Settings Activity -->
<string
name=
"settings_general_category"
>
General
</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