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
bf1f941e
Commit
bf1f941e
authored
Jul 01, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adapt to Android O new broadcast limitations
parent
789fef34
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
13 deletions
+23
-13
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+2
-2
SettingsActivity.java
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+8
-0
PackageReceiver.java
.../java/com/topjohnwu/magisk/receivers/PackageReceiver.java
+13
-11
No files found.
app/src/main/AndroidManifest.xml
View file @
bf1f941e
...
@@ -62,8 +62,8 @@
...
@@ -62,8 +62,8 @@
<receiver
android:name=
".receivers.PackageReceiver"
>
<receiver
android:name=
".receivers.PackageReceiver"
>
<intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.PACKAGE_
ADD
ED"
/>
<action
android:name=
"android.intent.action.PACKAGE_
REPLAC
ED"
/>
<action
android:name=
"android.intent.action.PACKAGE_REMOVED"
/>
<action
android:name=
"android.intent.action.PACKAGE_
FULLY_
REMOVED"
/>
<data
android:scheme=
"package"
/>
<data
android:scheme=
"package"
/>
</intent-filter>
</intent-filter>
</receiver>
</receiver>
...
...
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View file @
bf1f941e
package
com
.
topjohnwu
.
magisk
;
package
com
.
topjohnwu
.
magisk
;
import
android.content.SharedPreferences
;
import
android.content.SharedPreferences
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.preference.ListPreference
;
import
android.preference.ListPreference
;
import
android.preference.PreferenceCategory
;
import
android.preference.PreferenceCategory
;
import
android.preference.PreferenceFragment
;
import
android.preference.PreferenceFragment
;
import
android.preference.PreferenceManager
;
import
android.preference.PreferenceManager
;
import
android.preference.PreferenceScreen
;
import
android.preference.PreferenceScreen
;
import
android.preference.SwitchPreference
;
import
android.support.v7.app.ActionBar
;
import
android.support.v7.app.ActionBar
;
import
android.support.v7.widget.Toolbar
;
import
android.support.v7.widget.Toolbar
;
import
android.widget.Toast
;
import
android.widget.Toast
;
...
@@ -81,6 +83,7 @@ public class SettingsActivity extends Activity {
...
@@ -81,6 +83,7 @@ public class SettingsActivity extends Activity {
suNotification
=
(
ListPreference
)
findPreference
(
"su_notification"
);
suNotification
=
(
ListPreference
)
findPreference
(
"su_notification"
);
multiuserMode
=
(
ListPreference
)
findPreference
(
"multiuser_mode"
);
multiuserMode
=
(
ListPreference
)
findPreference
(
"multiuser_mode"
);
namespaceMode
=
(
ListPreference
)
findPreference
(
"mnt_ns"
);
namespaceMode
=
(
ListPreference
)
findPreference
(
"mnt_ns"
);
SwitchPreference
reauth
=
(
SwitchPreference
)
findPreference
(
"su_reauth"
);
setSummary
();
setSummary
();
...
@@ -90,6 +93,11 @@ public class SettingsActivity extends Activity {
...
@@ -90,6 +93,11 @@ public class SettingsActivity extends Activity {
prefScreen
.
removePreference
(
suCategory
);
prefScreen
.
removePreference
(
suCategory
);
}
}
// Remove re-authentication option on Android O, it will not work
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
O
)
{
suCategory
.
removePreference
(
reauth
);
}
findPreference
(
"clear"
).
setOnPreferenceClickListener
((
pref
)
->
{
findPreference
(
"clear"
).
setOnPreferenceClickListener
((
pref
)
->
{
Utils
.
clearRepoCache
(
getActivity
());
Utils
.
clearRepoCache
(
getActivity
());
return
true
;
return
true
;
...
...
app/src/main/java/com/topjohnwu/magisk/receivers/PackageReceiver.java
View file @
bf1f941e
...
@@ -20,20 +20,22 @@ public class PackageReceiver extends BroadcastReceiver {
...
@@ -20,20 +20,22 @@ public class PackageReceiver extends BroadcastReceiver {
return
;
return
;
switch
(
intent
.
getAction
())
{
switch
(
intent
.
getAction
())
{
case
Intent
.
ACTION_PACKAGE_ADDED
:
case
Intent
.
ACTION_PACKAGE_REPLACED
:
int
uid
=
intent
.
getIntExtra
(
Intent
.
EXTRA_UID
,
-
1
);
// This will only work pre-O
// Update the UID if available
if
(
magiskManager
.
suReauth
)
{
if
(
uid
>
0
)
{
policy
.
uid
=
uid
%
100000
;
}
magiskManager
.
suDB
.
updatePolicy
(
policy
);
return
;
case
Intent
.
ACTION_PACKAGE_REMOVED
:
boolean
isUpdate
=
intent
.
getBooleanExtra
(
Intent
.
EXTRA_REPLACING
,
false
);
if
(!
isUpdate
||
magiskManager
.
suReauth
)
{
magiskManager
.
suDB
.
deletePolicy
(
policy
);
magiskManager
.
suDB
.
deletePolicy
(
policy
);
}
else
{
int
uid
=
intent
.
getIntExtra
(
Intent
.
EXTRA_UID
,
-
1
);
// Update the UID if available
if
(
uid
>
0
)
{
policy
.
uid
=
uid
%
100000
;
}
magiskManager
.
suDB
.
updatePolicy
(
policy
);
}
}
break
;
break
;
case
Intent
.
ACTION_PACKAGE_FULLY_REMOVED
:
magiskManager
.
suDB
.
deletePolicy
(
policy
);
break
;
}
}
}
}
}
}
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