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
8df6af62
Commit
8df6af62
authored
Sep 24, 2016
by
d8ahazard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Initial Refactor of WelcomeActivity, Set up Basic Splash Elements
parent
3c3bb70b
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
99 additions
and
35 deletions
+99
-35
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+8
-2
AutoRootFragment.java
app/src/main/java/com/topjohnwu/magisk/AutoRootFragment.java
+0
-11
MainActivity.java
app/src/main/java/com/topjohnwu/magisk/MainActivity.java
+3
-20
SplashActivity.java
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
+69
-0
MonitorService.java
...in/java/com/topjohnwu/magisk/services/MonitorService.java
+2
-2
ic_splash_activity.xml
app/src/main/res/drawable/ic_splash_activity.xml
+13
-0
activity_main.xml
app/src/main/res/layout/activity_main.xml
+0
-0
styles.xml
app/src/main/res/values/styles.xml
+4
-0
No files found.
app/src/main/AndroidManifest.xml
View file @
8df6af62
...
...
@@ -59,12 +59,18 @@
</receiver>
<activity
android:name=
".WelcomeActivity"
android:name=
".MainActivity"
android:configChanges=
"orientation|screenSize"
android:exported=
"true"
>
</activity>
<activity
android:name=
".SplashActivity"
android:theme=
"@style/SplashTheme"
android:configChanges=
"orientation|screenSize"
android:exported=
"true"
>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
</intent-filter>
</activity>
...
...
app/src/main/java/com/topjohnwu/magisk/AutoRootFragment.java
View file @
8df6af62
...
...
@@ -70,17 +70,6 @@ public class AutoRootFragment extends ListFragment {
private
void
initializeElements
()
{
listView
=
getListView
();
packageManager
=
getActivity
().
getPackageManager
();
prefs
=
PreferenceManager
.
getDefaultSharedPreferences
(
getActivity
());
if
(!
prefs
.
contains
(
"auto_blacklist"
))
{
Logger
.
dh
(
"AutoRootFragment: Setting default preferences for application"
);
SharedPreferences
.
Editor
editor
=
prefs
.
edit
();
Set
<
String
>
set
=
new
HashSet
<>();
set
.
add
(
"com.google.android.apps.walletnfcrel"
);
set
.
add
(
"com.google.android.gms"
);
set
.
add
(
"com.google.commerce.tapandpay"
);
editor
.
putStringSet
(
"auto_blacklist"
,
set
);
editor
.
apply
();
}
new
LoadApplications
().
execute
();
}
...
...
app/src/main/java/com/topjohnwu/magisk/
Welcome
Activity.java
→
app/src/main/java/com/topjohnwu/magisk/
Main
Activity.java
View file @
8df6af62
...
...
@@ -5,11 +5,9 @@ import android.app.Fragment;
import
android.app.FragmentTransaction
;
import
android.content.Intent
;
import
android.content.pm.PackageManager
;
import
android.os.AsyncTask
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Handler
;
import
android.preference.PreferenceManager
;
import
android.support.annotation.IdRes
;
import
android.support.annotation.NonNull
;
import
android.support.design.widget.NavigationView
;
...
...
@@ -22,15 +20,13 @@ import android.support.v7.widget.Toolbar;
import
android.view.MenuItem
;
import
android.view.View
;
import
com.topjohnwu.magisk.services.MonitorService
;
import
com.topjohnwu.magisk.utils.Async
;
import
com.topjohnwu.magisk.utils.Logger
;
import
com.topjohnwu.magisk.utils.Utils
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
public
class
Welcome
Activity
extends
AppCompatActivity
implements
NavigationView
.
OnNavigationItemSelectedListener
{
public
class
Main
Activity
extends
AppCompatActivity
implements
NavigationView
.
OnNavigationItemSelectedListener
{
private
static
final
String
SELECTED_ITEM_ID
=
"SELECTED_ITEM_ID"
;
...
...
@@ -50,19 +46,11 @@ public class WelcomeActivity extends AppCompatActivity implements NavigationView
@Override
protected
void
onCreate
(
final
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
setContentView
(
R
.
layout
.
activity_
welcome
);
setContentView
(
R
.
layout
.
activity_
main
);
ButterKnife
.
bind
(
this
);
// Startups
PreferenceManager
.
setDefaultValues
(
this
,
R
.
xml
.
defaultpref
,
false
);
if
(
Utils
.
autoToggleEnabled
(
getApplicationContext
()))
{
if
(!
Utils
.
isMyServiceRunning
(
MonitorService
.
class
,
getApplicationContext
()))
{
Intent
myIntent
=
new
Intent
(
getApplication
(),
MonitorService
.
class
);
getApplication
().
startService
(
myIntent
);
}
}
Utils
.
SetupQuickSettingsTile
(
getApplicationContext
());
Utils
.
init
(
this
);
if
(
ActivityCompat
.
checkSelfPermission
(
this
,
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
)
!=
PackageManager
.
PERMISSION_GRANTED
&&
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
M
)
{
requestPermissions
(
new
String
[]{
Manifest
.
permission
.
WRITE_EXTERNAL_STORAGE
},
0
);
...
...
@@ -114,11 +102,6 @@ public class WelcomeActivity extends AppCompatActivity implements NavigationView
}
});
Utils
.
init
(
this
);
new
Async
.
CheckUpdates
(
this
).
execute
();
new
Async
.
LoadModules
(
this
).
execute
();
new
Async
.
LoadRepos
(
this
).
executeOnExecutor
(
AsyncTask
.
THREAD_POOL_EXECUTOR
);
setSupportActionBar
(
toolbar
);
ActionBarDrawerToggle
toggle
=
new
ActionBarDrawerToggle
(
this
,
drawer
,
toolbar
,
R
.
string
.
navigation_drawer_open
,
R
.
string
.
navigation_drawer_close
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
0 → 100644
View file @
8df6af62
package
com
.
topjohnwu
.
magisk
;
import
android.content.Intent
;
import
android.content.SharedPreferences
;
import
android.os.AsyncTask
;
import
android.os.Bundle
;
import
android.preference.PreferenceManager
;
import
android.support.v7.app.AppCompatActivity
;
import
com.topjohnwu.magisk.services.MonitorService
;
import
com.topjohnwu.magisk.utils.Async
;
import
com.topjohnwu.magisk.utils.Logger
;
import
com.topjohnwu.magisk.utils.PrefHelper
;
import
com.topjohnwu.magisk.utils.Utils
;
import
java.util.HashSet
;
import
java.util.Set
;
public
class
SplashActivity
extends
AppCompatActivity
{
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
//setups go here
// Set up default preferences,make sure we add "extra" blacklist entries.
PreferenceManager
.
setDefaultValues
(
this
,
R
.
xml
.
defaultpref
,
false
);
SharedPreferences
prefs
=
PreferenceManager
.
getDefaultSharedPreferences
(
getApplication
());
if
(!
prefs
.
contains
(
"auto_blacklist"
))
{
Logger
.
dh
(
"AutoRootFragment: Setting default preferences for application"
);
SharedPreferences
.
Editor
editor
=
prefs
.
edit
();
Set
<
String
>
set
=
new
HashSet
<>();
set
.
add
(
"com.google.android.apps.walletnfcrel"
);
set
.
add
(
"com.google.android.gms"
);
set
.
add
(
"com.google.commerce.tapandpay"
);
editor
.
putStringSet
(
"auto_blacklist"
,
set
);
editor
.
apply
();
}
// Set up toggle states based on preferences, start services, disable root if set
if
(
Utils
.
autoToggleEnabled
(
getApplicationContext
()))
{
if
(!
Utils
.
isMyServiceRunning
(
MonitorService
.
class
,
getApplicationContext
()))
{
Intent
myIntent
=
new
Intent
(
getApplication
(),
MonitorService
.
class
);
getApplication
().
startService
(
myIntent
);
}
}
else
{
if
(
PrefHelper
.
CheckBool
(
"keep_root_off"
,
getApplication
()))
{
Utils
.
toggleRoot
(
false
,
getApplication
());
}
}
// Set up quick settings tile
Utils
.
SetupQuickSettingsTile
(
getApplicationContext
());
// Initialize
new
Async
.
CheckUpdates
(
this
).
execute
();
new
Async
.
LoadModules
(
this
).
execute
();
new
Async
.
LoadRepos
(
this
).
executeOnExecutor
(
AsyncTask
.
THREAD_POOL_EXECUTOR
);
// Start main activity
Intent
intent
=
new
Intent
(
this
,
MainActivity
.
class
);
startActivity
(
intent
);
finish
();
}
}
app/src/main/java/com/topjohnwu/magisk/services/MonitorService.java
View file @
8df6af62
...
...
@@ -15,8 +15,8 @@ import android.support.v4.app.NotificationCompat;
import
android.util.Log
;
import
android.view.accessibility.AccessibilityEvent
;
import
com.topjohnwu.magisk.MainActivity
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.WelcomeActivity
;
import
com.topjohnwu.magisk.utils.Logger
;
import
com.topjohnwu.magisk.utils.PrefHelper
;
import
com.topjohnwu.magisk.utils.Utils
;
...
...
@@ -112,7 +112,7 @@ public class MonitorService extends AccessibilityService {
if
(!
PrefHelper
.
CheckBool
(
"hide_root_notification"
,
getApplicationContext
()))
{
if
(
rootAction
)
{
Intent
intent
=
new
Intent
(
getApplication
(),
Welcome
Activity
.
class
);
Intent
intent
=
new
Intent
(
getApplication
(),
Main
Activity
.
class
);
intent
.
putExtra
(
"relaunch"
,
"relaunch"
);
String
rootMessage
;
PendingIntent
pendingIntent
=
PendingIntent
.
getActivity
(
...
...
app/src/main/res/drawable/ic_splash_activity.xml
0 → 100644
View file @
8df6af62
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item
android:drawable=
"@android:color/darker_gray"
/>
<item>
<bitmap
android:gravity=
"center"
android:src=
"@mipmap/ic_launcher"
/>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/layout/activity_
welcome
.xml
→
app/src/main/res/layout/activity_
main
.xml
View file @
8df6af62
File moved
app/src/main/res/values/styles.xml
View file @
8df6af62
...
...
@@ -24,4 +24,8 @@
<style
name=
"AppTheme.Transparent"
parent=
"Theme.AppCompat.Light.NoActionBar"
>
</style>
<style
name=
"SplashTheme"
parent=
"Theme.AppCompat.NoActionBar"
>
<item
name=
"android:windowBackground"
>
@drawable/ic_splash_activity
</item>
</style>
</resources>
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