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
e25ce638
Commit
e25ce638
authored
Mar 24, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove AppUtils
parent
162eeaa0
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
45 additions
and
61 deletions
+45
-61
SplashActivity.java
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
+1
-2
MagiskInstallDialog.java
...ava/com/topjohnwu/magisk/dialogs/MagiskInstallDialog.java
+1
-2
MagiskFragment.java
...n/java/com/topjohnwu/magisk/fragments/MagiskFragment.java
+2
-2
SettingsFragment.java
...java/com/topjohnwu/magisk/fragments/SettingsFragment.java
+1
-2
AppUtils.java
app/src/main/java/com/topjohnwu/magisk/utils/AppUtils.java
+0
-53
Utils.java
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
+40
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
View file @
e25ce638
...
@@ -12,7 +12,6 @@ import com.topjohnwu.magisk.database.RepoDatabaseHelper;
...
@@ -12,7 +12,6 @@ import com.topjohnwu.magisk.database.RepoDatabaseHelper;
import
com.topjohnwu.magisk.tasks.UpdateRepos
;
import
com.topjohnwu.magisk.tasks.UpdateRepos
;
import
com.topjohnwu.magisk.uicomponents.Notifications
;
import
com.topjohnwu.magisk.uicomponents.Notifications
;
import
com.topjohnwu.magisk.uicomponents.Shortcuts
;
import
com.topjohnwu.magisk.uicomponents.Shortcuts
;
import
com.topjohnwu.magisk.utils.AppUtils
;
import
com.topjohnwu.magisk.utils.LocaleManager
;
import
com.topjohnwu.magisk.utils.LocaleManager
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
...
@@ -63,7 +62,7 @@ public class SplashActivity extends BaseActivity {
...
@@ -63,7 +62,7 @@ public class SplashActivity extends BaseActivity {
Notifications
.
setup
(
this
);
Notifications
.
setup
(
this
);
// Schedule periodic update checks
// Schedule periodic update checks
App
Utils
.
scheduleUpdateCheck
();
Utils
.
scheduleUpdateCheck
();
// Setup shortcuts
// Setup shortcuts
Shortcuts
.
setup
(
this
);
Shortcuts
.
setup
(
this
);
...
...
app/src/main/java/com/topjohnwu/magisk/dialogs/MagiskInstallDialog.java
View file @
e25ce638
...
@@ -7,7 +7,6 @@ import com.topjohnwu.magisk.Config;
...
@@ -7,7 +7,6 @@ import com.topjohnwu.magisk.Config;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.components.BaseActivity
;
import
com.topjohnwu.magisk.uicomponents.MarkDownWindow
;
import
com.topjohnwu.magisk.uicomponents.MarkDownWindow
;
import
com.topjohnwu.magisk.utils.AppUtils
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.ShellUtils
;
import
com.topjohnwu.superuser.ShellUtils
;
...
@@ -40,7 +39,7 @@ public class MagiskInstallDialog extends CustomAlertDialog {
...
@@ -40,7 +39,7 @@ public class MagiskInstallDialog extends CustomAlertDialog {
setNeutralButton
(
R
.
string
.
release_notes
,
(
d
,
i
)
->
{
setNeutralButton
(
R
.
string
.
release_notes
,
(
d
,
i
)
->
{
if
(
Config
.
magiskNoteLink
.
contains
(
"forum.xda-developers"
))
{
if
(
Config
.
magiskNoteLink
.
contains
(
"forum.xda-developers"
))
{
// Open forum links in browser
// Open forum links in browser
App
Utils
.
openLink
(
a
,
Uri
.
parse
(
Config
.
magiskNoteLink
));
Utils
.
openLink
(
a
,
Uri
.
parse
(
Config
.
magiskNoteLink
));
}
else
{
}
else
{
MarkDownWindow
.
show
(
a
,
null
,
Config
.
magiskNoteLink
);
MarkDownWindow
.
show
(
a
,
null
,
Config
.
magiskNoteLink
);
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/fragments/MagiskFragment.java
View file @
e25ce638
...
@@ -37,8 +37,8 @@ import com.topjohnwu.magisk.uicomponents.ExpandableViewHolder;
...
@@ -37,8 +37,8 @@ import com.topjohnwu.magisk.uicomponents.ExpandableViewHolder;
import
com.topjohnwu.magisk.uicomponents.MarkDownWindow
;
import
com.topjohnwu.magisk.uicomponents.MarkDownWindow
;
import
com.topjohnwu.magisk.uicomponents.SafetyNet
;
import
com.topjohnwu.magisk.uicomponents.SafetyNet
;
import
com.topjohnwu.magisk.uicomponents.UpdateCardHolder
;
import
com.topjohnwu.magisk.uicomponents.UpdateCardHolder
;
import
com.topjohnwu.magisk.utils.AppUtils
;
import
com.topjohnwu.magisk.utils.Event
;
import
com.topjohnwu.magisk.utils.Event
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
...
@@ -89,7 +89,7 @@ public class MagiskFragment extends BaseFragment implements SwipeRefreshLayout.O
...
@@ -89,7 +89,7 @@ public class MagiskFragment extends BaseFragment implements SwipeRefreshLayout.O
}
}
private
void
openLink
(
String
url
)
{
private
void
openLink
(
String
url
)
{
App
Utils
.
openLink
(
requireActivity
(),
Uri
.
parse
(
url
));
Utils
.
openLink
(
requireActivity
(),
Uri
.
parse
(
url
));
}
}
@OnClick
(
R
.
id
.
paypal
)
@OnClick
(
R
.
id
.
paypal
)
...
...
app/src/main/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
View file @
e25ce638
...
@@ -22,7 +22,6 @@ import com.topjohnwu.magisk.R;
...
@@ -22,7 +22,6 @@ import com.topjohnwu.magisk.R;
import
com.topjohnwu.magisk.components.BasePreferenceFragment
;
import
com.topjohnwu.magisk.components.BasePreferenceFragment
;
import
com.topjohnwu.magisk.dialogs.FingerprintAuthDialog
;
import
com.topjohnwu.magisk.dialogs.FingerprintAuthDialog
;
import
com.topjohnwu.magisk.tasks.CheckUpdates
;
import
com.topjohnwu.magisk.tasks.CheckUpdates
;
import
com.topjohnwu.magisk.utils.AppUtils
;
import
com.topjohnwu.magisk.utils.DownloadApp
;
import
com.topjohnwu.magisk.utils.DownloadApp
;
import
com.topjohnwu.magisk.utils.Event
;
import
com.topjohnwu.magisk.utils.Event
;
import
com.topjohnwu.magisk.utils.FingerprintHelper
;
import
com.topjohnwu.magisk.utils.FingerprintHelper
;
...
@@ -215,7 +214,7 @@ public class SettingsFragment extends BasePreferenceFragment {
...
@@ -215,7 +214,7 @@ public class SettingsFragment extends BasePreferenceFragment {
CheckUpdates
.
check
();
CheckUpdates
.
check
();
break
;
break
;
case
Config
.
Key
.
CHECK_UPDATES
:
case
Config
.
Key
.
CHECK_UPDATES
:
App
Utils
.
scheduleUpdateCheck
();
Utils
.
scheduleUpdateCheck
();
break
;
break
;
}
}
setSummary
(
key
);
setSummary
(
key
);
...
...
app/src/main/java/com/topjohnwu/magisk/utils/AppUtils.java
deleted
100644 → 0
View file @
162eeaa0
package
com
.
topjohnwu
.
magisk
.
utils
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.widget.Toast
;
import
androidx.work.Constraints
;
import
androidx.work.ExistingPeriodicWorkPolicy
;
import
androidx.work.NetworkType
;
import
androidx.work.PeriodicWorkRequest
;
import
androidx.work.WorkManager
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.components.UpdateCheckService
;
import
com.topjohnwu.magisk.tasks.CheckUpdates
;
import
java.util.concurrent.TimeUnit
;
public
class
AppUtils
{
public
static
void
scheduleUpdateCheck
()
{
if
(
Config
.
get
(
Config
.
Key
.
CHECK_UPDATES
))
{
Constraints
constraints
=
new
Constraints
.
Builder
()
.
setRequiredNetworkType
(
NetworkType
.
CONNECTED
)
.
build
();
PeriodicWorkRequest
request
=
new
PeriodicWorkRequest
.
Builder
(
ClassMap
.
get
(
UpdateCheckService
.
class
),
12
,
TimeUnit
.
HOURS
)
.
setConstraints
(
constraints
)
.
build
();
WorkManager
.
getInstance
().
enqueueUniquePeriodicWork
(
Const
.
ID
.
CHECK_MAGISK_UPDATE_WORKER_ID
,
ExistingPeriodicWorkPolicy
.
REPLACE
,
request
);
}
else
{
WorkManager
.
getInstance
().
cancelUniqueWork
(
Const
.
ID
.
CHECK_MAGISK_UPDATE_WORKER_ID
);
CheckUpdates
.
check
();
}
}
public
static
void
openLink
(
Context
context
,
Uri
link
)
{
Intent
intent
=
new
Intent
(
Intent
.
ACTION_VIEW
,
link
);
intent
.
addFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
);
if
(
intent
.
resolveActivity
(
context
.
getPackageManager
())
!=
null
)
{
context
.
startActivity
(
intent
);
}
else
{
Utils
.
toast
(
R
.
string
.
open_link_failed_toast
,
Toast
.
LENGTH_SHORT
);
}
}
}
\ No newline at end of file
app/src/main/java/com/topjohnwu/magisk/utils/Utils.java
View file @
e25ce638
package
com
.
topjohnwu
.
magisk
.
utils
;
package
com
.
topjohnwu
.
magisk
.
utils
;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.SharedPreferences
;
import
android.content.SharedPreferences
;
import
android.content.pm.ApplicationInfo
;
import
android.content.pm.ApplicationInfo
;
import
android.content.pm.PackageManager
;
import
android.content.pm.PackageManager
;
...
@@ -11,12 +12,22 @@ import android.net.Uri;
...
@@ -11,12 +12,22 @@ import android.net.Uri;
import
android.provider.OpenableColumns
;
import
android.provider.OpenableColumns
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
androidx.work.Constraints
;
import
androidx.work.ExistingPeriodicWorkPolicy
;
import
androidx.work.NetworkType
;
import
androidx.work.PeriodicWorkRequest
;
import
androidx.work.WorkManager
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.App
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.BuildConfig
;
import
com.topjohnwu.magisk.ClassMap
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Config
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.Const
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.components.UpdateCheckService
;
import
com.topjohnwu.magisk.container.Module
;
import
com.topjohnwu.magisk.container.Module
;
import
com.topjohnwu.magisk.container.ValueSortedMap
;
import
com.topjohnwu.magisk.container.ValueSortedMap
;
import
com.topjohnwu.magisk.tasks.CheckUpdates
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.net.Networking
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.superuser.internal.UiThreadHandler
;
import
com.topjohnwu.superuser.internal.UiThreadHandler
;
...
@@ -24,6 +35,7 @@ import com.topjohnwu.superuser.io.SuFile;
...
@@ -24,6 +35,7 @@ import com.topjohnwu.superuser.io.SuFile;
import
java.util.Locale
;
import
java.util.Locale
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.concurrent.TimeUnit
;
public
class
Utils
{
public
class
Utils
{
...
@@ -131,4 +143,32 @@ public class Utils {
...
@@ -131,4 +143,32 @@ public class Utils {
public
static
boolean
isCanary
()
{
public
static
boolean
isCanary
()
{
return
BuildConfig
.
VERSION_NAME
.
contains
(
"-"
);
return
BuildConfig
.
VERSION_NAME
.
contains
(
"-"
);
}
}
public
static
void
scheduleUpdateCheck
()
{
if
(
Config
.
get
(
Config
.
Key
.
CHECK_UPDATES
))
{
Constraints
constraints
=
new
Constraints
.
Builder
()
.
setRequiredNetworkType
(
NetworkType
.
CONNECTED
)
.
build
();
PeriodicWorkRequest
request
=
new
PeriodicWorkRequest
.
Builder
(
ClassMap
.
get
(
UpdateCheckService
.
class
),
12
,
TimeUnit
.
HOURS
)
.
setConstraints
(
constraints
)
.
build
();
WorkManager
.
getInstance
().
enqueueUniquePeriodicWork
(
Const
.
ID
.
CHECK_MAGISK_UPDATE_WORKER_ID
,
ExistingPeriodicWorkPolicy
.
REPLACE
,
request
);
}
else
{
WorkManager
.
getInstance
().
cancelUniqueWork
(
Const
.
ID
.
CHECK_MAGISK_UPDATE_WORKER_ID
);
CheckUpdates
.
check
();
}
}
public
static
void
openLink
(
Context
context
,
Uri
link
)
{
Intent
intent
=
new
Intent
(
Intent
.
ACTION_VIEW
,
link
);
intent
.
addFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
);
if
(
intent
.
resolveActivity
(
context
.
getPackageManager
())
!=
null
)
{
context
.
startActivity
(
intent
);
}
else
{
toast
(
R
.
string
.
open_link_failed_toast
,
Toast
.
LENGTH_SHORT
);
}
}
}
}
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