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
8eba05ed
Commit
8eba05ed
authored
Feb 20, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Potentially fix Samsung crash and change colors
parent
2f781557
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
15 deletions
+14
-15
MagiskManager.java
app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
+1
-0
MainActivity.java
app/src/main/java/com/topjohnwu/magisk/MainActivity.java
+3
-5
SettingsActivity.java
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+1
-2
SplashActivity.java
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
+6
-3
CheckUpdates.java
...c/main/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
+2
-2
colors.xml
app/src/main/res/values/colors.xml
+1
-1
styles.xml
app/src/main/res/values/styles.xml
+0
-2
No files found.
app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
View file @
8eba05ed
...
@@ -25,6 +25,7 @@ public class MagiskManager extends Application {
...
@@ -25,6 +25,7 @@ public class MagiskManager extends Application {
public
static
final
String
MAGISK_HIDE_PATH
=
"/magisk/.core/magiskhide/"
;
public
static
final
String
MAGISK_HIDE_PATH
=
"/magisk/.core/magiskhide/"
;
public
static
final
String
TMP_FOLDER_PATH
=
"/dev/tmp"
;
public
static
final
String
TMP_FOLDER_PATH
=
"/dev/tmp"
;
public
static
final
String
MAGISK_PATH
=
"/magisk"
;
public
static
final
String
MAGISK_PATH
=
"/magisk"
;
public
static
final
String
INTENT_SECTION
=
"section"
;
// Events
// Events
public
final
CallbackEvent
<
Void
>
blockDetectionDone
=
new
CallbackEvent
<>();
public
final
CallbackEvent
<
Void
>
blockDetectionDone
=
new
CallbackEvent
<>();
...
...
app/src/main/java/com/topjohnwu/magisk/MainActivity.java
View file @
8eba05ed
...
@@ -29,8 +29,6 @@ import butterknife.ButterKnife;
...
@@ -29,8 +29,6 @@ import butterknife.ButterKnife;
public
class
MainActivity
extends
Activity
public
class
MainActivity
extends
Activity
implements
NavigationView
.
OnNavigationItemSelectedListener
,
CallbackEvent
.
Listener
<
Void
>
{
implements
NavigationView
.
OnNavigationItemSelectedListener
,
CallbackEvent
.
Listener
<
Void
>
{
public
static
final
String
SECTION
=
"section"
;
private
final
Handler
mDrawerHandler
=
new
Handler
();
private
final
Handler
mDrawerHandler
=
new
Handler
();
private
SharedPreferences
prefs
;
private
SharedPreferences
prefs
;
private
int
mDrawerItem
;
private
int
mDrawerItem
;
...
@@ -79,7 +77,7 @@ public class MainActivity extends Activity
...
@@ -79,7 +77,7 @@ public class MainActivity extends Activity
toggle
.
syncState
();
toggle
.
syncState
();
if
(
savedInstanceState
==
null
)
if
(
savedInstanceState
==
null
)
navigate
(
getIntent
().
getStringExtra
(
SECTION
));
navigate
(
getIntent
().
getStringExtra
(
MagiskManager
.
INTENT_
SECTION
));
navigationView
.
setNavigationItemSelectedListener
(
this
);
navigationView
.
setNavigationItemSelectedListener
(
this
);
getApplicationContext
().
reloadMainActivity
.
register
(
this
);
getApplicationContext
().
reloadMainActivity
.
register
(
this
);
...
@@ -95,13 +93,13 @@ public class MainActivity extends Activity
...
@@ -95,13 +93,13 @@ public class MainActivity extends Activity
@Override
@Override
protected
void
onRestoreInstanceState
(
Bundle
savedInstanceState
)
{
protected
void
onRestoreInstanceState
(
Bundle
savedInstanceState
)
{
super
.
onRestoreInstanceState
(
savedInstanceState
);
super
.
onRestoreInstanceState
(
savedInstanceState
);
navigate
(
savedInstanceState
.
getInt
(
SECTION
,
R
.
id
.
status
));
navigate
(
savedInstanceState
.
getInt
(
MagiskManager
.
INTENT_
SECTION
,
R
.
id
.
status
));
}
}
@Override
@Override
protected
void
onSaveInstanceState
(
Bundle
outState
)
{
protected
void
onSaveInstanceState
(
Bundle
outState
)
{
super
.
onSaveInstanceState
(
outState
);
super
.
onSaveInstanceState
(
outState
);
outState
.
putInt
(
SECTION
,
mDrawerItem
);
outState
.
putInt
(
MagiskManager
.
INTENT_
SECTION
,
mDrawerItem
);
}
}
@Override
@Override
...
...
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View file @
8eba05ed
...
@@ -146,9 +146,8 @@ public class SettingsActivity extends Activity {
...
@@ -146,9 +146,8 @@ public class SettingsActivity extends Activity {
enabled
=
prefs
.
getBoolean
(
"dark_theme"
,
false
);
enabled
=
prefs
.
getBoolean
(
"dark_theme"
,
false
);
if
(
getApplication
().
isDarkTheme
!=
enabled
)
{
if
(
getApplication
().
isDarkTheme
!=
enabled
)
{
getApplication
().
isDarkTheme
=
enabled
;
getApplication
().
isDarkTheme
=
enabled
;
getApplication
().
reloadMainActivity
.
trigger
();
getActivity
().
finish
();
getActivity
().
finish
();
getA
ctivity
().
recreate
();
getA
pplication
().
reloadMainActivity
.
trigger
();
}
}
break
;
break
;
case
"disable"
:
case
"disable"
:
...
...
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
View file @
8eba05ed
...
@@ -31,7 +31,7 @@ public class SplashActivity extends Activity{
...
@@ -31,7 +31,7 @@ public class SplashActivity extends Activity{
magiskManager
.
init
();
magiskManager
.
init
();
// Initialize the update check service, notify every 3 hours
// Initialize the update check service, notify every 3 hours
if
(!
"install"
.
equals
(
getIntent
().
getStringExtra
(
Ma
inActivity
.
SECTION
)))
{
if
(!
"install"
.
equals
(
getIntent
().
getStringExtra
(
Ma
giskManager
.
INTENT_
SECTION
)))
{
ComponentName
service
=
new
ComponentName
(
magiskManager
,
UpdateCheckService
.
class
);
ComponentName
service
=
new
ComponentName
(
magiskManager
,
UpdateCheckService
.
class
);
JobInfo
jobInfo
=
new
JobInfo
.
Builder
(
UPDATE_SERVICE_ID
,
service
)
JobInfo
jobInfo
=
new
JobInfo
.
Builder
(
UPDATE_SERVICE_ID
,
service
)
.
setRequiredNetworkType
(
JobInfo
.
NETWORK_TYPE_ANY
)
.
setRequiredNetworkType
(
JobInfo
.
NETWORK_TYPE_ANY
)
...
@@ -60,8 +60,11 @@ public class SplashActivity extends Activity{
...
@@ -60,8 +60,11 @@ public class SplashActivity extends Activity{
@Override
@Override
protected
void
onPostExecute
(
Void
v
)
{
protected
void
onPostExecute
(
Void
v
)
{
super
.
onPostExecute
(
v
);
super
.
onPostExecute
(
v
);
Intent
intent
=
getIntent
().
setClass
(
magiskManager
,
MainActivity
.
class
)
String
section
=
getIntent
().
getStringExtra
(
MagiskManager
.
INTENT_SECTION
);
.
setFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
);
Intent
intent
=
new
Intent
(
magiskManager
,
MainActivity
.
class
);
if
(
section
!=
null
)
{
intent
.
putExtra
(
MagiskManager
.
INTENT_SECTION
,
section
);
}
startActivity
(
intent
);
startActivity
(
intent
);
finish
();
finish
();
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
View file @
8eba05ed
...
@@ -7,7 +7,7 @@ import android.content.Intent;
...
@@ -7,7 +7,7 @@ import android.content.Intent;
import
android.support.v4.app.TaskStackBuilder
;
import
android.support.v4.app.TaskStackBuilder
;
import
android.support.v7.app.NotificationCompat
;
import
android.support.v7.app.NotificationCompat
;
import
com.topjohnwu.magisk.Ma
inActivity
;
import
com.topjohnwu.magisk.Ma
giskManager
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.SplashActivity
;
import
com.topjohnwu.magisk.SplashActivity
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.magisk.utils.Utils
;
...
@@ -56,7 +56,7 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
...
@@ -56,7 +56,7 @@ public class CheckUpdates extends ParallelTask<Void, Void, Void> {
.
setVibrate
(
new
long
[]{
0
,
100
,
100
,
100
})
.
setVibrate
(
new
long
[]{
0
,
100
,
100
,
100
})
.
setAutoCancel
(
true
);
.
setAutoCancel
(
true
);
Intent
intent
=
new
Intent
(
magiskManager
,
SplashActivity
.
class
);
Intent
intent
=
new
Intent
(
magiskManager
,
SplashActivity
.
class
);
intent
.
putExtra
(
Ma
inActivity
.
SECTION
,
"install"
);
intent
.
putExtra
(
Ma
giskManager
.
INTENT_
SECTION
,
"install"
);
TaskStackBuilder
stackBuilder
=
TaskStackBuilder
.
create
(
magiskManager
);
TaskStackBuilder
stackBuilder
=
TaskStackBuilder
.
create
(
magiskManager
);
stackBuilder
.
addParentStack
(
SplashActivity
.
class
);
stackBuilder
.
addParentStack
(
SplashActivity
.
class
);
stackBuilder
.
addNextIntent
(
intent
);
stackBuilder
.
addNextIntent
(
intent
);
...
...
app/src/main/res/values/colors.xml
View file @
8eba05ed
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
<color
name=
"blue500"
>
#2196F3
</color>
<color
name=
"blue500"
>
#2196F3
</color>
<color
name=
"yellow500"
>
#FFC107
</color>
<color
name=
"yellow500"
>
#FFC107
</color>
<color
name=
"dark_primary"
>
#
1a237e
</color>
<color
name=
"dark_primary"
>
#
bf360c
</color>
<color
name=
"dark_primary_dark"
>
#000000
</color>
<color
name=
"dark_primary_dark"
>
#000000
</color>
<color
name=
"dark_secondary_text"
>
#dedede
</color>
<color
name=
"dark_secondary_text"
>
#dedede
</color>
...
...
app/src/main/res/values/styles.xml
View file @
8eba05ed
...
@@ -15,8 +15,6 @@
...
@@ -15,8 +15,6 @@
</style>
</style>
<style
name=
"AppTheme.Dark"
parent=
"Theme.AppCompat.NoActionBar"
>
<style
name=
"AppTheme.Dark"
parent=
"Theme.AppCompat.NoActionBar"
>
<item
name=
"colorPrimary"
>
@color/dark_primary
</item>
<item
name=
"colorPrimaryDark"
>
@color/dark_primary_dark
</item>
<item
name=
"colorAccent"
>
@color/accent
</item>
<item
name=
"colorAccent"
>
@color/accent
</item>
<item
name=
"colorAccentFallback"
>
@color/accentFallback
</item>
<item
name=
"colorAccentFallback"
>
@color/accentFallback
</item>
<item
name=
"windowActionModeOverlay"
>
true
</item>
<item
name=
"windowActionModeOverlay"
>
true
</item>
...
...
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